From 360696cff85c61e661a186bd1536bb10551cbb65 Mon Sep 17 00:00:00 2001 From: mappu Date: Sat, 19 Oct 2024 09:45:54 +1300 Subject: [PATCH 01/15] qprintsupport: add example --- .gitignore | 1 + examples/libraries/qt-qprintsupport/main.go | 29 +++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 examples/libraries/qt-qprintsupport/main.go diff --git a/.gitignore b/.gitignore index 67be7fe3..87bccef0 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,7 @@ examples/windowsmanifest/windowsmanifest examples/windowsmanifest/windowsmanifest.exe examples/uidesigner/uidesigner examples/uidesigner/uidesigner.exe +examples/libraries/qt-qprintsupport/qt-qprintsupport # android temporary build files android-build diff --git a/examples/libraries/qt-qprintsupport/main.go b/examples/libraries/qt-qprintsupport/main.go new file mode 100644 index 00000000..d3da7e65 --- /dev/null +++ b/examples/libraries/qt-qprintsupport/main.go @@ -0,0 +1,29 @@ +package main + +import ( + "os" + + "github.com/mappu/miqt/qt" + "github.com/mappu/miqt/qt/qprintsupport" +) + +func main() { + + qt.NewQApplication(os.Args) + + btn := qt.NewQPushButton2("QPrintSupport sample") + btn.SetFixedWidth(320) + + btn.OnPressed(func() { + + dlg := qprintsupport.NewQPrintDialog2() + dlg.OnFinished(func(int) { + dlg.DeleteLater() + }) + dlg.Show() + }) + + btn.Show() + + qt.QApplication_Exec() +} From 8a64c7c9268879a88a64623226a53aaf4dd3af0d Mon Sep 17 00:00:00 2001 From: mappu Date: Sat, 19 Oct 2024 10:32:17 +1300 Subject: [PATCH 02/15] docker: clean apt cache after installing, for smaller images --- docker/linux64-go1.19-qt5.15-dynamic.Dockerfile | 3 ++- docker/win64-cross-go1.19-qt5.15-dynamic.Dockerfile | 3 ++- docker/win64-cross-go1.19-qt5.15-static.Dockerfile | 3 ++- docker/win64-cross-go1.23-qt5.15-dynamic.Dockerfile | 3 ++- docker/win64-cross-go1.23-qt5.15-static.Dockerfile | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/docker/linux64-go1.19-qt5.15-dynamic.Dockerfile b/docker/linux64-go1.19-qt5.15-dynamic.Dockerfile index 0d181b36..1d8dc0d6 100644 --- a/docker/linux64-go1.19-qt5.15-dynamic.Dockerfile +++ b/docker/linux64-go1.19-qt5.15-dynamic.Dockerfile @@ -1,4 +1,5 @@ FROM debian:bookworm RUN DEBIAN_FRONTEND=noninteractive apt-get update && \ - apt-get install -qyy golang-go qtbase5-dev + apt-get install -qyy golang-go qtbase5-dev && \ + apt-get clean diff --git a/docker/win64-cross-go1.19-qt5.15-dynamic.Dockerfile b/docker/win64-cross-go1.19-qt5.15-dynamic.Dockerfile index d0ddcbfa..70eafde7 100644 --- a/docker/win64-cross-go1.19-qt5.15-dynamic.Dockerfile +++ b/docker/win64-cross-go1.19-qt5.15-dynamic.Dockerfile @@ -1,7 +1,8 @@ FROM debian:bookworm RUN DEBIAN_FRONTEND=noninteractive apt-get update && \ - apt-get install -qyy gnupg2 golang-go ca-certificates + apt-get install -qyy gnupg2 golang-go ca-certificates && \ + apt-get clean RUN DEBIAN_FRONTEND=noninteractive \ echo "deb https://pkg.mxe.cc/repos/apt buster main" >/etc/apt/sources.list.d/mxeapt.list && \ diff --git a/docker/win64-cross-go1.19-qt5.15-static.Dockerfile b/docker/win64-cross-go1.19-qt5.15-static.Dockerfile index cb243431..285440f0 100644 --- a/docker/win64-cross-go1.19-qt5.15-static.Dockerfile +++ b/docker/win64-cross-go1.19-qt5.15-static.Dockerfile @@ -1,7 +1,8 @@ FROM debian:bookworm RUN DEBIAN_FRONTEND=noninteractive apt-get update && \ - apt-get install -qyy gnupg2 golang-go ca-certificates + apt-get install -qyy gnupg2 golang-go ca-certificates && \ + apt-get clean RUN DEBIAN_FRONTEND=noninteractive \ echo "deb https://pkg.mxe.cc/repos/apt buster main" >/etc/apt/sources.list.d/mxeapt.list && \ diff --git a/docker/win64-cross-go1.23-qt5.15-dynamic.Dockerfile b/docker/win64-cross-go1.23-qt5.15-dynamic.Dockerfile index 2d9c1f7a..fceab4dd 100644 --- a/docker/win64-cross-go1.23-qt5.15-dynamic.Dockerfile +++ b/docker/win64-cross-go1.23-qt5.15-dynamic.Dockerfile @@ -1,7 +1,8 @@ FROM golang:1.23-bookworm RUN DEBIAN_FRONTEND=noninteractive apt-get update && \ - apt-get install -qyy gnupg2 ca-certificates + apt-get install -qyy gnupg2 ca-certificates && \ + apt-get clean RUN DEBIAN_FRONTEND=noninteractive \ echo "deb https://pkg.mxe.cc/repos/apt buster main" >/etc/apt/sources.list.d/mxeapt.list && \ diff --git a/docker/win64-cross-go1.23-qt5.15-static.Dockerfile b/docker/win64-cross-go1.23-qt5.15-static.Dockerfile index f1f20aac..876973bd 100644 --- a/docker/win64-cross-go1.23-qt5.15-static.Dockerfile +++ b/docker/win64-cross-go1.23-qt5.15-static.Dockerfile @@ -1,7 +1,8 @@ FROM golang:1.23-bookworm RUN DEBIAN_FRONTEND=noninteractive apt-get update && \ - apt-get install -qyy gnupg2 ca-certificates + apt-get install -qyy gnupg2 ca-certificates && \ + apt-get clean RUN DEBIAN_FRONTEND=noninteractive \ echo "deb https://pkg.mxe.cc/repos/apt buster main" >/etc/apt/sources.list.d/mxeapt.list && \ From dc21dc3163c4d72f27962fd9c7df563ef1148596 Mon Sep 17 00:00:00 2001 From: mappu Date: Sat, 19 Oct 2024 10:38:54 +1300 Subject: [PATCH 03/15] gitignore: exclude local genbindings helper script --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 87bccef0..40db9c24 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,9 @@ cmd/genbindings/cachedir/ # docker files container-build-cache/ +# local genbindings configuration +cmd/genbindings/genbindings.local* + # binaries cmd/handbindings/handbindings cmd/handbindings/bindings_test/direct From c66203d984fbdcc89efb53e4408bc4534253f015 Mon Sep 17 00:00:00 2001 From: mappu Date: Wed, 16 Oct 2024 19:01:54 +1300 Subject: [PATCH 04/15] genbindings/go: return C char* as string --- cmd/genbindings/emitgo.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/cmd/genbindings/emitgo.go b/cmd/genbindings/emitgo.go index 229928cc..d93bac1b 100644 --- a/cmd/genbindings/emitgo.go +++ b/cmd/genbindings/emitgo.go @@ -329,7 +329,7 @@ func (gfs *goFileState) emitParameterGo2CABIForwarding(p CppParameter) (preamble func (gfs *goFileState) emitCabiToGo(assignExpr string, rt CppParameter, rvalue string) string { - shouldReturn := "return " + shouldReturn := assignExpr // "return " afterword := "" namePrefix := makeNamePrefix(rt.ParameterName) @@ -343,10 +343,16 @@ func (gfs *goFileState) emitCabiToGo(assignExpr string, rt CppParameter, rvalue // Qt functions normally return QString - anything returning char* // is something like QByteArray.Data() where it returns an unsafe // internal pointer + // However in case this is a signal, we need to be able to marshal both + // forwards and backwards with the same types, this has to be a string + // in both cases + // This is not a miqt_string and therefore MIQT did not allocate it, + // and therefore we don't have to free it either gfs.imports["unsafe"] = struct{}{} shouldReturn = namePrefix + "_ret := " - afterword += assignExpr + " (unsafe.Pointer)(" + namePrefix + "_ret)\n" + afterword += assignExpr + " C.GoString(" + namePrefix + "_ret)\n" + return shouldReturn + " " + rvalue + "\n" + afterword } else if rt.ParameterType == "QString" { gfs.imports["unsafe"] = struct{}{} From 896f150f35ac1b9eba2842fb6a1b642e382b1b52 Mon Sep 17 00:00:00 2001 From: mappu Date: Wed, 16 Oct 2024 19:02:26 +1300 Subject: [PATCH 05/15] genbindings/go: normalize handling for void* return types --- cmd/genbindings/emitgo.go | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/cmd/genbindings/emitgo.go b/cmd/genbindings/emitgo.go index d93bac1b..b4a8643c 100644 --- a/cmd/genbindings/emitgo.go +++ b/cmd/genbindings/emitgo.go @@ -335,9 +335,11 @@ func (gfs *goFileState) emitCabiToGo(assignExpr string, rt CppParameter, rvalue if rt.ParameterType == "void" && !rt.Pointer { shouldReturn = "" + return shouldReturn + " " + rvalue + "\n" + afterword } else if rt.ParameterType == "void" && rt.Pointer { - // ... + gfs.imports["unsafe"] = struct{}{} + return assignExpr + " (unsafe.Pointer)(" + rvalue + ")\n" } else if rt.ParameterType == "char" && rt.Pointer { // Qt functions normally return QString - anything returning char* @@ -361,6 +363,7 @@ func (gfs *goFileState) emitCabiToGo(assignExpr string, rt CppParameter, rvalue afterword += namePrefix + "_ret := C.GoStringN(&" + namePrefix + "_ms.data, C.int(int64(" + namePrefix + "_ms.len)))\n" afterword += "C.free(unsafe.Pointer(" + namePrefix + "_ms))\n" afterword += assignExpr + namePrefix + "_ret" + return shouldReturn + " " + rvalue + "\n" + afterword } else if t, ok := rt.QListOf(); ok { gfs.imports["unsafe"] = struct{}{} @@ -376,6 +379,7 @@ func (gfs *goFileState) emitCabiToGo(assignExpr string, rt CppParameter, rvalue afterword += "}\n" afterword += "C.free(unsafe.Pointer(" + namePrefix + "_ma))\n" afterword += assignExpr + " " + namePrefix + "_ret\n" + return shouldReturn + " " + rvalue + "\n" + afterword } else if t, ok := rt.QSetOf(); ok { @@ -393,6 +397,7 @@ func (gfs *goFileState) emitCabiToGo(assignExpr string, rt CppParameter, rvalue afterword += "}\n" afterword += "C.free(unsafe.Pointer(" + namePrefix + "_ma))\n" afterword += assignExpr + " " + namePrefix + "_ret\n" + return shouldReturn + " " + rvalue + "\n" + afterword } else if rt.QtClassType() { // Construct our Go type based on this inner CABI type @@ -433,15 +438,17 @@ func (gfs *goFileState) emitCabiToGo(assignExpr string, rt CppParameter, rvalue afterword += assignExpr + " *" + namePrefix + "_goptr\n" } } + return shouldReturn + " " + rvalue + "\n" + afterword } else if rt.IntType() || rt.IsKnownEnum() || rt.IsFlagType() || rt.ParameterType == "bool" || rt.QtCppOriginalType != nil { // Need to cast Cgo type to Go int type // Optimize assignment to avoid temporary return assignExpr + "(" + rt.RenderTypeGo(gfs) + ")(" + rvalue + ")\n" + } else { + panic("what type is this?") } - return shouldReturn + " " + rvalue + "\n" + afterword } func emitGo(src *CppParsedHeader, headerName string, packageName string) (string, error) { @@ -637,10 +644,6 @@ import "C" if m.ReturnType.QtClassType() && m.ReturnType.ParameterType != "QString" && !(m.ReturnType.Pointer || m.ReturnType.ByRef) { returnTypeDecl = "*" + returnTypeDecl } - if (m.ReturnType.ParameterType == "char" || m.ReturnType.ParameterType == "void") && m.ReturnType.Pointer { - gfs.imports["unsafe"] = struct{}{} - returnTypeDecl = "unsafe.Pointer" - } rvalue := `C.` + goClassName + `_` + m.SafeMethodName() + `(` + forwarding + `)` From f87002914db715fbcbe4c37779af285d399c6050 Mon Sep 17 00:00:00 2001 From: mappu Date: Sat, 19 Oct 2024 09:21:55 +1300 Subject: [PATCH 06/15] genbindings/cabi: emit class typedef even if there is no header --- cmd/genbindings/emitcabi.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cmd/genbindings/emitcabi.go b/cmd/genbindings/emitcabi.go index 24e217d9..b4110e55 100644 --- a/cmd/genbindings/emitcabi.go +++ b/cmd/genbindings/emitcabi.go @@ -577,9 +577,6 @@ func emitBindingCpp(src *CppParsedHeader, filename string) (string, error) { ret := strings.Builder{} for _, ref := range getReferencedTypes(src) { - if !ImportHeaderForClass(ref) { - continue - } if ref == "QString" { ret.WriteString("#include \n") @@ -593,6 +590,10 @@ func emitBindingCpp(src *CppParsedHeader, filename string) (string, error) { continue } + if !ImportHeaderForClass(ref) { + continue + } + ret.WriteString(`#include <` + ref + ">\n") } From 3547aa31037c0bb5eedfff6d01209e99daea8297 Mon Sep 17 00:00:00 2001 From: mappu Date: Sat, 19 Oct 2024 09:23:26 +1300 Subject: [PATCH 07/15] genbindings/enums: prevent enum-class clashes, allow some more short enums --- cmd/genbindings/emitgo.go | 32 +++++++++++++++++--------------- cmd/genbindings/intermediate.go | 12 ++++++++++++ 2 files changed, 29 insertions(+), 15 deletions(-) diff --git a/cmd/genbindings/emitgo.go b/cmd/genbindings/emitgo.go index b4a8643c..469d7131 100644 --- a/cmd/genbindings/emitgo.go +++ b/cmd/genbindings/emitgo.go @@ -481,13 +481,23 @@ import "C" nameTest := map[string]string{} nextEnum: for _, e := range src.Enums { + + shortEnumName := e.ShortEnumName() + + // Disallow entry<-->entry collisions for _, ee := range e.Entries { - if other, ok := nameTest[ee.EntryName]; ok { - preventShortNames[e.EnumName] = struct{}{} - preventShortNames[other] = struct{}{} + if other, ok := nameTest[shortEnumName+"::"+ee.EntryName]; ok { + preventShortNames[e.EnumName] = struct{}{} // Our full enum name + preventShortNames[other] = struct{}{} // Their full enum name continue nextEnum } - nameTest[ee.EntryName] = e.EnumName + nameTest[shortEnumName+"::"+ee.EntryName] = e.EnumName + + if _, ok := KnownClassnames[shortEnumName+"::"+ee.EntryName]; ok { + preventShortNames[e.EnumName] = struct{}{} + continue nextEnum + } + } } } @@ -497,19 +507,11 @@ import "C" continue // Removed by transformRedundant AST pass } - // Fully qualified name of the enum itself - goEnumName := cabiClassName(e.EnumName) + goEnumName := cabiClassName(e.EnumName) // Fully qualified name of the enum itself - // Shorter name, so that enum elements are reachable from the surrounding - // namespace - goEnumShortName := goEnumName + goEnumShortName := goEnumName // Shorter name, so that enum elements are reachable from the surrounding namespace if _, ok := preventShortNames[e.EnumName]; !ok { - // Strip back one single :: pair from the generated variable name - nameParts := strings.Split(e.EnumName, `::`) - if len(nameParts) > 1 { - nameParts = nameParts[0 : len(nameParts)-1] - } - goEnumShortName = cabiClassName(strings.Join(nameParts, `::`)) + goEnumShortName = cabiClassName(e.ShortEnumName()) } ret.WriteString(` diff --git a/cmd/genbindings/intermediate.go b/cmd/genbindings/intermediate.go index 7f384963..d2ee417c 100644 --- a/cmd/genbindings/intermediate.go +++ b/cmd/genbindings/intermediate.go @@ -324,6 +324,18 @@ type CppEnum struct { Entries []CppEnumEntry } +func (e CppEnum) ShortEnumName() string { + + // Strip back one single :: pair from the generated variable name + if nameParts := strings.Split(e.EnumName, `::`); len(nameParts) > 1 { + nameParts = nameParts[0 : len(nameParts)-1] + return strings.Join(nameParts, `::`) + } + + // No change + return e.EnumName +} + type CppClass struct { ClassName string Abstract bool From 82ea3d3823d4ec42fb804e5fd39e8d311c52d86f Mon Sep 17 00:00:00 2001 From: mappu Date: Sat, 19 Oct 2024 09:24:18 +1300 Subject: [PATCH 08/15] genbindings/namespaces: fix nested namespaces losing parent component --- cmd/genbindings/clang2il.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/genbindings/clang2il.go b/cmd/genbindings/clang2il.go index 1c6cc16e..4d5d0ae1 100644 --- a/cmd/genbindings/clang2il.go +++ b/cmd/genbindings/clang2il.go @@ -89,7 +89,7 @@ nextTopLevel: } else { - contents, err := parseHeader(namespaceInner, namespace+"::") + contents, err := parseHeader(namespaceInner, addNamePrefix+namespace+"::") if err != nil { panic(err) } From a78ba20f156806f3992f7e618bf34e0e69dc72ab Mon Sep 17 00:00:00 2001 From: mappu Date: Sat, 19 Oct 2024 09:45:35 +1300 Subject: [PATCH 09/15] genbindings/go: add more detailed error message for unknown AST nodes --- cmd/genbindings/emitgo.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/genbindings/emitgo.go b/cmd/genbindings/emitgo.go index 469d7131..8c64ccd3 100644 --- a/cmd/genbindings/emitgo.go +++ b/cmd/genbindings/emitgo.go @@ -446,7 +446,7 @@ func (gfs *goFileState) emitCabiToGo(assignExpr string, rt CppParameter, rvalue return assignExpr + "(" + rt.RenderTypeGo(gfs) + ")(" + rvalue + ")\n" } else { - panic("what type is this?") + panic(fmt.Sprintf("emitgo::emitCabiToGo missing type handler for parameter %+v", rt)) } } From c616c789ff425e51d213efd320dddefb2dbd0ca8 Mon Sep 17 00:00:00 2001 From: mappu Date: Sat, 19 Oct 2024 10:08:30 +1300 Subject: [PATCH 10/15] genbindings/c++1z: skip over more advanced AST node types --- cmd/genbindings/clang2il.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/cmd/genbindings/clang2il.go b/cmd/genbindings/clang2il.go index 4d5d0ae1..5ab16c83 100644 --- a/cmd/genbindings/clang2il.go +++ b/cmd/genbindings/clang2il.go @@ -56,6 +56,7 @@ nextTopLevel: "ClassTemplateSpecializationDecl", "ClassTemplatePartialSpecializationDecl", "FunctionTemplateDecl", + "BuiltinTemplateDecl", // Scintilla "VarTemplatePartialSpecializationDecl", // e.g. Qt6 qcontainerinfo.h "VarTemplateSpecializationDecl", // e.g. qhashfunctions.h "TypeAliasTemplateDecl", // e.g. qendian.h @@ -130,6 +131,12 @@ nextTopLevel: // TODO e.g. qfuturewatcher.h // Probably can't be supported in the Go binding + case "AbiTagAttr": + // e.g. scintilla.org ScintillaEditBase + case "VisibilityAttr": + // e.g. scintilla.org ScintillaEditBase + // Don't understand why this appears at top level?? + case "UsingDirectiveDecl", // qtextstream.h "UsingDecl", // qglobal.h "UsingShadowDecl": // global.h From ba92217b679b1d06c6a4d712b49ae1fc21195bb3 Mon Sep 17 00:00:00 2001 From: mappu Date: Sat, 19 Oct 2024 10:08:56 +1300 Subject: [PATCH 11/15] genbindings/main: reduce clang parallelism re peak memory usage --- cmd/genbindings/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/genbindings/main.go b/cmd/genbindings/main.go index 45fe6286..18dca961 100644 --- a/cmd/genbindings/main.go +++ b/cmd/genbindings/main.go @@ -14,7 +14,7 @@ import ( ) const ( - ClangSubprocessCount = 3 + ClangSubprocessCount = 2 BaseModule = "github.com/mappu/miqt" ) From 434c45273a5b8e885ae88b943617e21075e5a5b8 Mon Sep 17 00:00:00 2001 From: mappu Date: Sat, 19 Oct 2024 10:57:05 +1300 Subject: [PATCH 12/15] miqt: pass all miqt_string by value, not by pointer --- cmd/genbindings/emitcabi.go | 17 +++++++++++------ cmd/genbindings/emitgo.go | 18 ++++++++++-------- libmiqt/libmiqt.cpp | 8 -------- libmiqt/libmiqt.go | 10 ++++++++++ libmiqt/libmiqt.h | 4 ++-- libmiqt/strings.go | 25 ------------------------- 6 files changed, 33 insertions(+), 49 deletions(-) delete mode 100644 libmiqt/libmiqt.cpp create mode 100644 libmiqt/libmiqt.go delete mode 100644 libmiqt/strings.go diff --git a/cmd/genbindings/emitcabi.go b/cmd/genbindings/emitcabi.go index b4110e55..f48728bc 100644 --- a/cmd/genbindings/emitcabi.go +++ b/cmd/genbindings/emitcabi.go @@ -9,7 +9,7 @@ import ( func (p CppParameter) RenderTypeCabi() string { if p.ParameterType == "QString" { - return "struct miqt_string*" + return "struct miqt_string" } else if _, ok := p.QListOf(); ok { return "struct miqt_array*" @@ -146,7 +146,7 @@ func emitParametersCabi(m CppMethod, selfType string) string { for _, p := range m.Parameters { if p.ParameterType == "QString" { - tmp = append(tmp, "struct miqt_string* "+p.ParameterName) + 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) @@ -197,9 +197,10 @@ func emitCABI2CppForwarding(p CppParameter, indent string) (preamble string, for nameprefix := makeNamePrefix(p.ParameterName) if p.ParameterType == "QString" { - // The CABI has accepted two parameters - need to convert to one real QString - // Create it on the stack - preamble += indent + "QString " + nameprefix + "_QString = QString::fromUtf8(&" + p.ParameterName + "->data, " + p.ParameterName + "->len);\n" + // The CABI received parameter is a struct miqt_string, passed by value + // C++ needs it as a QString. Create one on the stack for automatic cleanup + // The caller will free the miqt_string + preamble += indent + "QString " + nameprefix + "_QString = QString::fromUtf8(" + p.ParameterName + ".data, " + p.ParameterName + ".len);\n" return preamble, nameprefix + "_QString" } else if listType, ok := p.QListOf(); ok { @@ -315,7 +316,11 @@ func emitAssignCppToCabi(assignExpression string, p CppParameter, rvalue string) afterCall += indent + "QByteArray " + namePrefix + "_b = " + namePrefix + "_ret.toUtf8();\n" } - afterCall += indent + assignExpression + "miqt_strdup(" + namePrefix + "_b.data(), " + namePrefix + "_b.length());\n" + afterCall += indent + "struct miqt_string " + namePrefix + "_ms;\n" + afterCall += indent + namePrefix + "_ms.len = " + namePrefix + "_b.length();\n" + afterCall += indent + namePrefix + "_ms.data = static_cast(malloc(" + namePrefix + "_ms.len));\n" + afterCall += indent + "memcpy(" + namePrefix + "_ms.data, " + namePrefix + "_b.data(), " + namePrefix + "_ms.len);\n" + afterCall += indent + assignExpression + namePrefix + "_ms;\n" } else if t, ok := p.QListOf(); ok { diff --git a/cmd/genbindings/emitgo.go b/cmd/genbindings/emitgo.go index 8c64ccd3..efe1a8be 100644 --- a/cmd/genbindings/emitgo.go +++ b/cmd/genbindings/emitgo.go @@ -142,7 +142,7 @@ func (p CppParameter) RenderTypeGo(gfs *goFileState) string { func (p CppParameter) parameterTypeCgo() string { if p.ParameterType == "QString" { - return "*C.struct_miqt_string" + return "C.struct_miqt_string" } if _, ok := p.QListOf(); ok { @@ -256,11 +256,13 @@ func (gfs *goFileState) emitParameterGo2CABIForwarding(p CppParameter) (preamble // Go: convert string -> miqt_string* // CABI: convert miqt_string* -> real QString - gfs.imports["libmiqt"] = struct{}{} - preamble += nameprefix + "_ms := libmiqt.Strdupg(" + p.ParameterName + ")\n" - preamble += "defer C.free(" + nameprefix + "_ms)\n" + gfs.imports["unsafe"] = struct{}{} + preamble += nameprefix + "_ms := C.struct_miqt_string{}\n" + preamble += nameprefix + "_ms.data = C.CString(" + p.ParameterName + ")\n" + preamble += nameprefix + "_ms.len = C.size_t(len(" + p.ParameterName + "))\n" + preamble += "defer C.free(unsafe.Pointer(" + nameprefix + "_ms.data))\n" - rvalue = "(*C.struct_miqt_string)(" + nameprefix + "_ms)" + rvalue = nameprefix + "_ms" } else if listType, ok := p.QListOf(); ok { // QList @@ -359,9 +361,9 @@ func (gfs *goFileState) emitCabiToGo(assignExpr string, rt CppParameter, rvalue } else if rt.ParameterType == "QString" { gfs.imports["unsafe"] = struct{}{} - shouldReturn = "var " + namePrefix + "_ms *C.struct_miqt_string = " - afterword += namePrefix + "_ret := C.GoStringN(&" + namePrefix + "_ms.data, C.int(int64(" + namePrefix + "_ms.len)))\n" - afterword += "C.free(unsafe.Pointer(" + namePrefix + "_ms))\n" + shouldReturn = "var " + namePrefix + "_ms C.struct_miqt_string = " + afterword += namePrefix + "_ret := C.GoStringN(" + namePrefix + "_ms.data, C.int(int64(" + namePrefix + "_ms.len)))\n" + afterword += "C.free(unsafe.Pointer(" + namePrefix + "_ms.data))\n" afterword += assignExpr + namePrefix + "_ret" return shouldReturn + " " + rvalue + "\n" + afterword diff --git a/libmiqt/libmiqt.cpp b/libmiqt/libmiqt.cpp deleted file mode 100644 index 5b786b34..00000000 --- a/libmiqt/libmiqt.cpp +++ /dev/null @@ -1,8 +0,0 @@ -#include "libmiqt.h" - -struct miqt_string* miqt_strdup(const char* src, size_t len) { - struct miqt_string* ret = (struct miqt_string*)( malloc(len + sizeof(size_t)) ); - ret->len = len; - memcpy(&ret->data, src, len); - return ret; -} diff --git a/libmiqt/libmiqt.go b/libmiqt/libmiqt.go new file mode 100644 index 00000000..791dfa1c --- /dev/null +++ b/libmiqt/libmiqt.go @@ -0,0 +1,10 @@ +package libmiqt + +// SPDX-License-Identifier: MIT + +/* + +#include "libmiqt.h" + +*/ +import "C" diff --git a/libmiqt/libmiqt.h b/libmiqt/libmiqt.h index 73bbcf3b..4ffc6528 100644 --- a/libmiqt/libmiqt.h +++ b/libmiqt/libmiqt.h @@ -10,12 +10,12 @@ extern "C" { struct miqt_string { size_t len; - char data; // Data continues after this element, all in the same allocation + char* data; }; struct miqt_array { size_t len; - void* data; // Separate, second allocation + void* data; }; struct miqt_string* miqt_strdup(const char* src, size_t len); diff --git a/libmiqt/strings.go b/libmiqt/strings.go deleted file mode 100644 index 5f6f5ddf..00000000 --- a/libmiqt/strings.go +++ /dev/null @@ -1,25 +0,0 @@ -package libmiqt - -// SPDX-License-Identifier: MIT - -/* - -#include "libmiqt.h" - -struct miqt_string* miqt_strdupg(_GoString_ gs) { - return miqt_strdup(_GoStringPtr(gs), _GoStringLen(gs)); -} - -*/ -import "C" - -import ( - "unsafe" -) - -// Strdupg will strdup a Go string into a miqt_string*. -// It is typed as returning an unsafe.Pointer because Cgo types cannot be shared -// across Go file boundaries. -func Strdupg(s string) unsafe.Pointer { - return unsafe.Pointer(C.miqt_strdupg(s)) -} From bb0132e0d5d972faf10a883385863ca97c827d51 Mon Sep 17 00:00:00 2001 From: mappu Date: Sat, 19 Oct 2024 12:24:49 +1300 Subject: [PATCH 13/15] genbindings/qbytearray: project as []byte --- cmd/genbindings/emitcabi.go | 24 +++++++++++++++++++++++ cmd/genbindings/emitgo.go | 34 ++++++++++++++++++++++++++++++++- cmd/genbindings/exceptions.go | 8 ++++++++ cmd/genbindings/intermediate.go | 2 +- 4 files changed, 66 insertions(+), 2 deletions(-) diff --git a/cmd/genbindings/emitcabi.go b/cmd/genbindings/emitcabi.go index f48728bc..0c59b092 100644 --- a/cmd/genbindings/emitcabi.go +++ b/cmd/genbindings/emitcabi.go @@ -11,6 +11,9 @@ func (p CppParameter) RenderTypeCabi() string { if p.ParameterType == "QString" { return "struct miqt_string" + } else if p.ParameterType == "QByteArray" { + return "struct miqt_string" + } else if _, ok := p.QListOf(); ok { return "struct miqt_array*" @@ -148,6 +151,9 @@ func emitParametersCabi(m CppMethod, selfType string) string { 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) @@ -203,6 +209,12 @@ func emitCABI2CppForwarding(p CppParameter, indent string) (preamble string, for preamble += indent + "QString " + nameprefix + "_QString = QString::fromUtf8(" + p.ParameterName + ".data, " + p.ParameterName + ".len);\n" return preamble, nameprefix + "_QString" + } else if p.ParameterType == "QByteArray" { + // The caller will free the miqt_string data + // This ctor makes a deep copy, on the stack which will be dtor'd by RAII + preamble += indent + "QByteArray " + nameprefix + "_QByteArray(" + p.ParameterName + ".data, " + p.ParameterName + ".len);\n" + return preamble, nameprefix + "_QByteArray" + } else if listType, ok := p.QListOf(); ok { preamble += indent + p.GetQtCppType().ParameterType + " " + nameprefix + "_QList;\n" @@ -322,6 +334,18 @@ func emitAssignCppToCabi(assignExpression string, p CppParameter, rvalue string) afterCall += indent + "memcpy(" + namePrefix + "_ms.data, " + namePrefix + "_b.data(), " + namePrefix + "_ms.len);\n" afterCall += indent + assignExpression + namePrefix + "_ms;\n" + } else if p.ParameterType == "QByteArray" { + // C++ has given us a QByteArray. CABI needs this as a struct miqt_string + // Do not free the data, the caller will free it + + shouldReturn = ifv(p.Const, "const ", "") + "QByteArray " + p.ParameterName + "_qb = " + + afterCall += indent + "struct miqt_string " + namePrefix + "_ms;\n" + afterCall += indent + namePrefix + "_ms.len = " + namePrefix + "_qb.length();\n" + afterCall += indent + namePrefix + "_ms.data = static_cast(malloc(" + namePrefix + "_ms.len));\n" + afterCall += indent + "memcpy(" + namePrefix + "_ms.data, " + namePrefix + "_qb.data(), " + namePrefix + "_ms.len);\n" + afterCall += indent + assignExpression + namePrefix + "_ms;\n" + } else if t, ok := p.QListOf(); ok { // In some cases rvalue is a function call and the temporary diff --git a/cmd/genbindings/emitgo.go b/cmd/genbindings/emitgo.go index efe1a8be..70566a92 100644 --- a/cmd/genbindings/emitgo.go +++ b/cmd/genbindings/emitgo.go @@ -26,6 +26,9 @@ func (p CppParameter) RenderTypeGo(gfs *goFileState) string { if p.ParameterType == "QString" { return "string" } + if p.ParameterType == "QByteArray" { + return "[]byte" + } if t, ok := p.QListOf(); ok { return "[]" + t.RenderTypeGo(gfs) @@ -145,6 +148,10 @@ func (p CppParameter) parameterTypeCgo() string { return "C.struct_miqt_string" } + if p.ParameterType == "QByteArray" { + return "C.struct_miqt_string" + } + if _, ok := p.QListOf(); ok { return "*C.struct_miqt_array" } @@ -264,6 +271,18 @@ func (gfs *goFileState) emitParameterGo2CABIForwarding(p CppParameter) (preamble rvalue = nameprefix + "_ms" + } else if p.ParameterType == "QByteArray" { + // Go: convert []byte -> miqt_string + // CABI: convert miqt_string -> QByteArray + // n.b. This can ALIAS the existing []byte data + + gfs.imports["unsafe"] = struct{}{} + preamble += nameprefix + "_alias := C.struct_miqt_string{}\n" + preamble += nameprefix + "_alias.data = (*C.char)(unsafe.Pointer(&" + p.ParameterName + "[0]))\n" + preamble += nameprefix + "_alias.len = C.size_t(len(" + p.ParameterName + "))\n" + + rvalue = nameprefix + "_alias" + } else if listType, ok := p.QListOf(); ok { // QList // Go: convert T[] -> t* and len @@ -367,6 +386,19 @@ func (gfs *goFileState) emitCabiToGo(assignExpr string, rt CppParameter, rvalue afterword += assignExpr + namePrefix + "_ret" return shouldReturn + " " + rvalue + "\n" + afterword + } else if rt.ParameterType == "QByteArray" { + // We receive the CABI type of a miqt_string. Convert it into []byte + // We must free the miqt_string data pointer - this is a data copy, + // not an alias + + gfs.imports["unsafe"] = struct{}{} + + shouldReturn = "var " + namePrefix + "_bytearray C.struct_miqt_string = " + afterword += namePrefix + "_ret := C.GoBytes(unsafe.Pointer(" + namePrefix + "_bytearray.data), C.int(int64(" + namePrefix + "_bytearray.len)))\n" + afterword += "C.free(unsafe.Pointer(" + namePrefix + "_bytearray.data))\n" + afterword += assignExpr + namePrefix + "_ret" + return shouldReturn + " " + rvalue + "\n" + afterword + } else if t, ok := rt.QListOf(); ok { gfs.imports["unsafe"] = struct{}{} @@ -645,7 +677,7 @@ import "C" if returnTypeDecl == "void" { returnTypeDecl = "" } - if m.ReturnType.QtClassType() && m.ReturnType.ParameterType != "QString" && !(m.ReturnType.Pointer || m.ReturnType.ByRef) { + if m.ReturnType.QtClassType() && m.ReturnType.ParameterType != "QString" && m.ReturnType.ParameterType != "QByteArray" && !(m.ReturnType.Pointer || m.ReturnType.ByRef) { returnTypeDecl = "*" + returnTypeDecl } diff --git a/cmd/genbindings/exceptions.go b/cmd/genbindings/exceptions.go index 085b2ad7..edb5c03c 100644 --- a/cmd/genbindings/exceptions.go +++ b/cmd/genbindings/exceptions.go @@ -47,6 +47,7 @@ func AllowHeader(fullpath string) bool { "qmaccocoaviewcontainer_mac.h", // Needs NSView* headers. TODO allow with darwin build tag "qmacnativewidget_mac.h", // Needs NSView* headers. TODO allow with darwin build tag "qstring.h", // QString does not exist in this binding + "qbytearray.h", // QByteArray does not exist in this binding "qlist.h", // QList does not exist in this binding "qvector.h": // QVector does not exist in this binding return false @@ -211,6 +212,13 @@ func CheckComplexity(p CppParameter, isReturnType bool) error { return ErrTooComplex } + // QBuffer can accept a raw pointer to an internal QByteArray, but that + // doesn't work when QByteArray is deleted + // QDataStream + if p.ParameterType == "QByteArray" && p.Pointer && !isReturnType { + return ErrTooComplex + } + if p.ParameterType == "QFormLayout::ItemRole" && p.Pointer && !isReturnType { // Out-parameters in QFormLayout return ErrTooComplex } diff --git a/cmd/genbindings/intermediate.go b/cmd/genbindings/intermediate.go index d2ee417c..87148f5e 100644 --- a/cmd/genbindings/intermediate.go +++ b/cmd/genbindings/intermediate.go @@ -110,7 +110,7 @@ func (p CppParameter) QtClassType() bool { return true } - if p.ParameterType == "QString" { + if p.ParameterType == "QString" || p.ParameterType == "QByteArray" { return true } From 48fa315a22d0cc4b4ab4cc082a272491e8c83613 Mon Sep 17 00:00:00 2001 From: mappu Date: Sat, 19 Oct 2024 12:46:15 +1300 Subject: [PATCH 14/15] examples/marshalling: replace QByteArray test case --- examples/marshalling/marshalling_test.go | 26 ++++++------------------ 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/examples/marshalling/marshalling_test.go b/examples/marshalling/marshalling_test.go index a4bd4e40..6aff7c94 100644 --- a/examples/marshalling/marshalling_test.go +++ b/examples/marshalling/marshalling_test.go @@ -3,9 +3,7 @@ package main import ( "os" "reflect" - "strings" "testing" - "unsafe" "github.com/mappu/miqt/qt" ) @@ -98,26 +96,14 @@ func TestMarshalling(t *testing.T) { }) - t.Run("QByteArray::split", func(t *testing.T) { - phrase := "the quick brown fox jumps over the lazy dog" - expect := strings.Split(phrase, " ") + t.Run("QByteArray", func(t *testing.T) { - qba := qt.NewQByteArray2(phrase) - got := qba.Split(' ') - if len(expect) != len(got) { - t.Fatalf("split: expected len=%d, got len=%d", len(expect), len(got)) - } + input := "foo bar baz" + ba := qt.QFile_EncodeName(input) + got := qt.QFile_DecodeName(ba) - for i := 0; i < len(expect); i++ { - if got[i].Length() != len(expect[i]) { - t.Errorf("split/idx=%d: expected len=%d, got %d", i, len(expect[i]), got[i].Length()) - } - - // TODO add more ergnomic QByteArray<-->string conversion - var rawData []byte = unsafe.Slice((*byte)(got[i].Data()), got[i].Length()) - if string(rawData) != expect[i] { - t.Errorf("split/idx=%d: expected %#v, got %#v", i, string(rawData), expect[i]) - } + if input != got { + t.Fatalf("QByteArray: expected %q, got %q", input, got) } }) From bbcb3c3e8f73e15fa42327876dde8c42436d90d0 Mon Sep 17 00:00:00 2001 From: mappu Date: Sat, 19 Oct 2024 12:53:33 +1300 Subject: [PATCH 15/15] qt: rebuild (miqt_string by value, remove qbytearray, namespace fixes, allow more short enum names, char* returns) --- qt/gen_qabstractanimation.cpp | 96 +- qt/gen_qabstractanimation.go | 76 +- qt/gen_qabstractanimation.h | 24 +- qt/gen_qabstractbutton.cpp | 60 +- qt/gen_qabstractbutton.go | 53 +- qt/gen_qabstractbutton.h | 16 +- qt/gen_qabstracteventdispatcher.cpp | 53 +- qt/gen_qabstracteventdispatcher.go | 45 +- qt/gen_qabstracteventdispatcher.h | 14 +- qt/gen_qabstractitemdelegate.cpp | 58 +- qt/gen_qabstractitemdelegate.go | 51 +- qt/gen_qabstractitemdelegate.h | 14 +- qt/gen_qabstractitemmodel.cpp | 152 +- qt/gen_qabstractitemmodel.go | 126 +- qt/gen_qabstractitemmodel.h | 36 +- qt/gen_qabstractitemview.cpp | 52 +- qt/gen_qabstractitemview.go | 47 +- qt/gen_qabstractitemview.h | 14 +- qt/gen_qabstractnativeeventfilter.cpp | 5 +- qt/gen_qabstractnativeeventfilter.go | 7 +- qt/gen_qabstractnativeeventfilter.h | 2 +- qt/gen_qabstractproxymodel.cpp | 56 +- qt/gen_qabstractproxymodel.go | 46 +- qt/gen_qabstractproxymodel.h | 12 +- qt/gen_qabstractscrollarea.cpp | 48 +- qt/gen_qabstractscrollarea.go | 38 +- qt/gen_qabstractscrollarea.h | 12 +- qt/gen_qabstractslider.cpp | 48 +- qt/gen_qabstractslider.go | 38 +- qt/gen_qabstractslider.h | 12 +- qt/gen_qabstractspinbox.cpp | 76 +- qt/gen_qabstractspinbox.go | 75 +- qt/gen_qabstractspinbox.h | 22 +- qt/gen_qabstractstate.cpp | 48 +- qt/gen_qabstractstate.go | 38 +- qt/gen_qabstractstate.h | 12 +- qt/gen_qabstracttextdocumentlayout.cpp | 64 +- qt/gen_qabstracttextdocumentlayout.go | 50 +- qt/gen_qabstracttextdocumentlayout.h | 16 +- qt/gen_qabstracttransition.cpp | 48 +- qt/gen_qabstracttransition.go | 38 +- qt/gen_qabstracttransition.h | 12 +- qt/gen_qaccessible.cpp | 332 ++-- qt/gen_qaccessible.go | 329 ++-- qt/gen_qaccessible.h | 88 +- qt/gen_qaccessiblebridge.cpp | 52 +- qt/gen_qaccessiblebridge.go | 47 +- qt/gen_qaccessiblebridge.h | 14 +- qt/gen_qaccessibleobject.cpp | 12 +- qt/gen_qaccessibleobject.go | 15 +- qt/gen_qaccessibleobject.h | 4 +- qt/gen_qaccessibleplugin.cpp | 52 +- qt/gen_qaccessibleplugin.go | 47 +- qt/gen_qaccessibleplugin.h | 14 +- qt/gen_qaccessiblewidget.cpp | 36 +- qt/gen_qaccessiblewidget.go | 49 +- qt/gen_qaccessiblewidget.h | 8 +- qt/gen_qaction.cpp | 124 +- qt/gen_qaction.go | 141 +- qt/gen_qaction.h | 40 +- qt/gen_qactiongroup.cpp | 56 +- qt/gen_qactiongroup.go | 55 +- qt/gen_qactiongroup.h | 16 +- qt/gen_qanimationgroup.cpp | 48 +- qt/gen_qanimationgroup.go | 38 +- qt/gen_qanimationgroup.h | 12 +- qt/gen_qapplication.cpp | 64 +- qt/gen_qapplication.go | 61 +- qt/gen_qapplication.h | 18 +- qt/gen_qarraydata.go | 4 +- qt/gen_qbitarray.go | 4 +- qt/gen_qbitmap.cpp | 8 +- qt/gen_qbitmap.go | 17 +- qt/gen_qbitmap.h | 4 +- qt/gen_qboxlayout.cpp | 144 +- qt/gen_qboxlayout.go | 114 +- qt/gen_qboxlayout.h | 36 +- qt/gen_qbuffer.cpp | 100 +- qt/gen_qbuffer.go | 86 +- qt/gen_qbuffer.h | 25 +- qt/gen_qbuttongroup.cpp | 48 +- qt/gen_qbuttongroup.go | 38 +- qt/gen_qbuttongroup.h | 12 +- qt/gen_qbytearray.cpp | 1142 ------------- qt/gen_qbytearray.go | 1453 ----------------- qt/gen_qbytearray.h | 281 ---- qt/gen_qbytearraymatcher.cpp | 29 +- qt/gen_qbytearraymatcher.go | 38 +- qt/gen_qbytearraymatcher.h | 10 +- qt/gen_qcalendar.cpp | 96 +- qt/gen_qcalendar.go | 74 +- qt/gen_qcalendar.h | 22 +- qt/gen_qcalendarwidget.cpp | 48 +- qt/gen_qcalendarwidget.go | 38 +- qt/gen_qcalendarwidget.h | 12 +- qt/gen_qcborarray.cpp | 6 +- qt/gen_qcborarray.go | 11 +- qt/gen_qcborarray.h | 2 +- qt/gen_qcborcommon.cpp | 8 +- qt/gen_qcborcommon.go | 6 +- qt/gen_qcborcommon.h | 2 +- qt/gen_qcbormap.cpp | 40 +- qt/gen_qcbormap.go | 81 +- qt/gen_qcbormap.h | 20 +- qt/gen_qcborstreamreader.cpp | 10 +- qt/gen_qcborstreamreader.go | 14 +- qt/gen_qcborstreamreader.h | 4 +- qt/gen_qcborstreamwriter.cpp | 9 +- qt/gen_qcborstreamwriter.go | 13 +- qt/gen_qcborstreamwriter.h | 3 +- qt/gen_qcborvalue.cpp | 185 ++- qt/gen_qcborvalue.go | 214 +-- qt/gen_qcborvalue.h | 50 +- qt/gen_qchar.cpp | 16 +- qt/gen_qchar.go | 12 +- qt/gen_qchar.h | 4 +- qt/gen_qcheckbox.cpp | 56 +- qt/gen_qcheckbox.go | 55 +- qt/gen_qcheckbox.h | 16 +- qt/gen_qclipboard.cpp | 92 +- qt/gen_qclipboard.go | 91 +- qt/gen_qclipboard.h | 24 +- qt/gen_qcollator.cpp | 16 +- qt/gen_qcollator.go | 37 +- qt/gen_qcollator.h | 6 +- qt/gen_qcolor.cpp | 36 +- qt/gen_qcolor.go | 45 +- qt/gen_qcolor.h | 10 +- qt/gen_qcolordialog.cpp | 56 +- qt/gen_qcolordialog.go | 55 +- qt/gen_qcolordialog.h | 16 +- qt/gen_qcolorspace.cpp | 14 +- qt/gen_qcolorspace.go | 17 +- qt/gen_qcolorspace.h | 4 +- qt/gen_qcolumnview.cpp | 48 +- qt/gen_qcolumnview.go | 38 +- qt/gen_qcolumnview.h | 12 +- qt/gen_qcombobox.cpp | 210 ++- qt/gen_qcombobox.go | 301 ++-- qt/gen_qcombobox.h | 64 +- qt/gen_qcommandlineoption.cpp | 114 +- qt/gen_qcommandlineoption.go | 213 ++- qt/gen_qcommandlineoption.h | 28 +- qt/gen_qcommandlineparser.cpp | 168 +- qt/gen_qcommandlineparser.go | 191 ++- qt/gen_qcommandlineparser.h | 36 +- qt/gen_qcommandlinkbutton.cpp | 80 +- qt/gen_qcommandlinkbutton.go | 97 +- qt/gen_qcommandlinkbutton.h | 24 +- qt/gen_qcommonstyle.cpp | 48 +- qt/gen_qcommonstyle.go | 38 +- qt/gen_qcommonstyle.h | 12 +- qt/gen_qcompleter.cpp | 120 +- qt/gen_qcompleter.go | 133 +- qt/gen_qcompleter.h | 30 +- qt/gen_qconcatenatetablesproxymodel.cpp | 56 +- qt/gen_qconcatenatetablesproxymodel.go | 46 +- qt/gen_qconcatenatetablesproxymodel.h | 12 +- qt/gen_qcoreapplication.cpp | 166 +- qt/gen_qcoreapplication.go | 167 +- qt/gen_qcoreapplication.h | 44 +- qt/gen_qcoreevent.cpp | 14 +- qt/gen_qcoreevent.go | 17 +- qt/gen_qcoreevent.h | 4 +- qt/gen_qcryptographichash.cpp | 24 +- qt/gen_qcryptographichash.go | 30 +- qt/gen_qcryptographichash.h | 6 +- qt/gen_qdatastream.cpp | 9 +- qt/gen_qdatastream.go | 13 +- qt/gen_qdatastream.h | 3 +- qt/gen_qdatawidgetmapper.cpp | 62 +- qt/gen_qdatawidgetmapper.go | 55 +- qt/gen_qdatawidgetmapper.h | 16 +- qt/gen_qdatetime.cpp | 232 ++- qt/gen_qdatetime.go | 275 ++-- qt/gen_qdatetime.h | 64 +- qt/gen_qdatetimeedit.cpp | 164 +- qt/gen_qdatetimeedit.go | 135 +- qt/gen_qdatetimeedit.h | 42 +- qt/gen_qdebug.cpp | 9 +- qt/gen_qdebug.go | 16 +- qt/gen_qdebug.h | 4 +- qt/gen_qdesktopservices.cpp | 8 +- qt/gen_qdesktopservices.go | 17 +- qt/gen_qdesktopservices.h | 4 +- qt/gen_qdesktopwidget.cpp | 48 +- qt/gen_qdesktopwidget.go | 38 +- qt/gen_qdesktopwidget.h | 12 +- qt/gen_qdial.cpp | 48 +- qt/gen_qdial.go | 38 +- qt/gen_qdial.h | 12 +- qt/gen_qdialog.cpp | 48 +- qt/gen_qdialog.go | 38 +- qt/gen_qdialog.h | 12 +- qt/gen_qdialogbuttonbox.cpp | 52 +- qt/gen_qdialogbuttonbox.go | 47 +- qt/gen_qdialogbuttonbox.h | 14 +- qt/gen_qdir.cpp | 362 ++-- qt/gen_qdir.go | 517 +++--- qt/gen_qdir.h | 92 +- qt/gen_qdiriterator.cpp | 72 +- qt/gen_qdiriterator.go | 111 +- qt/gen_qdiriterator.h | 22 +- qt/gen_qdirmodel.cpp | 110 +- qt/gen_qdirmodel.go | 121 +- qt/gen_qdirmodel.h | 28 +- qt/gen_qdockwidget.cpp | 60 +- qt/gen_qdockwidget.go | 63 +- qt/gen_qdockwidget.h | 18 +- qt/gen_qdrag.cpp | 48 +- qt/gen_qdrag.go | 38 +- qt/gen_qdrag.h | 12 +- qt/gen_qerrormessage.cpp | 58 +- qt/gen_qerrormessage.go | 61 +- qt/gen_qerrormessage.h | 16 +- qt/gen_qevent.cpp | 100 +- qt/gen_qevent.go | 163 +- qt/gen_qevent.h | 38 +- qt/gen_qeventloop.cpp | 48 +- qt/gen_qeventloop.go | 38 +- qt/gen_qeventloop.h | 12 +- qt/gen_qeventtransition.cpp | 48 +- qt/gen_qeventtransition.go | 38 +- qt/gen_qeventtransition.h | 12 +- qt/gen_qfactoryinterface.cpp | 8 +- qt/gen_qfactoryinterface.go | 8 +- qt/gen_qfile.cpp | 188 ++- qt/gen_qfile.go | 252 +-- qt/gen_qfile.h | 58 +- qt/gen_qfiledevice.cpp | 56 +- qt/gen_qfiledevice.go | 44 +- qt/gen_qfiledevice.h | 14 +- qt/gen_qfiledialog.cpp | 544 +++--- qt/gen_qfiledialog.go | 766 +++++---- qt/gen_qfiledialog.h | 128 +- qt/gen_qfileiconprovider.cpp | 8 +- qt/gen_qfileiconprovider.go | 6 +- qt/gen_qfileiconprovider.h | 2 +- qt/gen_qfileinfo.cpp | 148 +- qt/gen_qfileinfo.go | 137 +- qt/gen_qfileinfo.h | 42 +- qt/gen_qfileselector.cpp | 80 +- qt/gen_qfileselector.go | 77 +- qt/gen_qfileselector.h | 16 +- qt/gen_qfilesystemmodel.cpp | 164 +- qt/gen_qfilesystemmodel.go | 193 ++- qt/gen_qfilesystemmodel.h | 36 +- qt/gen_qfilesystemwatcher.cpp | 112 +- qt/gen_qfilesystemwatcher.go | 127 +- qt/gen_qfilesystemwatcher.h | 24 +- qt/gen_qfinalstate.cpp | 48 +- qt/gen_qfinalstate.go | 38 +- qt/gen_qfinalstate.h | 12 +- qt/gen_qfocusframe.cpp | 48 +- qt/gen_qfocusframe.go | 38 +- qt/gen_qfocusframe.h | 12 +- qt/gen_qfont.cpp | 158 +- qt/gen_qfont.go | 207 ++- qt/gen_qfont.h | 44 +- qt/gen_qfontcombobox.cpp | 48 +- qt/gen_qfontcombobox.go | 38 +- qt/gen_qfontcombobox.h | 12 +- qt/gen_qfontdatabase.cpp | 169 +- qt/gen_qfontdatabase.go | 284 ++-- qt/gen_qfontdatabase.h | 50 +- qt/gen_qfontdialog.cpp | 56 +- qt/gen_qfontdialog.go | 55 +- qt/gen_qfontdialog.h | 16 +- qt/gen_qfontinfo.cpp | 16 +- qt/gen_qfontinfo.go | 12 +- qt/gen_qfontinfo.h | 4 +- qt/gen_qfontmetrics.cpp | 152 +- qt/gen_qfontmetrics.go | 273 ++-- qt/gen_qfontmetrics.h | 64 +- qt/gen_qformlayout.cpp | 64 +- qt/gen_qformlayout.go | 71 +- qt/gen_qformlayout.h | 20 +- qt/gen_qframe.cpp | 48 +- qt/gen_qframe.go | 38 +- qt/gen_qframe.h | 12 +- qt/gen_qfutureinterface.cpp | 12 +- qt/gen_qfutureinterface.go | 15 +- qt/gen_qfutureinterface.h | 4 +- qt/gen_qfuturewatcher.cpp | 66 +- qt/gen_qfuturewatcher.go | 61 +- qt/gen_qfuturewatcher.h | 16 +- qt/gen_qgenericplugin.cpp | 54 +- qt/gen_qgenericplugin.go | 53 +- qt/gen_qgenericplugin.h | 14 +- qt/gen_qgenericpluginfactory.cpp | 14 +- qt/gen_qgenericpluginfactory.go | 23 +- qt/gen_qgenericpluginfactory.h | 2 +- qt/gen_qgesture.cpp | 288 +++- qt/gen_qgesture.go | 228 +-- qt/gen_qgesture.h | 72 +- qt/gen_qgraphicsanchorlayout.cpp | 48 +- qt/gen_qgraphicsanchorlayout.go | 38 +- qt/gen_qgraphicsanchorlayout.h | 12 +- qt/gen_qgraphicseffect.cpp | 240 ++- qt/gen_qgraphicseffect.go | 190 +-- qt/gen_qgraphicseffect.h | 60 +- qt/gen_qgraphicsitem.cpp | 180 +- qt/gen_qgraphicsitem.go | 219 +-- qt/gen_qgraphicsitem.h | 52 +- qt/gen_qgraphicsitemanimation.cpp | 48 +- qt/gen_qgraphicsitemanimation.go | 38 +- qt/gen_qgraphicsitemanimation.h | 12 +- qt/gen_qgraphicsproxywidget.cpp | 48 +- qt/gen_qgraphicsproxywidget.go | 38 +- qt/gen_qgraphicsproxywidget.h | 12 +- qt/gen_qgraphicsscene.cpp | 64 +- qt/gen_qgraphicsscene.go | 71 +- qt/gen_qgraphicsscene.h | 20 +- qt/gen_qgraphicstransform.cpp | 144 +- qt/gen_qgraphicstransform.go | 114 +- qt/gen_qgraphicstransform.h | 36 +- qt/gen_qgraphicsview.cpp | 48 +- qt/gen_qgraphicsview.go | 38 +- qt/gen_qgraphicsview.h | 12 +- qt/gen_qgraphicswidget.cpp | 60 +- qt/gen_qgraphicswidget.go | 53 +- qt/gen_qgraphicswidget.h | 16 +- qt/gen_qgridlayout.cpp | 48 +- qt/gen_qgridlayout.go | 38 +- qt/gen_qgridlayout.h | 12 +- qt/gen_qgroupbox.cpp | 68 +- qt/gen_qgroupbox.go | 69 +- qt/gen_qgroupbox.h | 20 +- qt/gen_qguiapplication.cpp | 96 +- qt/gen_qguiapplication.go | 85 +- qt/gen_qguiapplication.h | 26 +- qt/gen_qhash.go | 2 +- qt/gen_qheaderview.cpp | 62 +- qt/gen_qheaderview.go | 55 +- qt/gen_qheaderview.h | 16 +- qt/gen_qhistorystate.cpp | 48 +- qt/gen_qhistorystate.go | 38 +- qt/gen_qhistorystate.h | 12 +- qt/gen_qicon.cpp | 92 +- qt/gen_qicon.go | 135 +- qt/gen_qicon.h | 30 +- qt/gen_qiconengine.cpp | 20 +- qt/gen_qiconengine.go | 21 +- qt/gen_qiconengine.h | 6 +- qt/gen_qiconengineplugin.cpp | 52 +- qt/gen_qiconengineplugin.go | 47 +- qt/gen_qiconengineplugin.h | 14 +- qt/gen_qidentityproxymodel.cpp | 48 +- qt/gen_qidentityproxymodel.go | 38 +- qt/gen_qidentityproxymodel.h | 12 +- qt/gen_qimage.cpp | 80 +- qt/gen_qimage.go | 125 +- qt/gen_qimage.h | 28 +- qt/gen_qimageiohandler.cpp | 86 +- qt/gen_qimageiohandler.go | 86 +- qt/gen_qimageiohandler.h | 24 +- qt/gen_qimagereader.cpp | 186 ++- qt/gen_qimagereader.go | 219 +-- qt/gen_qimagereader.h | 38 +- qt/gen_qimagewriter.cpp | 171 +- qt/gen_qimagewriter.go | 208 +-- qt/gen_qimagewriter.h | 40 +- qt/gen_qinputdialog.cpp | 464 ++++-- qt/gen_qinputdialog.go | 769 +++++---- qt/gen_qinputdialog.h | 98 +- qt/gen_qinputmethod.cpp | 48 +- qt/gen_qinputmethod.go | 38 +- qt/gen_qinputmethod.h | 12 +- qt/gen_qiodevice.cpp | 106 +- qt/gen_qiodevice.go | 101 +- qt/gen_qiodevice.h | 26 +- qt/gen_qitemdelegate.cpp | 48 +- qt/gen_qitemdelegate.go | 38 +- qt/gen_qitemdelegate.h | 12 +- qt/gen_qitemeditorfactory.cpp | 18 +- qt/gen_qitemeditorfactory.go | 20 +- qt/gen_qitemeditorfactory.h | 4 +- qt/gen_qitemselectionmodel.cpp | 48 +- qt/gen_qitemselectionmodel.go | 38 +- qt/gen_qitemselectionmodel.h | 12 +- qt/gen_qjsonarray.cpp | 6 +- qt/gen_qjsonarray.go | 11 +- qt/gen_qjsonarray.h | 2 +- qt/gen_qjsondocument.cpp | 59 +- qt/gen_qjsondocument.go | 77 +- qt/gen_qjsondocument.h | 18 +- qt/gen_qjsonobject.cpp | 64 +- qt/gen_qjsonobject.go | 101 +- qt/gen_qjsonobject.h | 24 +- qt/gen_qjsonvalue.cpp | 44 +- qt/gen_qjsonvalue.go | 53 +- qt/gen_qjsonvalue.h | 12 +- qt/gen_qkeyeventtransition.cpp | 48 +- qt/gen_qkeyeventtransition.go | 38 +- qt/gen_qkeyeventtransition.h | 12 +- qt/gen_qkeysequence.cpp | 60 +- qt/gen_qkeysequence.go | 81 +- qt/gen_qkeysequence.h | 22 +- qt/gen_qkeysequenceedit.cpp | 48 +- qt/gen_qkeysequenceedit.go | 38 +- qt/gen_qkeysequenceedit.h | 12 +- qt/gen_qlabel.cpp | 100 +- qt/gen_qlabel.go | 115 +- qt/gen_qlabel.h | 28 +- qt/gen_qlayout.cpp | 48 +- qt/gen_qlayout.go | 38 +- qt/gen_qlayout.h | 12 +- qt/gen_qlcdnumber.cpp | 52 +- qt/gen_qlcdnumber.go | 47 +- qt/gen_qlcdnumber.h | 14 +- qt/gen_qlibrary.cpp | 110 +- qt/gen_qlibrary.go | 149 +- qt/gen_qlibrary.h | 36 +- qt/gen_qlibraryinfo.cpp | 36 +- qt/gen_qlibraryinfo.go | 39 +- qt/gen_qlibraryinfo.h | 8 +- qt/gen_qlineedit.cpp | 132 +- qt/gen_qlineedit.go | 149 +- qt/gen_qlineedit.h | 38 +- qt/gen_qlistview.cpp | 48 +- qt/gen_qlistview.go | 38 +- qt/gen_qlistview.h | 12 +- qt/gen_qlistwidget.cpp | 154 +- qt/gen_qlistwidget.go | 203 ++- qt/gen_qlistwidget.h | 52 +- qt/gen_qlocale.cpp | 834 +++++++--- qt/gen_qlocale.go | 919 ++++++----- qt/gen_qlocale.h | 230 +-- qt/gen_qlockfile.cpp | 4 +- qt/gen_qlockfile.go | 9 +- qt/gen_qlockfile.h | 2 +- qt/gen_qloggingcategory.cpp | 4 +- qt/gen_qloggingcategory.go | 13 +- qt/gen_qloggingcategory.h | 2 +- qt/gen_qmainwindow.cpp | 80 +- qt/gen_qmainwindow.go | 81 +- qt/gen_qmainwindow.h | 22 +- qt/gen_qmdiarea.cpp | 48 +- qt/gen_qmdiarea.go | 38 +- qt/gen_qmdiarea.h | 12 +- qt/gen_qmdisubwindow.cpp | 48 +- qt/gen_qmdisubwindow.go | 38 +- qt/gen_qmdisubwindow.h | 12 +- qt/gen_qmenu.cpp | 100 +- qt/gen_qmenu.go | 133 +- qt/gen_qmenu.h | 36 +- qt/gen_qmenubar.cpp | 60 +- qt/gen_qmenubar.go | 63 +- qt/gen_qmenubar.h | 18 +- qt/gen_qmessageauthenticationcode.cpp | 35 +- qt/gen_qmessageauthenticationcode.go | 47 +- qt/gen_qmessageauthenticationcode.h | 10 +- qt/gen_qmessagebox.cpp | 534 +++--- qt/gen_qmessagebox.go | 1177 ++++++++----- qt/gen_qmessagebox.h | 144 +- qt/gen_qmetaobject.cpp | 45 +- qt/gen_qmetaobject.go | 102 +- qt/gen_qmetaobject.h | 6 +- qt/gen_qmetatype.cpp | 19 +- qt/gen_qmetatype.go | 42 +- qt/gen_qmetatype.h | 6 +- qt/gen_qmimedata.cpp | 106 +- qt/gen_qmimedata.go | 120 +- qt/gen_qmimedata.h | 28 +- qt/gen_qmimedatabase.cpp | 42 +- qt/gen_qmimedatabase.go | 73 +- qt/gen_qmimedatabase.h | 16 +- qt/gen_qmimetype.cpp | 92 +- qt/gen_qmimetype.go | 85 +- qt/gen_qmimetype.h | 14 +- qt/gen_qmouseeventtransition.cpp | 48 +- qt/gen_qmouseeventtransition.go | 38 +- qt/gen_qmouseeventtransition.h | 12 +- qt/gen_qmovie.cpp | 119 +- qt/gen_qmovie.go | 138 +- qt/gen_qmovie.h | 32 +- qt/gen_qnamespace.go | 100 +- qt/gen_qobject.cpp | 69 +- qt/gen_qobject.go | 67 +- qt/gen_qobject.h | 16 +- qt/gen_qobjectcleanuphandler.cpp | 48 +- qt/gen_qobjectcleanuphandler.go | 38 +- qt/gen_qobjectcleanuphandler.h | 12 +- qt/gen_qobjectdefs.cpp | 34 +- qt/gen_qobjectdefs.go | 42 +- qt/gen_qobjectdefs.h | 8 +- qt/gen_qoffscreensurface.cpp | 48 +- qt/gen_qoffscreensurface.go | 40 +- qt/gen_qoffscreensurface.h | 12 +- qt/gen_qoperatingsystemversion.cpp | 8 +- qt/gen_qoperatingsystemversion.go | 6 +- qt/gen_qoperatingsystemversion.h | 2 +- qt/gen_qpagesize.cpp | 48 +- qt/gen_qpagesize.go | 57 +- qt/gen_qpagesize.h | 16 +- qt/gen_qpaintdevicewindow.cpp | 48 +- qt/gen_qpaintdevicewindow.go | 38 +- qt/gen_qpaintdevicewindow.h | 12 +- qt/gen_qpaintengine.cpp | 8 +- qt/gen_qpaintengine.go | 6 +- qt/gen_qpaintengine.h | 2 +- qt/gen_qpainter.cpp | 68 +- qt/gen_qpainter.go | 137 +- qt/gen_qpainter.h | 34 +- qt/gen_qpainterpath.cpp | 8 +- qt/gen_qpainterpath.go | 17 +- qt/gen_qpainterpath.h | 4 +- qt/gen_qparallelanimationgroup.cpp | 48 +- qt/gen_qparallelanimationgroup.go | 38 +- qt/gen_qparallelanimationgroup.h | 12 +- qt/gen_qpauseanimation.cpp | 48 +- qt/gen_qpauseanimation.go | 38 +- qt/gen_qpauseanimation.h | 12 +- qt/gen_qpdfwriter.cpp | 106 +- qt/gen_qpdfwriter.go | 124 +- qt/gen_qpdfwriter.h | 30 +- qt/gen_qpicture.cpp | 120 +- qt/gen_qpicture.go | 191 ++- qt/gen_qpicture.h | 24 +- qt/gen_qpictureformatplugin.cpp | 64 +- qt/gen_qpictureformatplugin.go | 75 +- qt/gen_qpictureformatplugin.h | 18 +- qt/gen_qpixmap.cpp | 51 +- qt/gen_qpixmap.go | 94 +- qt/gen_qpixmap.h | 24 +- qt/gen_qpixmapcache.cpp | 20 +- qt/gen_qpixmapcache.go | 41 +- qt/gen_qpixmapcache.h | 10 +- qt/gen_qplaintextedit.cpp | 168 +- qt/gen_qplaintextedit.go | 181 +- qt/gen_qplaintextedit.h | 52 +- qt/gen_qpluginloader.cpp | 76 +- qt/gen_qpluginloader.go | 75 +- qt/gen_qpluginloader.h | 22 +- qt/gen_qprocess.cpp | 274 ++-- qt/gen_qprocess.go | 405 +++-- qt/gen_qprocess.h | 70 +- qt/gen_qprogressbar.cpp | 68 +- qt/gen_qprogressbar.go | 59 +- qt/gen_qprogressbar.h | 18 +- qt/gen_qprogressdialog.cpp | 82 +- qt/gen_qprogressdialog.go | 103 +- qt/gen_qprogressdialog.h | 24 +- qt/gen_qpropertyanimation.cpp | 72 +- qt/gen_qpropertyanimation.go | 69 +- qt/gen_qpropertyanimation.h | 20 +- qt/gen_qproxystyle.cpp | 64 +- qt/gen_qproxystyle.go | 71 +- qt/gen_qproxystyle.h | 20 +- qt/gen_qpushbutton.cpp | 64 +- qt/gen_qpushbutton.go | 71 +- qt/gen_qpushbutton.h | 20 +- qt/gen_qradiobutton.cpp | 56 +- qt/gen_qradiobutton.go | 55 +- qt/gen_qradiobutton.h | 16 +- qt/gen_qrasterwindow.cpp | 48 +- qt/gen_qrasterwindow.go | 38 +- qt/gen_qrasterwindow.h | 12 +- qt/gen_qrawfont.cpp | 56 +- qt/gen_qrawfont.go | 76 +- qt/gen_qrawfont.h | 20 +- qt/gen_qregexp.cpp | 126 +- qt/gen_qregexp.go | 159 +- qt/gen_qregexp.h | 38 +- qt/gen_qregularexpression.cpp | 144 +- qt/gen_qregularexpression.go | 201 ++- qt/gen_qregularexpression.h | 44 +- qt/gen_qresource.cpp | 77 +- qt/gen_qresource.go | 123 +- qt/gen_qresource.h | 26 +- qt/gen_qrubberband.cpp | 48 +- qt/gen_qrubberband.go | 38 +- qt/gen_qrubberband.h | 12 +- qt/gen_qsavefile.cpp | 68 +- qt/gen_qsavefile.go | 69 +- qt/gen_qsavefile.h | 20 +- qt/gen_qscreen.cpp | 80 +- qt/gen_qscreen.go | 62 +- qt/gen_qscreen.h | 20 +- qt/gen_qscrollarea.cpp | 48 +- qt/gen_qscrollarea.go | 38 +- qt/gen_qscrollarea.h | 12 +- qt/gen_qscrollbar.cpp | 48 +- qt/gen_qscrollbar.go | 38 +- qt/gen_qscrollbar.h | 12 +- qt/gen_qscroller.cpp | 48 +- qt/gen_qscroller.go | 38 +- qt/gen_qscroller.h | 12 +- qt/gen_qsequentialanimationgroup.cpp | 48 +- qt/gen_qsequentialanimationgroup.go | 38 +- qt/gen_qsequentialanimationgroup.h | 12 +- qt/gen_qsessionmanager.cpp | 106 +- qt/gen_qsessionmanager.go | 119 +- qt/gen_qsessionmanager.h | 24 +- qt/gen_qsettings.cpp | 208 ++- qt/gen_qsettings.go | 307 ++-- qt/gen_qsettings.h | 66 +- qt/gen_qsharedmemory.cpp | 88 +- qt/gen_qsharedmemory.go | 95 +- qt/gen_qsharedmemory.h | 26 +- qt/gen_qshortcut.cpp | 60 +- qt/gen_qshortcut.go | 53 +- qt/gen_qshortcut.h | 16 +- qt/gen_qsignalmapper.cpp | 76 +- qt/gen_qsignalmapper.go | 87 +- qt/gen_qsignalmapper.h | 20 +- qt/gen_qsignaltransition.cpp | 62 +- qt/gen_qsignaltransition.go | 55 +- qt/gen_qsignaltransition.h | 16 +- qt/gen_qsizegrip.cpp | 48 +- qt/gen_qsizegrip.go | 38 +- qt/gen_qsizegrip.h | 12 +- qt/gen_qslider.cpp | 48 +- qt/gen_qslider.go | 38 +- qt/gen_qslider.h | 12 +- qt/gen_qsocketnotifier.cpp | 48 +- qt/gen_qsocketnotifier.go | 38 +- qt/gen_qsocketnotifier.h | 12 +- qt/gen_qsortfilterproxymodel.cpp | 72 +- qt/gen_qsortfilterproxymodel.go | 79 +- qt/gen_qsortfilterproxymodel.h | 20 +- qt/gen_qspinbox.cpp | 220 ++- qt/gen_qspinbox.go | 239 +-- qt/gen_qspinbox.h | 60 +- qt/gen_qsplashscreen.cpp | 78 +- qt/gen_qsplashscreen.go | 85 +- qt/gen_qsplashscreen.h | 22 +- qt/gen_qsplitter.cpp | 110 +- qt/gen_qsplitter.go | 93 +- qt/gen_qsplitter.h | 28 +- qt/gen_qstackedlayout.cpp | 48 +- qt/gen_qstackedlayout.go | 38 +- qt/gen_qstackedlayout.h | 12 +- qt/gen_qstackedwidget.cpp | 48 +- qt/gen_qstackedwidget.go | 38 +- qt/gen_qstackedwidget.h | 12 +- qt/gen_qstandarditemmodel.cpp | 160 +- qt/gen_qstandarditemmodel.go | 191 ++- qt/gen_qstandarditemmodel.h | 50 +- qt/gen_qstandardpaths.cpp | 92 +- qt/gen_qstandardpaths.go | 111 +- qt/gen_qstandardpaths.h | 16 +- qt/gen_qstate.cpp | 48 +- qt/gen_qstate.go | 38 +- qt/gen_qstate.h | 12 +- qt/gen_qstatemachine.cpp | 56 +- qt/gen_qstatemachine.go | 44 +- qt/gen_qstatemachine.h | 14 +- qt/gen_qstatictext.cpp | 16 +- qt/gen_qstatictext.go | 23 +- qt/gen_qstatictext.h | 6 +- qt/gen_qstatusbar.cpp | 74 +- qt/gen_qstatusbar.go | 77 +- qt/gen_qstatusbar.h | 20 +- qt/gen_qstorageinfo.cpp | 59 +- qt/gen_qstorageinfo.go | 65 +- qt/gen_qstorageinfo.h | 16 +- qt/gen_qstringlistmodel.cpp | 74 +- qt/gen_qstringlistmodel.go | 77 +- qt/gen_qstringlistmodel.h | 18 +- qt/gen_qstringmatcher.cpp | 28 +- qt/gen_qstringmatcher.go | 47 +- qt/gen_qstringmatcher.h | 12 +- qt/gen_qstringview.cpp | 35 +- qt/gen_qstringview.go | 36 +- qt/gen_qstringview.h | 8 +- qt/gen_qstyle.cpp | 60 +- qt/gen_qstyle.go | 63 +- qt/gen_qstyle.h | 18 +- qt/gen_qstyleditemdelegate.cpp | 56 +- qt/gen_qstyleditemdelegate.go | 44 +- qt/gen_qstyleditemdelegate.h | 14 +- qt/gen_qstylefactory.cpp | 12 +- qt/gen_qstylefactory.go | 17 +- qt/gen_qstylefactory.h | 2 +- qt/gen_qstylehints.cpp | 48 +- qt/gen_qstylehints.go | 38 +- qt/gen_qstylehints.h | 12 +- qt/gen_qstyleoption.go | 228 +-- qt/gen_qstylepainter.cpp | 8 +- qt/gen_qstylepainter.go | 17 +- qt/gen_qstylepainter.h | 4 +- qt/gen_qstyleplugin.cpp | 52 +- qt/gen_qstyleplugin.go | 47 +- qt/gen_qstyleplugin.h | 14 +- qt/gen_qsyntaxhighlighter.cpp | 48 +- qt/gen_qsyntaxhighlighter.go | 38 +- qt/gen_qsyntaxhighlighter.h | 12 +- qt/gen_qsystemsemaphore.cpp | 40 +- qt/gen_qsystemsemaphore.go | 61 +- qt/gen_qsystemsemaphore.h | 16 +- qt/gen_qsystemtrayicon.cpp | 90 +- qt/gen_qsystemtrayicon.go | 123 +- qt/gen_qsystemtrayicon.h | 26 +- qt/gen_qtabbar.cpp | 112 +- qt/gen_qtabbar.go | 127 +- qt/gen_qtabbar.h | 36 +- qt/gen_qtableview.cpp | 48 +- qt/gen_qtableview.go | 38 +- qt/gen_qtableview.h | 12 +- qt/gen_qtablewidget.cpp | 128 +- qt/gen_qtablewidget.go | 155 +- qt/gen_qtablewidget.h | 42 +- qt/gen_qtabwidget.cpp | 100 +- qt/gen_qtabwidget.go | 113 +- qt/gen_qtabwidget.h | 32 +- qt/gen_qtemporarydir.cpp | 30 +- qt/gen_qtemporarydir.go | 33 +- qt/gen_qtemporarydir.h | 8 +- qt/gen_qtemporaryfile.cpp | 88 +- qt/gen_qtemporaryfile.go | 99 +- qt/gen_qtemporaryfile.h | 28 +- qt/gen_qtextboundaryfinder.cpp | 12 +- qt/gen_qtextboundaryfinder.go | 15 +- qt/gen_qtextboundaryfinder.h | 4 +- qt/gen_qtextbrowser.cpp | 80 +- qt/gen_qtextbrowser.go | 79 +- qt/gen_qtextbrowser.h | 18 +- qt/gen_qtextcodec.cpp | 159 +- qt/gen_qtextcodec.go | 190 ++- qt/gen_qtextcodec.h | 36 +- qt/gen_qtextcursor.cpp | 28 +- qt/gen_qtextcursor.go | 47 +- qt/gen_qtextcursor.h | 12 +- qt/gen_qtextdocument.cpp | 167 +- qt/gen_qtextdocument.go | 196 ++- qt/gen_qtextdocument.h | 54 +- qt/gen_qtextdocumentfragment.cpp | 39 +- qt/gen_qtextdocumentfragment.go | 48 +- qt/gen_qtextdocumentfragment.h | 12 +- qt/gen_qtextdocumentwriter.cpp | 51 +- qt/gen_qtextdocumentwriter.go | 74 +- qt/gen_qtextdocumentwriter.h | 14 +- qt/gen_qtextedit.cpp | 172 +- qt/gen_qtextedit.go | 207 ++- qt/gen_qtextedit.h | 58 +- qt/gen_qtextformat.cpp | 116 +- qt/gen_qtextformat.go | 141 +- qt/gen_qtextformat.h | 36 +- qt/gen_qtextlayout.cpp | 36 +- qt/gen_qtextlayout.go | 53 +- qt/gen_qtextlayout.h | 14 +- qt/gen_qtextlist.cpp | 56 +- qt/gen_qtextlist.go | 44 +- qt/gen_qtextlist.h | 14 +- qt/gen_qtextobject.cpp | 160 +- qt/gen_qtextobject.go | 126 +- qt/gen_qtextobject.h | 40 +- qt/gen_qtextstream.cpp | 76 +- qt/gen_qtextstream.go | 87 +- qt/gen_qtextstream.h | 24 +- qt/gen_qtexttable.cpp | 48 +- qt/gen_qtexttable.go | 38 +- qt/gen_qtexttable.h | 12 +- qt/gen_qthread.cpp | 48 +- qt/gen_qthread.go | 40 +- qt/gen_qthread.h | 12 +- qt/gen_qthreadpool.cpp | 48 +- qt/gen_qthreadpool.go | 38 +- qt/gen_qthreadpool.h | 12 +- qt/gen_qtimeline.cpp | 48 +- qt/gen_qtimeline.go | 38 +- qt/gen_qtimeline.h | 12 +- qt/gen_qtimer.cpp | 48 +- qt/gen_qtimer.go | 38 +- qt/gen_qtimer.h | 12 +- qt/gen_qtimezone.cpp | 206 ++- qt/gen_qtimezone.go | 265 +-- qt/gen_qtimezone.h | 40 +- qt/gen_qtoolbar.cpp | 64 +- qt/gen_qtoolbar.go | 71 +- qt/gen_qtoolbar.h | 20 +- qt/gen_qtoolbox.cpp | 88 +- qt/gen_qtoolbox.go | 99 +- qt/gen_qtoolbox.h | 28 +- qt/gen_qtoolbutton.cpp | 48 +- qt/gen_qtoolbutton.go | 38 +- qt/gen_qtoolbutton.h | 12 +- qt/gen_qtooltip.cpp | 24 +- qt/gen_qtooltip.go | 39 +- qt/gen_qtooltip.h | 10 +- qt/gen_qtouchdevice.cpp | 12 +- qt/gen_qtouchdevice.go | 15 +- qt/gen_qtouchdevice.h | 4 +- qt/gen_qtranslator.cpp | 148 +- qt/gen_qtranslator.go | 213 ++- qt/gen_qtranslator.h | 40 +- qt/gen_qtransposeproxymodel.cpp | 48 +- qt/gen_qtransposeproxymodel.go | 38 +- qt/gen_qtransposeproxymodel.h | 12 +- qt/gen_qtreeview.cpp | 52 +- qt/gen_qtreeview.go | 47 +- qt/gen_qtreeview.h | 14 +- qt/gen_qtreewidget.cpp | 150 +- qt/gen_qtreewidget.go | 189 ++- qt/gen_qtreewidget.h | 48 +- qt/gen_qundogroup.cpp | 92 +- qt/gen_qundogroup.go | 99 +- qt/gen_qundogroup.h | 24 +- qt/gen_qundostack.cpp | 132 +- qt/gen_qundostack.go | 149 +- qt/gen_qundostack.h | 38 +- qt/gen_qundoview.cpp | 60 +- qt/gen_qundoview.go | 53 +- qt/gen_qundoview.h | 16 +- qt/gen_qurl.cpp | 438 +++-- qt/gen_qurl.go | 546 ++++--- qt/gen_qurl.h | 128 +- qt/gen_qurlquery.cpp | 102 +- qt/gen_qurlquery.go | 135 +- qt/gen_qurlquery.h | 28 +- qt/gen_quuid.cpp | 75 +- qt/gen_quuid.go | 95 +- qt/gen_quuid.h | 24 +- qt/gen_qvalidator.cpp | 268 ++- qt/gen_qvalidator.go | 247 +-- qt/gen_qvalidator.h | 74 +- qt/gen_qvariant.cpp | 40 +- qt/gen_qvariant.go | 64 +- qt/gen_qvariant.h | 10 +- qt/gen_qvariantanimation.cpp | 48 +- qt/gen_qvariantanimation.go | 38 +- qt/gen_qvariantanimation.h | 12 +- qt/gen_qversionnumber.cpp | 16 +- qt/gen_qversionnumber.go | 23 +- qt/gen_qversionnumber.h | 6 +- qt/gen_qwhatsthis.cpp | 8 +- qt/gen_qwhatsthis.go | 17 +- qt/gen_qwhatsthis.h | 4 +- qt/gen_qwidget.cpp | 202 ++- qt/gen_qwidget.go | 228 +-- qt/gen_qwidget.h | 60 +- qt/gen_qwidgetaction.cpp | 48 +- qt/gen_qwidgetaction.go | 38 +- qt/gen_qwidgetaction.h | 12 +- qt/gen_qwindow.cpp | 82 +- qt/gen_qwindow.go | 83 +- qt/gen_qwindow.h | 22 +- qt/gen_qwizard.cpp | 152 +- qt/gen_qwizard.go | 149 +- qt/gen_qwizard.h | 44 +- qt/gen_qxmlstream.cpp | 212 +-- qt/gen_qxmlstream.go | 381 +++-- qt/gen_qxmlstream.h | 73 +- qt/qprintsupport/gen_qabstractprintdialog.cpp | 48 +- qt/qprintsupport/gen_qabstractprintdialog.go | 38 +- qt/qprintsupport/gen_qabstractprintdialog.h | 12 +- qt/qprintsupport/gen_qpagesetupdialog.cpp | 48 +- qt/qprintsupport/gen_qpagesetupdialog.go | 38 +- qt/qprintsupport/gen_qpagesetupdialog.h | 12 +- qt/qprintsupport/gen_qprintdialog.cpp | 48 +- qt/qprintsupport/gen_qprintdialog.go | 38 +- qt/qprintsupport/gen_qprintdialog.h | 12 +- qt/qprintsupport/gen_qprinter.cpp | 84 +- qt/qprintsupport/gen_qprinter.go | 99 +- qt/qprintsupport/gen_qprinter.h | 28 +- qt/qprintsupport/gen_qprinterinfo.cpp | 52 +- qt/qprintsupport/gen_qprinterinfo.go | 47 +- qt/qprintsupport/gen_qprinterinfo.h | 12 +- qt/qprintsupport/gen_qprintpreviewdialog.cpp | 48 +- qt/qprintsupport/gen_qprintpreviewdialog.go | 38 +- qt/qprintsupport/gen_qprintpreviewdialog.h | 12 +- qt/qprintsupport/gen_qprintpreviewwidget.cpp | 48 +- qt/qprintsupport/gen_qprintpreviewwidget.go | 38 +- qt/qprintsupport/gen_qprintpreviewwidget.h | 12 +- 865 files changed, 35140 insertions(+), 25745 deletions(-) delete mode 100644 qt/gen_qbytearray.cpp delete mode 100644 qt/gen_qbytearray.go delete mode 100644 qt/gen_qbytearray.h diff --git a/qt/gen_qabstractanimation.cpp b/qt/gen_qabstractanimation.cpp index f25eb778..a28aff2d 100644 --- a/qt/gen_qabstractanimation.cpp +++ b/qt/gen_qabstractanimation.cpp @@ -18,18 +18,26 @@ void* QAbstractAnimation_Metacast(QAbstractAnimation* self, const char* param1) return self->qt_metacast(param1); } -struct miqt_string* QAbstractAnimation_Tr(const char* s) { +struct miqt_string QAbstractAnimation_Tr(const char* s) { QString _ret = QAbstractAnimation::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractAnimation_TrUtf8(const char* s) { +struct miqt_string QAbstractAnimation_TrUtf8(const char* s) { QString _ret = QAbstractAnimation::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QAbstractAnimation_State(const QAbstractAnimation* self) { @@ -149,32 +157,48 @@ void QAbstractAnimation_SetCurrentTime(QAbstractAnimation* self, int msecs) { self->setCurrentTime(static_cast(msecs)); } -struct miqt_string* QAbstractAnimation_Tr2(const char* s, const char* c) { +struct miqt_string QAbstractAnimation_Tr2(const char* s, const char* c) { QString _ret = QAbstractAnimation::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractAnimation_Tr3(const char* s, const char* c, int n) { +struct miqt_string QAbstractAnimation_Tr3(const char* s, const char* c, int n) { QString _ret = QAbstractAnimation::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractAnimation_TrUtf82(const char* s, const char* c) { +struct miqt_string QAbstractAnimation_TrUtf82(const char* s, const char* c) { QString _ret = QAbstractAnimation::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractAnimation_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QAbstractAnimation_TrUtf83(const char* s, const char* c, int n) { QString _ret = QAbstractAnimation::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QAbstractAnimation_Start1(QAbstractAnimation* self, int policy) { @@ -201,18 +225,26 @@ void* QAnimationDriver_Metacast(QAnimationDriver* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QAnimationDriver_Tr(const char* s) { +struct miqt_string QAnimationDriver_Tr(const char* s) { QString _ret = QAnimationDriver::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAnimationDriver_TrUtf8(const char* s) { +struct miqt_string QAnimationDriver_TrUtf8(const char* s) { QString _ret = QAnimationDriver::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QAnimationDriver_Advance(QAnimationDriver* self) { @@ -265,32 +297,48 @@ void QAnimationDriver_connect_Stopped(QAnimationDriver* self, intptr_t slot) { }); } -struct miqt_string* QAnimationDriver_Tr2(const char* s, const char* c) { +struct miqt_string QAnimationDriver_Tr2(const char* s, const char* c) { QString _ret = QAnimationDriver::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAnimationDriver_Tr3(const char* s, const char* c, int n) { +struct miqt_string QAnimationDriver_Tr3(const char* s, const char* c, int n) { QString _ret = QAnimationDriver::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAnimationDriver_TrUtf82(const char* s, const char* c) { +struct miqt_string QAnimationDriver_TrUtf82(const char* s, const char* c) { QString _ret = QAnimationDriver::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAnimationDriver_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QAnimationDriver_TrUtf83(const char* s, const char* c, int n) { QString _ret = QAnimationDriver::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QAnimationDriver_Delete(QAnimationDriver* self) { diff --git a/qt/gen_qabstractanimation.go b/qt/gen_qabstractanimation.go index f3cdb706..f18fe0ad 100644 --- a/qt/gen_qabstractanimation.go +++ b/qt/gen_qabstractanimation.go @@ -73,24 +73,24 @@ func (this *QAbstractAnimation) MetaObject() *QMetaObject { func (this *QAbstractAnimation) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QAbstractAnimation_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QAbstractAnimation_Metacast(this.h, param1_Cstring)) } func QAbstractAnimation_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractAnimation_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractAnimation_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QAbstractAnimation_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractAnimation_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractAnimation_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -246,9 +246,9 @@ func QAbstractAnimation_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractAnimation_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractAnimation_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -257,9 +257,9 @@ func QAbstractAnimation_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractAnimation_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractAnimation_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -268,9 +268,9 @@ func QAbstractAnimation_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractAnimation_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractAnimation_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -279,9 +279,9 @@ func QAbstractAnimation_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractAnimation_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractAnimation_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -352,24 +352,24 @@ func (this *QAnimationDriver) MetaObject() *QMetaObject { func (this *QAnimationDriver) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QAnimationDriver_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QAnimationDriver_Metacast(this.h, param1_Cstring)) } func QAnimationDriver_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QAnimationDriver_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAnimationDriver_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QAnimationDriver_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QAnimationDriver_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAnimationDriver_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -440,9 +440,9 @@ func QAnimationDriver_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAnimationDriver_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAnimationDriver_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -451,9 +451,9 @@ func QAnimationDriver_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAnimationDriver_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAnimationDriver_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -462,9 +462,9 @@ func QAnimationDriver_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAnimationDriver_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAnimationDriver_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -473,9 +473,9 @@ func QAnimationDriver_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAnimationDriver_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAnimationDriver_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qabstractanimation.h b/qt/gen_qabstractanimation.h index 9969a7a4..09453a10 100644 --- a/qt/gen_qabstractanimation.h +++ b/qt/gen_qabstractanimation.h @@ -29,8 +29,8 @@ typedef struct QObject QObject; QMetaObject* QAbstractAnimation_MetaObject(const QAbstractAnimation* self); void* QAbstractAnimation_Metacast(QAbstractAnimation* self, const char* param1); -struct miqt_string* QAbstractAnimation_Tr(const char* s); -struct miqt_string* QAbstractAnimation_TrUtf8(const char* s); +struct miqt_string QAbstractAnimation_Tr(const char* s); +struct miqt_string QAbstractAnimation_TrUtf8(const char* s); int QAbstractAnimation_State(const QAbstractAnimation* self); QAnimationGroup* QAbstractAnimation_Group(const QAbstractAnimation* self); int QAbstractAnimation_Direction(const QAbstractAnimation* self); @@ -56,10 +56,10 @@ void QAbstractAnimation_Resume(QAbstractAnimation* self); void QAbstractAnimation_SetPaused(QAbstractAnimation* self, bool paused); void QAbstractAnimation_Stop(QAbstractAnimation* self); void QAbstractAnimation_SetCurrentTime(QAbstractAnimation* self, int msecs); -struct miqt_string* QAbstractAnimation_Tr2(const char* s, const char* c); -struct miqt_string* QAbstractAnimation_Tr3(const char* s, const char* c, int n); -struct miqt_string* QAbstractAnimation_TrUtf82(const char* s, const char* c); -struct miqt_string* QAbstractAnimation_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QAbstractAnimation_Tr2(const char* s, const char* c); +struct miqt_string QAbstractAnimation_Tr3(const char* s, const char* c, int n); +struct miqt_string QAbstractAnimation_TrUtf82(const char* s, const char* c); +struct miqt_string QAbstractAnimation_TrUtf83(const char* s, const char* c, int n); void QAbstractAnimation_Start1(QAbstractAnimation* self, int policy); void QAbstractAnimation_Delete(QAbstractAnimation* self); @@ -67,8 +67,8 @@ QAnimationDriver* QAnimationDriver_new(); QAnimationDriver* QAnimationDriver_new2(QObject* parent); QMetaObject* QAnimationDriver_MetaObject(const QAnimationDriver* self); void* QAnimationDriver_Metacast(QAnimationDriver* self, const char* param1); -struct miqt_string* QAnimationDriver_Tr(const char* s); -struct miqt_string* QAnimationDriver_TrUtf8(const char* s); +struct miqt_string QAnimationDriver_Tr(const char* s); +struct miqt_string QAnimationDriver_TrUtf8(const char* s); void QAnimationDriver_Advance(QAnimationDriver* self); void QAnimationDriver_Install(QAnimationDriver* self); void QAnimationDriver_Uninstall(QAnimationDriver* self); @@ -80,10 +80,10 @@ void QAnimationDriver_Started(QAnimationDriver* self); void QAnimationDriver_connect_Started(QAnimationDriver* self, intptr_t slot); void QAnimationDriver_Stopped(QAnimationDriver* self); void QAnimationDriver_connect_Stopped(QAnimationDriver* self, intptr_t slot); -struct miqt_string* QAnimationDriver_Tr2(const char* s, const char* c); -struct miqt_string* QAnimationDriver_Tr3(const char* s, const char* c, int n); -struct miqt_string* QAnimationDriver_TrUtf82(const char* s, const char* c); -struct miqt_string* QAnimationDriver_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QAnimationDriver_Tr2(const char* s, const char* c); +struct miqt_string QAnimationDriver_Tr3(const char* s, const char* c, int n); +struct miqt_string QAnimationDriver_TrUtf82(const char* s, const char* c); +struct miqt_string QAnimationDriver_TrUtf83(const char* s, const char* c, int n); void QAnimationDriver_Delete(QAnimationDriver* self); #ifdef __cplusplus diff --git a/qt/gen_qabstractbutton.cpp b/qt/gen_qabstractbutton.cpp index feba46ec..053c538c 100644 --- a/qt/gen_qabstractbutton.cpp +++ b/qt/gen_qabstractbutton.cpp @@ -19,30 +19,42 @@ void* QAbstractButton_Metacast(QAbstractButton* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QAbstractButton_Tr(const char* s) { +struct miqt_string QAbstractButton_Tr(const char* s) { QString _ret = QAbstractButton::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractButton_TrUtf8(const char* s) { +struct miqt_string QAbstractButton_TrUtf8(const char* s) { QString _ret = QAbstractButton::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QAbstractButton_SetText(QAbstractButton* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QAbstractButton_SetText(QAbstractButton* self, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->setText(text_QString); } -struct miqt_string* QAbstractButton_Text(const QAbstractButton* self) { +struct miqt_string QAbstractButton_Text(const QAbstractButton* self) { QString _ret = self->text(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QAbstractButton_SetIcon(QAbstractButton* self, QIcon* icon) { @@ -182,32 +194,48 @@ void QAbstractButton_connect_Toggled(QAbstractButton* self, intptr_t slot) { }); } -struct miqt_string* QAbstractButton_Tr2(const char* s, const char* c) { +struct miqt_string QAbstractButton_Tr2(const char* s, const char* c) { QString _ret = QAbstractButton::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractButton_Tr3(const char* s, const char* c, int n) { +struct miqt_string QAbstractButton_Tr3(const char* s, const char* c, int n) { QString _ret = QAbstractButton::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractButton_TrUtf82(const char* s, const char* c) { +struct miqt_string QAbstractButton_TrUtf82(const char* s, const char* c) { QString _ret = QAbstractButton::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractButton_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QAbstractButton_TrUtf83(const char* s, const char* c, int n) { QString _ret = QAbstractButton::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QAbstractButton_AnimateClick1(QAbstractButton* self, int msec) { diff --git a/qt/gen_qabstractbutton.go b/qt/gen_qabstractbutton.go index 784def9e..2e1494da 100644 --- a/qt/gen_qabstractbutton.go +++ b/qt/gen_qabstractbutton.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "runtime/cgo" "unsafe" @@ -52,37 +51,39 @@ func (this *QAbstractButton) MetaObject() *QMetaObject { func (this *QAbstractButton) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QAbstractButton_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QAbstractButton_Metacast(this.h, param1_Cstring)) } func QAbstractButton_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractButton_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractButton_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QAbstractButton_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractButton_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractButton_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QAbstractButton) SetText(text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QAbstractButton_SetText(this.h, (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QAbstractButton_SetText(this.h, text_ms) } func (this *QAbstractButton) Text() string { - var _ms *C.struct_miqt_string = C.QAbstractButton_Text(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractButton_Text(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -267,9 +268,9 @@ func QAbstractButton_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractButton_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractButton_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -278,9 +279,9 @@ func QAbstractButton_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractButton_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractButton_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -289,9 +290,9 @@ func QAbstractButton_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractButton_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractButton_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -300,9 +301,9 @@ func QAbstractButton_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractButton_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractButton_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qabstractbutton.h b/qt/gen_qabstractbutton.h index 2fabf318..3a81ce44 100644 --- a/qt/gen_qabstractbutton.h +++ b/qt/gen_qabstractbutton.h @@ -31,10 +31,10 @@ typedef struct QSize QSize; QMetaObject* QAbstractButton_MetaObject(const QAbstractButton* self); void* QAbstractButton_Metacast(QAbstractButton* self, const char* param1); -struct miqt_string* QAbstractButton_Tr(const char* s); -struct miqt_string* QAbstractButton_TrUtf8(const char* s); -void QAbstractButton_SetText(QAbstractButton* self, struct miqt_string* text); -struct miqt_string* QAbstractButton_Text(const QAbstractButton* self); +struct miqt_string QAbstractButton_Tr(const char* s); +struct miqt_string QAbstractButton_TrUtf8(const char* s); +void QAbstractButton_SetText(QAbstractButton* self, struct miqt_string text); +struct miqt_string QAbstractButton_Text(const QAbstractButton* self); void QAbstractButton_SetIcon(QAbstractButton* self, QIcon* icon); QIcon* QAbstractButton_Icon(const QAbstractButton* self); QSize* QAbstractButton_IconSize(const QAbstractButton* self); @@ -67,10 +67,10 @@ void QAbstractButton_Clicked(QAbstractButton* self); void QAbstractButton_connect_Clicked(QAbstractButton* self, intptr_t slot); void QAbstractButton_Toggled(QAbstractButton* self, bool checked); void QAbstractButton_connect_Toggled(QAbstractButton* self, intptr_t slot); -struct miqt_string* QAbstractButton_Tr2(const char* s, const char* c); -struct miqt_string* QAbstractButton_Tr3(const char* s, const char* c, int n); -struct miqt_string* QAbstractButton_TrUtf82(const char* s, const char* c); -struct miqt_string* QAbstractButton_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QAbstractButton_Tr2(const char* s, const char* c); +struct miqt_string QAbstractButton_Tr3(const char* s, const char* c, int n); +struct miqt_string QAbstractButton_TrUtf82(const char* s, const char* c); +struct miqt_string QAbstractButton_TrUtf83(const char* s, const char* c, int n); void QAbstractButton_AnimateClick1(QAbstractButton* self, int msec); void QAbstractButton_Clicked1(QAbstractButton* self, bool checked); void QAbstractButton_connect_Clicked1(QAbstractButton* self, intptr_t slot); diff --git a/qt/gen_qabstracteventdispatcher.cpp b/qt/gen_qabstracteventdispatcher.cpp index b5b2e22d..d7f7d46d 100644 --- a/qt/gen_qabstracteventdispatcher.cpp +++ b/qt/gen_qabstracteventdispatcher.cpp @@ -22,18 +22,26 @@ void* QAbstractEventDispatcher_Metacast(QAbstractEventDispatcher* self, const ch return self->qt_metacast(param1); } -struct miqt_string* QAbstractEventDispatcher_Tr(const char* s) { +struct miqt_string QAbstractEventDispatcher_Tr(const char* s) { QString _ret = QAbstractEventDispatcher::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractEventDispatcher_TrUtf8(const char* s) { +struct miqt_string QAbstractEventDispatcher_TrUtf8(const char* s) { QString _ret = QAbstractEventDispatcher::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QAbstractEventDispatcher* QAbstractEventDispatcher_Instance() { @@ -117,8 +125,9 @@ void QAbstractEventDispatcher_RemoveNativeEventFilter(QAbstractEventDispatcher* self->removeNativeEventFilter(filterObj); } -bool QAbstractEventDispatcher_FilterNativeEvent(QAbstractEventDispatcher* self, QByteArray* eventType, void* message, long* result) { - return self->filterNativeEvent(*eventType, message, static_cast(result)); +bool QAbstractEventDispatcher_FilterNativeEvent(QAbstractEventDispatcher* self, struct miqt_string eventType, void* message, long* result) { + QByteArray eventType_QByteArray(eventType.data, eventType.len); + return self->filterNativeEvent(eventType_QByteArray, message, static_cast(result)); } void QAbstractEventDispatcher_AboutToBlock(QAbstractEventDispatcher* self) { @@ -141,32 +150,48 @@ void QAbstractEventDispatcher_connect_Awake(QAbstractEventDispatcher* self, intp }); } -struct miqt_string* QAbstractEventDispatcher_Tr2(const char* s, const char* c) { +struct miqt_string QAbstractEventDispatcher_Tr2(const char* s, const char* c) { QString _ret = QAbstractEventDispatcher::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractEventDispatcher_Tr3(const char* s, const char* c, int n) { +struct miqt_string QAbstractEventDispatcher_Tr3(const char* s, const char* c, int n) { QString _ret = QAbstractEventDispatcher::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractEventDispatcher_TrUtf82(const char* s, const char* c) { +struct miqt_string QAbstractEventDispatcher_TrUtf82(const char* s, const char* c) { QString _ret = QAbstractEventDispatcher::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractEventDispatcher_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QAbstractEventDispatcher_TrUtf83(const char* s, const char* c, int n) { QString _ret = QAbstractEventDispatcher::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QAbstractEventDispatcher* QAbstractEventDispatcher_Instance1(QThread* thread) { diff --git a/qt/gen_qabstracteventdispatcher.go b/qt/gen_qabstracteventdispatcher.go index 9a70441e..6b4758cc 100644 --- a/qt/gen_qabstracteventdispatcher.go +++ b/qt/gen_qabstracteventdispatcher.go @@ -51,24 +51,24 @@ func (this *QAbstractEventDispatcher) MetaObject() *QMetaObject { func (this *QAbstractEventDispatcher) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QAbstractEventDispatcher_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QAbstractEventDispatcher_Metacast(this.h, param1_Cstring)) } func QAbstractEventDispatcher_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractEventDispatcher_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractEventDispatcher_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QAbstractEventDispatcher_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractEventDispatcher_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractEventDispatcher_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -154,8 +154,11 @@ func (this *QAbstractEventDispatcher) RemoveNativeEventFilter(filterObj *QAbstra C.QAbstractEventDispatcher_RemoveNativeEventFilter(this.h, filterObj.cPointer()) } -func (this *QAbstractEventDispatcher) FilterNativeEvent(eventType *QByteArray, message unsafe.Pointer, result *int64) bool { - return (bool)(C.QAbstractEventDispatcher_FilterNativeEvent(this.h, eventType.cPointer(), message, (*C.long)(unsafe.Pointer(result)))) +func (this *QAbstractEventDispatcher) FilterNativeEvent(eventType []byte, message unsafe.Pointer, result *int64) bool { + eventType_alias := C.struct_miqt_string{} + eventType_alias.data = (*C.char)(unsafe.Pointer(&eventType[0])) + eventType_alias.len = C.size_t(len(eventType)) + return (bool)(C.QAbstractEventDispatcher_FilterNativeEvent(this.h, eventType_alias, message, (*C.long)(unsafe.Pointer(result)))) } func (this *QAbstractEventDispatcher) AboutToBlock() { @@ -197,9 +200,9 @@ func QAbstractEventDispatcher_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractEventDispatcher_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractEventDispatcher_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -208,9 +211,9 @@ func QAbstractEventDispatcher_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractEventDispatcher_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractEventDispatcher_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -219,9 +222,9 @@ func QAbstractEventDispatcher_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractEventDispatcher_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractEventDispatcher_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -230,9 +233,9 @@ func QAbstractEventDispatcher_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractEventDispatcher_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractEventDispatcher_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qabstracteventdispatcher.h b/qt/gen_qabstracteventdispatcher.h index 18e1043b..d942d584 100644 --- a/qt/gen_qabstracteventdispatcher.h +++ b/qt/gen_qabstracteventdispatcher.h @@ -39,8 +39,8 @@ typedef struct QThread QThread; QMetaObject* QAbstractEventDispatcher_MetaObject(const QAbstractEventDispatcher* self); void* QAbstractEventDispatcher_Metacast(QAbstractEventDispatcher* self, const char* param1); -struct miqt_string* QAbstractEventDispatcher_Tr(const char* s); -struct miqt_string* QAbstractEventDispatcher_TrUtf8(const char* s); +struct miqt_string QAbstractEventDispatcher_Tr(const char* s); +struct miqt_string QAbstractEventDispatcher_TrUtf8(const char* s); QAbstractEventDispatcher* QAbstractEventDispatcher_Instance(); bool QAbstractEventDispatcher_ProcessEvents(QAbstractEventDispatcher* self, int flags); bool QAbstractEventDispatcher_HasPendingEvents(QAbstractEventDispatcher* self); @@ -59,15 +59,15 @@ void QAbstractEventDispatcher_StartingUp(QAbstractEventDispatcher* self); void QAbstractEventDispatcher_ClosingDown(QAbstractEventDispatcher* self); void QAbstractEventDispatcher_InstallNativeEventFilter(QAbstractEventDispatcher* self, QAbstractNativeEventFilter* filterObj); void QAbstractEventDispatcher_RemoveNativeEventFilter(QAbstractEventDispatcher* self, QAbstractNativeEventFilter* filterObj); -bool QAbstractEventDispatcher_FilterNativeEvent(QAbstractEventDispatcher* self, QByteArray* eventType, void* message, long* result); +bool QAbstractEventDispatcher_FilterNativeEvent(QAbstractEventDispatcher* self, struct miqt_string eventType, void* message, long* result); void QAbstractEventDispatcher_AboutToBlock(QAbstractEventDispatcher* self); void QAbstractEventDispatcher_connect_AboutToBlock(QAbstractEventDispatcher* self, intptr_t slot); void QAbstractEventDispatcher_Awake(QAbstractEventDispatcher* self); void QAbstractEventDispatcher_connect_Awake(QAbstractEventDispatcher* self, intptr_t slot); -struct miqt_string* QAbstractEventDispatcher_Tr2(const char* s, const char* c); -struct miqt_string* QAbstractEventDispatcher_Tr3(const char* s, const char* c, int n); -struct miqt_string* QAbstractEventDispatcher_TrUtf82(const char* s, const char* c); -struct miqt_string* QAbstractEventDispatcher_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QAbstractEventDispatcher_Tr2(const char* s, const char* c); +struct miqt_string QAbstractEventDispatcher_Tr3(const char* s, const char* c, int n); +struct miqt_string QAbstractEventDispatcher_TrUtf82(const char* s, const char* c); +struct miqt_string QAbstractEventDispatcher_TrUtf83(const char* s, const char* c, int n); QAbstractEventDispatcher* QAbstractEventDispatcher_Instance1(QThread* thread); void QAbstractEventDispatcher_Delete(QAbstractEventDispatcher* self); diff --git a/qt/gen_qabstractitemdelegate.cpp b/qt/gen_qabstractitemdelegate.cpp index e7422266..390b5810 100644 --- a/qt/gen_qabstractitemdelegate.cpp +++ b/qt/gen_qabstractitemdelegate.cpp @@ -26,18 +26,26 @@ void* QAbstractItemDelegate_Metacast(QAbstractItemDelegate* self, const char* pa return self->qt_metacast(param1); } -struct miqt_string* QAbstractItemDelegate_Tr(const char* s) { +struct miqt_string QAbstractItemDelegate_Tr(const char* s) { QString _ret = QAbstractItemDelegate::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractItemDelegate_TrUtf8(const char* s) { +struct miqt_string QAbstractItemDelegate_TrUtf8(const char* s) { QString _ret = QAbstractItemDelegate::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QAbstractItemDelegate_Paint(const QAbstractItemDelegate* self, QPainter* painter, QStyleOptionViewItem* option, QModelIndex* index) { @@ -72,12 +80,16 @@ bool QAbstractItemDelegate_EditorEvent(QAbstractItemDelegate* self, QEvent* even return self->editorEvent(event, model, *option, *index); } -struct miqt_string* QAbstractItemDelegate_ElidedText(QFontMetrics* fontMetrics, int width, int mode, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +struct miqt_string QAbstractItemDelegate_ElidedText(QFontMetrics* fontMetrics, int width, int mode, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); QString _ret = QAbstractItemDelegate::elidedText(*fontMetrics, static_cast(width), static_cast(mode), text_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } bool QAbstractItemDelegate_HelpEvent(QAbstractItemDelegate* self, QHelpEvent* event, QAbstractItemView* view, QStyleOptionViewItem* option, QModelIndex* index) { @@ -132,32 +144,48 @@ void QAbstractItemDelegate_connect_SizeHintChanged(QAbstractItemDelegate* self, }); } -struct miqt_string* QAbstractItemDelegate_Tr2(const char* s, const char* c) { +struct miqt_string QAbstractItemDelegate_Tr2(const char* s, const char* c) { QString _ret = QAbstractItemDelegate::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractItemDelegate_Tr3(const char* s, const char* c, int n) { +struct miqt_string QAbstractItemDelegate_Tr3(const char* s, const char* c, int n) { QString _ret = QAbstractItemDelegate::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractItemDelegate_TrUtf82(const char* s, const char* c) { +struct miqt_string QAbstractItemDelegate_TrUtf82(const char* s, const char* c) { QString _ret = QAbstractItemDelegate::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractItemDelegate_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QAbstractItemDelegate_TrUtf83(const char* s, const char* c, int n) { QString _ret = QAbstractItemDelegate::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QAbstractItemDelegate_CloseEditor2(QAbstractItemDelegate* self, QWidget* editor, int hint) { diff --git a/qt/gen_qabstractitemdelegate.go b/qt/gen_qabstractitemdelegate.go index 3296b0cb..155d81a7 100644 --- a/qt/gen_qabstractitemdelegate.go +++ b/qt/gen_qabstractitemdelegate.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "runtime/cgo" "unsafe" @@ -62,24 +61,24 @@ func (this *QAbstractItemDelegate) MetaObject() *QMetaObject { func (this *QAbstractItemDelegate) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QAbstractItemDelegate_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QAbstractItemDelegate_Metacast(this.h, param1_Cstring)) } func QAbstractItemDelegate_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractItemDelegate_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractItemDelegate_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QAbstractItemDelegate_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractItemDelegate_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractItemDelegate_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -119,11 +118,13 @@ func (this *QAbstractItemDelegate) EditorEvent(event *QEvent, model *QAbstractIt } func QAbstractItemDelegate_ElidedText(fontMetrics *QFontMetrics, width int, mode TextElideMode, text string) string { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - var _ms *C.struct_miqt_string = C.QAbstractItemDelegate_ElidedText(fontMetrics.cPointer(), (C.int)(width), (C.int)(mode), (*C.struct_miqt_string)(text_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + var _ms C.struct_miqt_string = C.QAbstractItemDelegate_ElidedText(fontMetrics.cPointer(), (C.int)(width), (C.int)(mode), text_ms) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -207,9 +208,9 @@ func QAbstractItemDelegate_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractItemDelegate_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractItemDelegate_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -218,9 +219,9 @@ func QAbstractItemDelegate_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractItemDelegate_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractItemDelegate_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -229,9 +230,9 @@ func QAbstractItemDelegate_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractItemDelegate_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractItemDelegate_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -240,9 +241,9 @@ func QAbstractItemDelegate_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractItemDelegate_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractItemDelegate_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qabstractitemdelegate.h b/qt/gen_qabstractitemdelegate.h index 332501a7..e1d8118a 100644 --- a/qt/gen_qabstractitemdelegate.h +++ b/qt/gen_qabstractitemdelegate.h @@ -43,8 +43,8 @@ typedef struct QWidget QWidget; QMetaObject* QAbstractItemDelegate_MetaObject(const QAbstractItemDelegate* self); void* QAbstractItemDelegate_Metacast(QAbstractItemDelegate* self, const char* param1); -struct miqt_string* QAbstractItemDelegate_Tr(const char* s); -struct miqt_string* QAbstractItemDelegate_TrUtf8(const char* s); +struct miqt_string QAbstractItemDelegate_Tr(const char* s); +struct miqt_string QAbstractItemDelegate_TrUtf8(const char* s); void QAbstractItemDelegate_Paint(const QAbstractItemDelegate* self, QPainter* painter, QStyleOptionViewItem* option, QModelIndex* index); QSize* QAbstractItemDelegate_SizeHint(const QAbstractItemDelegate* self, QStyleOptionViewItem* option, QModelIndex* index); QWidget* QAbstractItemDelegate_CreateEditor(const QAbstractItemDelegate* self, QWidget* parent, QStyleOptionViewItem* option, QModelIndex* index); @@ -53,7 +53,7 @@ void QAbstractItemDelegate_SetEditorData(const QAbstractItemDelegate* self, QWid void QAbstractItemDelegate_SetModelData(const QAbstractItemDelegate* self, QWidget* editor, QAbstractItemModel* model, QModelIndex* index); void QAbstractItemDelegate_UpdateEditorGeometry(const QAbstractItemDelegate* self, QWidget* editor, QStyleOptionViewItem* option, QModelIndex* index); bool QAbstractItemDelegate_EditorEvent(QAbstractItemDelegate* self, QEvent* event, QAbstractItemModel* model, QStyleOptionViewItem* option, QModelIndex* index); -struct miqt_string* QAbstractItemDelegate_ElidedText(QFontMetrics* fontMetrics, int width, int mode, struct miqt_string* text); +struct miqt_string QAbstractItemDelegate_ElidedText(QFontMetrics* fontMetrics, int width, int mode, struct miqt_string text); bool QAbstractItemDelegate_HelpEvent(QAbstractItemDelegate* self, QHelpEvent* event, QAbstractItemView* view, QStyleOptionViewItem* option, QModelIndex* index); struct miqt_array* QAbstractItemDelegate_PaintingRoles(const QAbstractItemDelegate* self); void QAbstractItemDelegate_CommitData(QAbstractItemDelegate* self, QWidget* editor); @@ -62,10 +62,10 @@ void QAbstractItemDelegate_CloseEditor(QAbstractItemDelegate* self, QWidget* edi void QAbstractItemDelegate_connect_CloseEditor(QAbstractItemDelegate* self, intptr_t slot); void QAbstractItemDelegate_SizeHintChanged(QAbstractItemDelegate* self, QModelIndex* param1); void QAbstractItemDelegate_connect_SizeHintChanged(QAbstractItemDelegate* self, intptr_t slot); -struct miqt_string* QAbstractItemDelegate_Tr2(const char* s, const char* c); -struct miqt_string* QAbstractItemDelegate_Tr3(const char* s, const char* c, int n); -struct miqt_string* QAbstractItemDelegate_TrUtf82(const char* s, const char* c); -struct miqt_string* QAbstractItemDelegate_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QAbstractItemDelegate_Tr2(const char* s, const char* c); +struct miqt_string QAbstractItemDelegate_Tr3(const char* s, const char* c, int n); +struct miqt_string QAbstractItemDelegate_TrUtf82(const char* s, const char* c); +struct miqt_string QAbstractItemDelegate_TrUtf83(const char* s, const char* c, int n); void QAbstractItemDelegate_CloseEditor2(QAbstractItemDelegate* self, QWidget* editor, int hint); void QAbstractItemDelegate_connect_CloseEditor2(QAbstractItemDelegate* self, intptr_t slot); void QAbstractItemDelegate_Delete(QAbstractItemDelegate* self); diff --git a/qt/gen_qabstractitemmodel.cpp b/qt/gen_qabstractitemmodel.cpp index f71620dd..21ebc1f6 100644 --- a/qt/gen_qabstractitemmodel.cpp +++ b/qt/gen_qabstractitemmodel.cpp @@ -203,18 +203,26 @@ void* QAbstractItemModel_Metacast(QAbstractItemModel* self, const char* param1) return self->qt_metacast(param1); } -struct miqt_string* QAbstractItemModel_Tr(const char* s) { +struct miqt_string QAbstractItemModel_Tr(const char* s) { QString _ret = QAbstractItemModel::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractItemModel_TrUtf8(const char* s) { +struct miqt_string QAbstractItemModel_TrUtf8(const char* s) { QString _ret = QAbstractItemModel::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } bool QAbstractItemModel_HasIndex(const QAbstractItemModel* self, int row, int column) { @@ -264,12 +272,16 @@ bool QAbstractItemModel_SetHeaderData(QAbstractItemModel* self, int section, int struct miqt_array* QAbstractItemModel_MimeTypes(const QAbstractItemModel* self) { QStringList _ret = self->mimeTypes(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -453,32 +465,48 @@ void QAbstractItemModel_Revert(QAbstractItemModel* self) { self->revert(); } -struct miqt_string* QAbstractItemModel_Tr2(const char* s, const char* c) { +struct miqt_string QAbstractItemModel_Tr2(const char* s, const char* c) { QString _ret = QAbstractItemModel::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractItemModel_Tr3(const char* s, const char* c, int n) { +struct miqt_string QAbstractItemModel_Tr3(const char* s, const char* c, int n) { QString _ret = QAbstractItemModel::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractItemModel_TrUtf82(const char* s, const char* c) { +struct miqt_string QAbstractItemModel_TrUtf82(const char* s, const char* c) { QString _ret = QAbstractItemModel::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractItemModel_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QAbstractItemModel_TrUtf83(const char* s, const char* c, int n) { QString _ret = QAbstractItemModel::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } bool QAbstractItemModel_HasIndex3(const QAbstractItemModel* self, int row, int column, QModelIndex* parent) { @@ -735,18 +763,26 @@ void* QAbstractTableModel_Metacast(QAbstractTableModel* self, const char* param1 return self->qt_metacast(param1); } -struct miqt_string* QAbstractTableModel_Tr(const char* s) { +struct miqt_string QAbstractTableModel_Tr(const char* s) { QString _ret = QAbstractTableModel::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractTableModel_TrUtf8(const char* s) { +struct miqt_string QAbstractTableModel_TrUtf8(const char* s) { QString _ret = QAbstractTableModel::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QModelIndex* QAbstractTableModel_Index(const QAbstractTableModel* self, int row, int column) { @@ -766,32 +802,48 @@ int QAbstractTableModel_Flags(const QAbstractTableModel* self, QModelIndex* inde return static_cast(_ret); } -struct miqt_string* QAbstractTableModel_Tr2(const char* s, const char* c) { +struct miqt_string QAbstractTableModel_Tr2(const char* s, const char* c) { QString _ret = QAbstractTableModel::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractTableModel_Tr3(const char* s, const char* c, int n) { +struct miqt_string QAbstractTableModel_Tr3(const char* s, const char* c, int n) { QString _ret = QAbstractTableModel::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractTableModel_TrUtf82(const char* s, const char* c) { +struct miqt_string QAbstractTableModel_TrUtf82(const char* s, const char* c) { QString _ret = QAbstractTableModel::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractTableModel_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QAbstractTableModel_TrUtf83(const char* s, const char* c, int n) { QString _ret = QAbstractTableModel::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QModelIndex* QAbstractTableModel_Index3(const QAbstractTableModel* self, int row, int column, QModelIndex* parent) { @@ -810,18 +862,26 @@ void* QAbstractListModel_Metacast(QAbstractListModel* self, const char* param1) return self->qt_metacast(param1); } -struct miqt_string* QAbstractListModel_Tr(const char* s) { +struct miqt_string QAbstractListModel_Tr(const char* s) { QString _ret = QAbstractListModel::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractListModel_TrUtf8(const char* s) { +struct miqt_string QAbstractListModel_TrUtf8(const char* s) { QString _ret = QAbstractListModel::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QModelIndex* QAbstractListModel_Index(const QAbstractListModel* self, int row) { @@ -841,32 +901,48 @@ int QAbstractListModel_Flags(const QAbstractListModel* self, QModelIndex* index) return static_cast(_ret); } -struct miqt_string* QAbstractListModel_Tr2(const char* s, const char* c) { +struct miqt_string QAbstractListModel_Tr2(const char* s, const char* c) { QString _ret = QAbstractListModel::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractListModel_Tr3(const char* s, const char* c, int n) { +struct miqt_string QAbstractListModel_Tr3(const char* s, const char* c, int n) { QString _ret = QAbstractListModel::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractListModel_TrUtf82(const char* s, const char* c) { +struct miqt_string QAbstractListModel_TrUtf82(const char* s, const char* c) { QString _ret = QAbstractListModel::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractListModel_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QAbstractListModel_TrUtf83(const char* s, const char* c, int n) { QString _ret = QAbstractListModel::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QModelIndex* QAbstractListModel_Index2(const QAbstractListModel* self, int row, int column) { diff --git a/qt/gen_qabstractitemmodel.go b/qt/gen_qabstractitemmodel.go index 9c9dc594..8114f47e 100644 --- a/qt/gen_qabstractitemmodel.go +++ b/qt/gen_qabstractitemmodel.go @@ -85,7 +85,7 @@ func (this *QModelIndex) InternalId() uintptr { } func (this *QModelIndex) InternalPointer() unsafe.Pointer { - return C.QModelIndex_InternalPointer(this.h) + return (unsafe.Pointer)(C.QModelIndex_InternalPointer(this.h)) } func (this *QModelIndex) Parent() *QModelIndex { @@ -263,7 +263,7 @@ func (this *QPersistentModelIndex) Column() int { } func (this *QPersistentModelIndex) InternalPointer() unsafe.Pointer { - return C.QPersistentModelIndex_InternalPointer(this.h) + return (unsafe.Pointer)(C.QPersistentModelIndex_InternalPointer(this.h)) } func (this *QPersistentModelIndex) InternalId() uintptr { @@ -368,24 +368,24 @@ func (this *QAbstractItemModel) MetaObject() *QMetaObject { func (this *QAbstractItemModel) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QAbstractItemModel_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QAbstractItemModel_Metacast(this.h, param1_Cstring)) } func QAbstractItemModel_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractItemModel_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractItemModel_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QAbstractItemModel_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractItemModel_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractItemModel_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -451,11 +451,11 @@ func (this *QAbstractItemModel) SetHeaderData(section int, orientation Orientati func (this *QAbstractItemModel) MimeTypes() []string { var _ma *C.struct_miqt_array = C.QAbstractItemModel_MimeTypes(this.h) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -678,9 +678,9 @@ func QAbstractItemModel_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractItemModel_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractItemModel_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -689,9 +689,9 @@ func QAbstractItemModel_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractItemModel_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractItemModel_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -700,9 +700,9 @@ func QAbstractItemModel_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractItemModel_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractItemModel_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -711,9 +711,9 @@ func QAbstractItemModel_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractItemModel_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractItemModel_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -1074,24 +1074,24 @@ func (this *QAbstractTableModel) MetaObject() *QMetaObject { func (this *QAbstractTableModel) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QAbstractTableModel_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QAbstractTableModel_Metacast(this.h, param1_Cstring)) } func QAbstractTableModel_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractTableModel_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractTableModel_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QAbstractTableModel_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractTableModel_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractTableModel_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -1122,9 +1122,9 @@ func QAbstractTableModel_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractTableModel_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractTableModel_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -1133,9 +1133,9 @@ func QAbstractTableModel_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractTableModel_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractTableModel_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -1144,9 +1144,9 @@ func QAbstractTableModel_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractTableModel_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractTableModel_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -1155,9 +1155,9 @@ func QAbstractTableModel_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractTableModel_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractTableModel_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -1219,24 +1219,24 @@ func (this *QAbstractListModel) MetaObject() *QMetaObject { func (this *QAbstractListModel) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QAbstractListModel_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QAbstractListModel_Metacast(this.h, param1_Cstring)) } func QAbstractListModel_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractListModel_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractListModel_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QAbstractListModel_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractListModel_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractListModel_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -1267,9 +1267,9 @@ func QAbstractListModel_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractListModel_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractListModel_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -1278,9 +1278,9 @@ func QAbstractListModel_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractListModel_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractListModel_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -1289,9 +1289,9 @@ func QAbstractListModel_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractListModel_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractListModel_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -1300,9 +1300,9 @@ func QAbstractListModel_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractListModel_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractListModel_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qabstractitemmodel.h b/qt/gen_qabstractitemmodel.h index b69d4c41..b8922f80 100644 --- a/qt/gen_qabstractitemmodel.h +++ b/qt/gen_qabstractitemmodel.h @@ -83,8 +83,8 @@ void QPersistentModelIndex_Delete(QPersistentModelIndex* self); QMetaObject* QAbstractItemModel_MetaObject(const QAbstractItemModel* self); void* QAbstractItemModel_Metacast(QAbstractItemModel* self, const char* param1); -struct miqt_string* QAbstractItemModel_Tr(const char* s); -struct miqt_string* QAbstractItemModel_TrUtf8(const char* s); +struct miqt_string QAbstractItemModel_Tr(const char* s); +struct miqt_string QAbstractItemModel_TrUtf8(const char* s); bool QAbstractItemModel_HasIndex(const QAbstractItemModel* self, int row, int column); QModelIndex* QAbstractItemModel_Index(const QAbstractItemModel* self, int row, int column); QModelIndex* QAbstractItemModel_Parent(const QAbstractItemModel* self, QModelIndex* child); @@ -132,10 +132,10 @@ void QAbstractItemModel_LayoutAboutToBeChanged(QAbstractItemModel* self); void QAbstractItemModel_connect_LayoutAboutToBeChanged(QAbstractItemModel* self, intptr_t slot); bool QAbstractItemModel_Submit(QAbstractItemModel* self); void QAbstractItemModel_Revert(QAbstractItemModel* self); -struct miqt_string* QAbstractItemModel_Tr2(const char* s, const char* c); -struct miqt_string* QAbstractItemModel_Tr3(const char* s, const char* c, int n); -struct miqt_string* QAbstractItemModel_TrUtf82(const char* s, const char* c); -struct miqt_string* QAbstractItemModel_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QAbstractItemModel_Tr2(const char* s, const char* c); +struct miqt_string QAbstractItemModel_Tr3(const char* s, const char* c, int n); +struct miqt_string QAbstractItemModel_TrUtf82(const char* s, const char* c); +struct miqt_string QAbstractItemModel_TrUtf83(const char* s, const char* c, int n); bool QAbstractItemModel_HasIndex3(const QAbstractItemModel* self, int row, int column, QModelIndex* parent); QModelIndex* QAbstractItemModel_Index3(const QAbstractItemModel* self, int row, int column, QModelIndex* parent); int QAbstractItemModel_RowCount1(const QAbstractItemModel* self, QModelIndex* parent); @@ -171,31 +171,31 @@ void QAbstractItemModel_Delete(QAbstractItemModel* self); QMetaObject* QAbstractTableModel_MetaObject(const QAbstractTableModel* self); void* QAbstractTableModel_Metacast(QAbstractTableModel* self, const char* param1); -struct miqt_string* QAbstractTableModel_Tr(const char* s); -struct miqt_string* QAbstractTableModel_TrUtf8(const char* s); +struct miqt_string QAbstractTableModel_Tr(const char* s); +struct miqt_string QAbstractTableModel_TrUtf8(const char* s); QModelIndex* QAbstractTableModel_Index(const QAbstractTableModel* self, int row, int column); QModelIndex* QAbstractTableModel_Sibling(const QAbstractTableModel* self, int row, int column, QModelIndex* idx); bool QAbstractTableModel_DropMimeData(QAbstractTableModel* self, QMimeData* data, int action, int row, int column, QModelIndex* parent); int QAbstractTableModel_Flags(const QAbstractTableModel* self, QModelIndex* index); -struct miqt_string* QAbstractTableModel_Tr2(const char* s, const char* c); -struct miqt_string* QAbstractTableModel_Tr3(const char* s, const char* c, int n); -struct miqt_string* QAbstractTableModel_TrUtf82(const char* s, const char* c); -struct miqt_string* QAbstractTableModel_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QAbstractTableModel_Tr2(const char* s, const char* c); +struct miqt_string QAbstractTableModel_Tr3(const char* s, const char* c, int n); +struct miqt_string QAbstractTableModel_TrUtf82(const char* s, const char* c); +struct miqt_string QAbstractTableModel_TrUtf83(const char* s, const char* c, int n); QModelIndex* QAbstractTableModel_Index3(const QAbstractTableModel* self, int row, int column, QModelIndex* parent); void QAbstractTableModel_Delete(QAbstractTableModel* self); QMetaObject* QAbstractListModel_MetaObject(const QAbstractListModel* self); void* QAbstractListModel_Metacast(QAbstractListModel* self, const char* param1); -struct miqt_string* QAbstractListModel_Tr(const char* s); -struct miqt_string* QAbstractListModel_TrUtf8(const char* s); +struct miqt_string QAbstractListModel_Tr(const char* s); +struct miqt_string QAbstractListModel_TrUtf8(const char* s); QModelIndex* QAbstractListModel_Index(const QAbstractListModel* self, int row); QModelIndex* QAbstractListModel_Sibling(const QAbstractListModel* self, int row, int column, QModelIndex* idx); bool QAbstractListModel_DropMimeData(QAbstractListModel* self, QMimeData* data, int action, int row, int column, QModelIndex* parent); int QAbstractListModel_Flags(const QAbstractListModel* self, QModelIndex* index); -struct miqt_string* QAbstractListModel_Tr2(const char* s, const char* c); -struct miqt_string* QAbstractListModel_Tr3(const char* s, const char* c, int n); -struct miqt_string* QAbstractListModel_TrUtf82(const char* s, const char* c); -struct miqt_string* QAbstractListModel_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QAbstractListModel_Tr2(const char* s, const char* c); +struct miqt_string QAbstractListModel_Tr3(const char* s, const char* c, int n); +struct miqt_string QAbstractListModel_TrUtf82(const char* s, const char* c); +struct miqt_string QAbstractListModel_TrUtf83(const char* s, const char* c, int n); QModelIndex* QAbstractListModel_Index2(const QAbstractListModel* self, int row, int column); QModelIndex* QAbstractListModel_Index3(const QAbstractListModel* self, int row, int column, QModelIndex* parent); void QAbstractListModel_Delete(QAbstractListModel* self); diff --git a/qt/gen_qabstractitemview.cpp b/qt/gen_qabstractitemview.cpp index b14323e1..cfec26e0 100644 --- a/qt/gen_qabstractitemview.cpp +++ b/qt/gen_qabstractitemview.cpp @@ -24,18 +24,26 @@ void* QAbstractItemView_Metacast(QAbstractItemView* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QAbstractItemView_Tr(const char* s) { +struct miqt_string QAbstractItemView_Tr(const char* s) { QString _ret = QAbstractItemView::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractItemView_TrUtf8(const char* s) { +struct miqt_string QAbstractItemView_TrUtf8(const char* s) { QString _ret = QAbstractItemView::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QAbstractItemView_SetModel(QAbstractItemView* self, QAbstractItemModel* model) { @@ -214,8 +222,8 @@ int QAbstractItemView_TextElideMode(const QAbstractItemView* self) { return static_cast(_ret); } -void QAbstractItemView_KeyboardSearch(QAbstractItemView* self, struct miqt_string* search) { - QString search_QString = QString::fromUtf8(&search->data, search->len); +void QAbstractItemView_KeyboardSearch(QAbstractItemView* self, struct miqt_string search) { + QString search_QString = QString::fromUtf8(search.data, search.len); self->keyboardSearch(search_QString); } @@ -415,32 +423,48 @@ void QAbstractItemView_connect_IconSizeChanged(QAbstractItemView* self, intptr_t }); } -struct miqt_string* QAbstractItemView_Tr2(const char* s, const char* c) { +struct miqt_string QAbstractItemView_Tr2(const char* s, const char* c) { QString _ret = QAbstractItemView::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractItemView_Tr3(const char* s, const char* c, int n) { +struct miqt_string QAbstractItemView_Tr3(const char* s, const char* c, int n) { QString _ret = QAbstractItemView::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractItemView_TrUtf82(const char* s, const char* c) { +struct miqt_string QAbstractItemView_TrUtf82(const char* s, const char* c) { QString _ret = QAbstractItemView::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractItemView_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QAbstractItemView_TrUtf83(const char* s, const char* c, int n) { QString _ret = QAbstractItemView::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QAbstractItemView_ScrollTo2(QAbstractItemView* self, QModelIndex* index, int hint) { diff --git a/qt/gen_qabstractitemview.go b/qt/gen_qabstractitemview.go index 45fc46a1..f556f4da 100644 --- a/qt/gen_qabstractitemview.go +++ b/qt/gen_qabstractitemview.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "runtime/cgo" "unsafe" @@ -108,24 +107,24 @@ func (this *QAbstractItemView) MetaObject() *QMetaObject { func (this *QAbstractItemView) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QAbstractItemView_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QAbstractItemView_Metacast(this.h, param1_Cstring)) } func QAbstractItemView_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractItemView_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractItemView_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QAbstractItemView_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractItemView_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractItemView_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -307,9 +306,11 @@ func (this *QAbstractItemView) TextElideMode() TextElideMode { } func (this *QAbstractItemView) KeyboardSearch(search string) { - search_ms := libmiqt.Strdupg(search) - defer C.free(search_ms) - C.QAbstractItemView_KeyboardSearch(this.h, (*C.struct_miqt_string)(search_ms)) + search_ms := C.struct_miqt_string{} + search_ms.data = C.CString(search) + search_ms.len = C.size_t(len(search)) + defer C.free(unsafe.Pointer(search_ms.data)) + C.QAbstractItemView_KeyboardSearch(this.h, search_ms) } func (this *QAbstractItemView) VisualRect(index *QModelIndex) *QRect { @@ -574,9 +575,9 @@ func QAbstractItemView_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractItemView_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractItemView_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -585,9 +586,9 @@ func QAbstractItemView_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractItemView_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractItemView_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -596,9 +597,9 @@ func QAbstractItemView_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractItemView_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractItemView_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -607,9 +608,9 @@ func QAbstractItemView_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractItemView_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractItemView_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qabstractitemview.h b/qt/gen_qabstractitemview.h index 3b8ab5af..e2338701 100644 --- a/qt/gen_qabstractitemview.h +++ b/qt/gen_qabstractitemview.h @@ -41,8 +41,8 @@ typedef struct QWidget QWidget; QMetaObject* QAbstractItemView_MetaObject(const QAbstractItemView* self); void* QAbstractItemView_Metacast(QAbstractItemView* self, const char* param1); -struct miqt_string* QAbstractItemView_Tr(const char* s); -struct miqt_string* QAbstractItemView_TrUtf8(const char* s); +struct miqt_string QAbstractItemView_Tr(const char* s); +struct miqt_string QAbstractItemView_TrUtf8(const char* s); void QAbstractItemView_SetModel(QAbstractItemView* self, QAbstractItemModel* model); QAbstractItemModel* QAbstractItemView_Model(const QAbstractItemView* self); void QAbstractItemView_SetSelectionModel(QAbstractItemView* self, QItemSelectionModel* selectionModel); @@ -85,7 +85,7 @@ void QAbstractItemView_SetIconSize(QAbstractItemView* self, QSize* size); QSize* QAbstractItemView_IconSize(const QAbstractItemView* self); void QAbstractItemView_SetTextElideMode(QAbstractItemView* self, int mode); int QAbstractItemView_TextElideMode(const QAbstractItemView* self); -void QAbstractItemView_KeyboardSearch(QAbstractItemView* self, struct miqt_string* search); +void QAbstractItemView_KeyboardSearch(QAbstractItemView* self, struct miqt_string search); QRect* QAbstractItemView_VisualRect(const QAbstractItemView* self, QModelIndex* index); void QAbstractItemView_ScrollTo(QAbstractItemView* self, QModelIndex* index); QModelIndex* QAbstractItemView_IndexAt(const QAbstractItemView* self, QPoint* point); @@ -127,10 +127,10 @@ void QAbstractItemView_ViewportEntered(QAbstractItemView* self); void QAbstractItemView_connect_ViewportEntered(QAbstractItemView* self, intptr_t slot); void QAbstractItemView_IconSizeChanged(QAbstractItemView* self, QSize* size); void QAbstractItemView_connect_IconSizeChanged(QAbstractItemView* self, intptr_t slot); -struct miqt_string* QAbstractItemView_Tr2(const char* s, const char* c); -struct miqt_string* QAbstractItemView_Tr3(const char* s, const char* c, int n); -struct miqt_string* QAbstractItemView_TrUtf82(const char* s, const char* c); -struct miqt_string* QAbstractItemView_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QAbstractItemView_Tr2(const char* s, const char* c); +struct miqt_string QAbstractItemView_Tr3(const char* s, const char* c, int n); +struct miqt_string QAbstractItemView_TrUtf82(const char* s, const char* c); +struct miqt_string QAbstractItemView_TrUtf83(const char* s, const char* c, int n); void QAbstractItemView_ScrollTo2(QAbstractItemView* self, QModelIndex* index, int hint); void QAbstractItemView_Delete(QAbstractItemView* self); diff --git a/qt/gen_qabstractnativeeventfilter.cpp b/qt/gen_qabstractnativeeventfilter.cpp index d611c0bc..53166bf8 100644 --- a/qt/gen_qabstractnativeeventfilter.cpp +++ b/qt/gen_qabstractnativeeventfilter.cpp @@ -4,8 +4,9 @@ #include "gen_qabstractnativeeventfilter.h" #include "_cgo_export.h" -bool QAbstractNativeEventFilter_NativeEventFilter(QAbstractNativeEventFilter* self, QByteArray* eventType, void* message, long* result) { - return self->nativeEventFilter(*eventType, message, static_cast(result)); +bool QAbstractNativeEventFilter_NativeEventFilter(QAbstractNativeEventFilter* self, struct miqt_string eventType, void* message, long* result) { + QByteArray eventType_QByteArray(eventType.data, eventType.len); + return self->nativeEventFilter(eventType_QByteArray, message, static_cast(result)); } void QAbstractNativeEventFilter_Delete(QAbstractNativeEventFilter* self) { diff --git a/qt/gen_qabstractnativeeventfilter.go b/qt/gen_qabstractnativeeventfilter.go index fdc1b584..f4a6fb00 100644 --- a/qt/gen_qabstractnativeeventfilter.go +++ b/qt/gen_qabstractnativeeventfilter.go @@ -42,8 +42,11 @@ func UnsafeNewQAbstractNativeEventFilter(h unsafe.Pointer) *QAbstractNativeEvent return newQAbstractNativeEventFilter((*C.QAbstractNativeEventFilter)(h)) } -func (this *QAbstractNativeEventFilter) NativeEventFilter(eventType *QByteArray, message unsafe.Pointer, result *int64) bool { - return (bool)(C.QAbstractNativeEventFilter_NativeEventFilter(this.h, eventType.cPointer(), message, (*C.long)(unsafe.Pointer(result)))) +func (this *QAbstractNativeEventFilter) NativeEventFilter(eventType []byte, message unsafe.Pointer, result *int64) bool { + eventType_alias := C.struct_miqt_string{} + eventType_alias.data = (*C.char)(unsafe.Pointer(&eventType[0])) + eventType_alias.len = C.size_t(len(eventType)) + return (bool)(C.QAbstractNativeEventFilter_NativeEventFilter(this.h, eventType_alias, message, (*C.long)(unsafe.Pointer(result)))) } // Delete this object from C++ memory. diff --git a/qt/gen_qabstractnativeeventfilter.h b/qt/gen_qabstractnativeeventfilter.h index 399a7015..97b88326 100644 --- a/qt/gen_qabstractnativeeventfilter.h +++ b/qt/gen_qabstractnativeeventfilter.h @@ -21,7 +21,7 @@ typedef struct QAbstractNativeEventFilter QAbstractNativeEventFilter; typedef struct QByteArray QByteArray; #endif -bool QAbstractNativeEventFilter_NativeEventFilter(QAbstractNativeEventFilter* self, QByteArray* eventType, void* message, long* result); +bool QAbstractNativeEventFilter_NativeEventFilter(QAbstractNativeEventFilter* self, struct miqt_string eventType, void* message, long* result); void QAbstractNativeEventFilter_Delete(QAbstractNativeEventFilter* self); #ifdef __cplusplus diff --git a/qt/gen_qabstractproxymodel.cpp b/qt/gen_qabstractproxymodel.cpp index 63864de6..700be6a2 100644 --- a/qt/gen_qabstractproxymodel.cpp +++ b/qt/gen_qabstractproxymodel.cpp @@ -21,18 +21,26 @@ void* QAbstractProxyModel_Metacast(QAbstractProxyModel* self, const char* param1 return self->qt_metacast(param1); } -struct miqt_string* QAbstractProxyModel_Tr(const char* s) { +struct miqt_string QAbstractProxyModel_Tr(const char* s) { QString _ret = QAbstractProxyModel::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractProxyModel_TrUtf8(const char* s) { +struct miqt_string QAbstractProxyModel_TrUtf8(const char* s) { QString _ret = QAbstractProxyModel::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QAbstractProxyModel_SetSourceModel(QAbstractProxyModel* self, QAbstractItemModel* sourceModel) { @@ -129,12 +137,16 @@ bool QAbstractProxyModel_DropMimeData(QAbstractProxyModel* self, QMimeData* data struct miqt_array* QAbstractProxyModel_MimeTypes(const QAbstractProxyModel* self) { QStringList _ret = self->mimeTypes(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -152,32 +164,48 @@ int QAbstractProxyModel_SupportedDropActions(const QAbstractProxyModel* self) { return static_cast(_ret); } -struct miqt_string* QAbstractProxyModel_Tr2(const char* s, const char* c) { +struct miqt_string QAbstractProxyModel_Tr2(const char* s, const char* c) { QString _ret = QAbstractProxyModel::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractProxyModel_Tr3(const char* s, const char* c, int n) { +struct miqt_string QAbstractProxyModel_Tr3(const char* s, const char* c, int n) { QString _ret = QAbstractProxyModel::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractProxyModel_TrUtf82(const char* s, const char* c) { +struct miqt_string QAbstractProxyModel_TrUtf82(const char* s, const char* c) { QString _ret = QAbstractProxyModel::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractProxyModel_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QAbstractProxyModel_TrUtf83(const char* s, const char* c, int n) { QString _ret = QAbstractProxyModel::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QVariant* QAbstractProxyModel_Data2(const QAbstractProxyModel* self, QModelIndex* proxyIndex, int role) { diff --git a/qt/gen_qabstractproxymodel.go b/qt/gen_qabstractproxymodel.go index 23222699..5e057a03 100644 --- a/qt/gen_qabstractproxymodel.go +++ b/qt/gen_qabstractproxymodel.go @@ -50,24 +50,24 @@ func (this *QAbstractProxyModel) MetaObject() *QMetaObject { func (this *QAbstractProxyModel) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QAbstractProxyModel_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QAbstractProxyModel_Metacast(this.h, param1_Cstring)) } func QAbstractProxyModel_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractProxyModel_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractProxyModel_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QAbstractProxyModel_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractProxyModel_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractProxyModel_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -187,11 +187,11 @@ func (this *QAbstractProxyModel) DropMimeData(data *QMimeData, action DropAction func (this *QAbstractProxyModel) MimeTypes() []string { var _ma *C.struct_miqt_array = C.QAbstractProxyModel_MimeTypes(this.h) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -211,9 +211,9 @@ func QAbstractProxyModel_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractProxyModel_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractProxyModel_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -222,9 +222,9 @@ func QAbstractProxyModel_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractProxyModel_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractProxyModel_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -233,9 +233,9 @@ func QAbstractProxyModel_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractProxyModel_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractProxyModel_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -244,9 +244,9 @@ func QAbstractProxyModel_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractProxyModel_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractProxyModel_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qabstractproxymodel.h b/qt/gen_qabstractproxymodel.h index 44c2089c..44cae6bd 100644 --- a/qt/gen_qabstractproxymodel.h +++ b/qt/gen_qabstractproxymodel.h @@ -33,8 +33,8 @@ typedef struct QVariant QVariant; QMetaObject* QAbstractProxyModel_MetaObject(const QAbstractProxyModel* self); void* QAbstractProxyModel_Metacast(QAbstractProxyModel* self, const char* param1); -struct miqt_string* QAbstractProxyModel_Tr(const char* s); -struct miqt_string* QAbstractProxyModel_TrUtf8(const char* s); +struct miqt_string QAbstractProxyModel_Tr(const char* s); +struct miqt_string QAbstractProxyModel_TrUtf8(const char* s); void QAbstractProxyModel_SetSourceModel(QAbstractProxyModel* self, QAbstractItemModel* sourceModel); QAbstractItemModel* QAbstractProxyModel_SourceModel(const QAbstractProxyModel* self); QModelIndex* QAbstractProxyModel_MapToSource(const QAbstractProxyModel* self, QModelIndex* proxyIndex); @@ -59,10 +59,10 @@ bool QAbstractProxyModel_DropMimeData(QAbstractProxyModel* self, QMimeData* data struct miqt_array* QAbstractProxyModel_MimeTypes(const QAbstractProxyModel* self); int QAbstractProxyModel_SupportedDragActions(const QAbstractProxyModel* self); int QAbstractProxyModel_SupportedDropActions(const QAbstractProxyModel* self); -struct miqt_string* QAbstractProxyModel_Tr2(const char* s, const char* c); -struct miqt_string* QAbstractProxyModel_Tr3(const char* s, const char* c, int n); -struct miqt_string* QAbstractProxyModel_TrUtf82(const char* s, const char* c); -struct miqt_string* QAbstractProxyModel_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QAbstractProxyModel_Tr2(const char* s, const char* c); +struct miqt_string QAbstractProxyModel_Tr3(const char* s, const char* c, int n); +struct miqt_string QAbstractProxyModel_TrUtf82(const char* s, const char* c); +struct miqt_string QAbstractProxyModel_TrUtf83(const char* s, const char* c, int n); QVariant* QAbstractProxyModel_Data2(const QAbstractProxyModel* self, QModelIndex* proxyIndex, int role); QVariant* QAbstractProxyModel_HeaderData3(const QAbstractProxyModel* self, int section, int orientation, int role); bool QAbstractProxyModel_SetData3(QAbstractProxyModel* self, QModelIndex* index, QVariant* value, int role); diff --git a/qt/gen_qabstractscrollarea.cpp b/qt/gen_qabstractscrollarea.cpp index e1c78bf3..64d25fb9 100644 --- a/qt/gen_qabstractscrollarea.cpp +++ b/qt/gen_qabstractscrollarea.cpp @@ -27,18 +27,26 @@ void* QAbstractScrollArea_Metacast(QAbstractScrollArea* self, const char* param1 return self->qt_metacast(param1); } -struct miqt_string* QAbstractScrollArea_Tr(const char* s) { +struct miqt_string QAbstractScrollArea_Tr(const char* s) { QString _ret = QAbstractScrollArea::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractScrollArea_TrUtf8(const char* s) { +struct miqt_string QAbstractScrollArea_TrUtf8(const char* s) { QString _ret = QAbstractScrollArea::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QAbstractScrollArea_VerticalScrollBarPolicy(const QAbstractScrollArea* self) { @@ -133,32 +141,48 @@ void QAbstractScrollArea_SetSizeAdjustPolicy(QAbstractScrollArea* self, int poli self->setSizeAdjustPolicy(static_cast(policy)); } -struct miqt_string* QAbstractScrollArea_Tr2(const char* s, const char* c) { +struct miqt_string QAbstractScrollArea_Tr2(const char* s, const char* c) { QString _ret = QAbstractScrollArea::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractScrollArea_Tr3(const char* s, const char* c, int n) { +struct miqt_string QAbstractScrollArea_Tr3(const char* s, const char* c, int n) { QString _ret = QAbstractScrollArea::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractScrollArea_TrUtf82(const char* s, const char* c) { +struct miqt_string QAbstractScrollArea_TrUtf82(const char* s, const char* c) { QString _ret = QAbstractScrollArea::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractScrollArea_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QAbstractScrollArea_TrUtf83(const char* s, const char* c, int n) { QString _ret = QAbstractScrollArea::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QAbstractScrollArea_Delete(QAbstractScrollArea* self) { diff --git a/qt/gen_qabstractscrollarea.go b/qt/gen_qabstractscrollarea.go index fa09968e..00b3bf45 100644 --- a/qt/gen_qabstractscrollarea.go +++ b/qt/gen_qabstractscrollarea.go @@ -70,24 +70,24 @@ func (this *QAbstractScrollArea) MetaObject() *QMetaObject { func (this *QAbstractScrollArea) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QAbstractScrollArea_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QAbstractScrollArea_Metacast(this.h, param1_Cstring)) } func QAbstractScrollArea_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractScrollArea_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractScrollArea_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QAbstractScrollArea_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractScrollArea_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractScrollArea_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -192,9 +192,9 @@ func QAbstractScrollArea_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractScrollArea_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractScrollArea_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -203,9 +203,9 @@ func QAbstractScrollArea_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractScrollArea_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractScrollArea_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -214,9 +214,9 @@ func QAbstractScrollArea_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractScrollArea_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractScrollArea_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -225,9 +225,9 @@ func QAbstractScrollArea_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractScrollArea_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractScrollArea_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qabstractscrollarea.h b/qt/gen_qabstractscrollarea.h index 18a0e8a2..61912b61 100644 --- a/qt/gen_qabstractscrollarea.h +++ b/qt/gen_qabstractscrollarea.h @@ -31,8 +31,8 @@ QAbstractScrollArea* QAbstractScrollArea_new(); QAbstractScrollArea* QAbstractScrollArea_new2(QWidget* parent); QMetaObject* QAbstractScrollArea_MetaObject(const QAbstractScrollArea* self); void* QAbstractScrollArea_Metacast(QAbstractScrollArea* self, const char* param1); -struct miqt_string* QAbstractScrollArea_Tr(const char* s); -struct miqt_string* QAbstractScrollArea_TrUtf8(const char* s); +struct miqt_string QAbstractScrollArea_Tr(const char* s); +struct miqt_string QAbstractScrollArea_TrUtf8(const char* s); int QAbstractScrollArea_VerticalScrollBarPolicy(const QAbstractScrollArea* self); void QAbstractScrollArea_SetVerticalScrollBarPolicy(QAbstractScrollArea* self, int verticalScrollBarPolicy); QScrollBar* QAbstractScrollArea_VerticalScrollBar(const QAbstractScrollArea* self); @@ -53,10 +53,10 @@ QSize* QAbstractScrollArea_SizeHint(const QAbstractScrollArea* self); void QAbstractScrollArea_SetupViewport(QAbstractScrollArea* self, QWidget* viewport); int QAbstractScrollArea_SizeAdjustPolicy(const QAbstractScrollArea* self); void QAbstractScrollArea_SetSizeAdjustPolicy(QAbstractScrollArea* self, int policy); -struct miqt_string* QAbstractScrollArea_Tr2(const char* s, const char* c); -struct miqt_string* QAbstractScrollArea_Tr3(const char* s, const char* c, int n); -struct miqt_string* QAbstractScrollArea_TrUtf82(const char* s, const char* c); -struct miqt_string* QAbstractScrollArea_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QAbstractScrollArea_Tr2(const char* s, const char* c); +struct miqt_string QAbstractScrollArea_Tr3(const char* s, const char* c, int n); +struct miqt_string QAbstractScrollArea_TrUtf82(const char* s, const char* c); +struct miqt_string QAbstractScrollArea_TrUtf83(const char* s, const char* c, int n); void QAbstractScrollArea_Delete(QAbstractScrollArea* self); #ifdef __cplusplus diff --git a/qt/gen_qabstractslider.cpp b/qt/gen_qabstractslider.cpp index d50b6073..d4a3e4df 100644 --- a/qt/gen_qabstractslider.cpp +++ b/qt/gen_qabstractslider.cpp @@ -24,18 +24,26 @@ void* QAbstractSlider_Metacast(QAbstractSlider* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QAbstractSlider_Tr(const char* s) { +struct miqt_string QAbstractSlider_Tr(const char* s) { QString _ret = QAbstractSlider::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractSlider_TrUtf8(const char* s) { +struct miqt_string QAbstractSlider_TrUtf8(const char* s) { QString _ret = QAbstractSlider::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QAbstractSlider_Orientation(const QAbstractSlider* self) { @@ -200,32 +208,48 @@ void QAbstractSlider_connect_ActionTriggered(QAbstractSlider* self, intptr_t slo }); } -struct miqt_string* QAbstractSlider_Tr2(const char* s, const char* c) { +struct miqt_string QAbstractSlider_Tr2(const char* s, const char* c) { QString _ret = QAbstractSlider::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractSlider_Tr3(const char* s, const char* c, int n) { +struct miqt_string QAbstractSlider_Tr3(const char* s, const char* c, int n) { QString _ret = QAbstractSlider::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractSlider_TrUtf82(const char* s, const char* c) { +struct miqt_string QAbstractSlider_TrUtf82(const char* s, const char* c) { QString _ret = QAbstractSlider::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractSlider_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QAbstractSlider_TrUtf83(const char* s, const char* c, int n) { QString _ret = QAbstractSlider::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QAbstractSlider_Delete(QAbstractSlider* self) { diff --git a/qt/gen_qabstractslider.go b/qt/gen_qabstractslider.go index 0bd359e6..996fb5f6 100644 --- a/qt/gen_qabstractslider.go +++ b/qt/gen_qabstractslider.go @@ -76,24 +76,24 @@ func (this *QAbstractSlider) MetaObject() *QMetaObject { func (this *QAbstractSlider) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QAbstractSlider_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QAbstractSlider_Metacast(this.h, param1_Cstring)) } func QAbstractSlider_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractSlider_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractSlider_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QAbstractSlider_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractSlider_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractSlider_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -314,9 +314,9 @@ func QAbstractSlider_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractSlider_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractSlider_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -325,9 +325,9 @@ func QAbstractSlider_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractSlider_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractSlider_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -336,9 +336,9 @@ func QAbstractSlider_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractSlider_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractSlider_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -347,9 +347,9 @@ func QAbstractSlider_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractSlider_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractSlider_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qabstractslider.h b/qt/gen_qabstractslider.h index a66fd711..54fa5a2b 100644 --- a/qt/gen_qabstractslider.h +++ b/qt/gen_qabstractslider.h @@ -27,8 +27,8 @@ QAbstractSlider* QAbstractSlider_new(); QAbstractSlider* QAbstractSlider_new2(QWidget* parent); QMetaObject* QAbstractSlider_MetaObject(const QAbstractSlider* self); void* QAbstractSlider_Metacast(QAbstractSlider* self, const char* param1); -struct miqt_string* QAbstractSlider_Tr(const char* s); -struct miqt_string* QAbstractSlider_TrUtf8(const char* s); +struct miqt_string QAbstractSlider_Tr(const char* s); +struct miqt_string QAbstractSlider_TrUtf8(const char* s); int QAbstractSlider_Orientation(const QAbstractSlider* self); void QAbstractSlider_SetMinimum(QAbstractSlider* self, int minimum); int QAbstractSlider_Minimum(const QAbstractSlider* self); @@ -65,10 +65,10 @@ void QAbstractSlider_RangeChanged(QAbstractSlider* self, int min, int max); void QAbstractSlider_connect_RangeChanged(QAbstractSlider* self, intptr_t slot); void QAbstractSlider_ActionTriggered(QAbstractSlider* self, int action); void QAbstractSlider_connect_ActionTriggered(QAbstractSlider* self, intptr_t slot); -struct miqt_string* QAbstractSlider_Tr2(const char* s, const char* c); -struct miqt_string* QAbstractSlider_Tr3(const char* s, const char* c, int n); -struct miqt_string* QAbstractSlider_TrUtf82(const char* s, const char* c); -struct miqt_string* QAbstractSlider_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QAbstractSlider_Tr2(const char* s, const char* c); +struct miqt_string QAbstractSlider_Tr3(const char* s, const char* c, int n); +struct miqt_string QAbstractSlider_TrUtf82(const char* s, const char* c); +struct miqt_string QAbstractSlider_TrUtf83(const char* s, const char* c, int n); void QAbstractSlider_Delete(QAbstractSlider* self); #ifdef __cplusplus diff --git a/qt/gen_qabstractspinbox.cpp b/qt/gen_qabstractspinbox.cpp index ddc85c57..160eaa88 100644 --- a/qt/gen_qabstractspinbox.cpp +++ b/qt/gen_qabstractspinbox.cpp @@ -27,18 +27,26 @@ void* QAbstractSpinBox_Metacast(QAbstractSpinBox* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QAbstractSpinBox_Tr(const char* s) { +struct miqt_string QAbstractSpinBox_Tr(const char* s) { QString _ret = QAbstractSpinBox::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractSpinBox_TrUtf8(const char* s) { +struct miqt_string QAbstractSpinBox_TrUtf8(const char* s) { QString _ret = QAbstractSpinBox::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QAbstractSpinBox_ButtonSymbols(const QAbstractSpinBox* self) { @@ -63,22 +71,30 @@ bool QAbstractSpinBox_HasAcceptableInput(const QAbstractSpinBox* self) { return self->hasAcceptableInput(); } -struct miqt_string* QAbstractSpinBox_Text(const QAbstractSpinBox* self) { +struct miqt_string QAbstractSpinBox_Text(const QAbstractSpinBox* self) { QString _ret = self->text(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractSpinBox_SpecialValueText(const QAbstractSpinBox* self) { +struct miqt_string QAbstractSpinBox_SpecialValueText(const QAbstractSpinBox* self) { QString _ret = self->specialValueText(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QAbstractSpinBox_SetSpecialValueText(QAbstractSpinBox* self, struct miqt_string* txt) { - QString txt_QString = QString::fromUtf8(&txt->data, txt->len); +void QAbstractSpinBox_SetSpecialValueText(QAbstractSpinBox* self, struct miqt_string txt) { + QString txt_QString = QString::fromUtf8(txt.data, txt.len); self->setSpecialValueText(txt_QString); } @@ -159,14 +175,14 @@ QVariant* QAbstractSpinBox_InputMethodQuery(const QAbstractSpinBox* self, int pa return new QVariant(self->inputMethodQuery(static_cast(param1))); } -int QAbstractSpinBox_Validate(const QAbstractSpinBox* self, struct miqt_string* input, int* pos) { - QString input_QString = QString::fromUtf8(&input->data, input->len); +int QAbstractSpinBox_Validate(const QAbstractSpinBox* self, struct miqt_string input, int* pos) { + QString input_QString = QString::fromUtf8(input.data, input.len); QValidator::State _ret = self->validate(input_QString, static_cast(*pos)); return static_cast(_ret); } -void QAbstractSpinBox_Fixup(const QAbstractSpinBox* self, struct miqt_string* input) { - QString input_QString = QString::fromUtf8(&input->data, input->len); +void QAbstractSpinBox_Fixup(const QAbstractSpinBox* self, struct miqt_string input) { + QString input_QString = QString::fromUtf8(input.data, input.len); self->fixup(input_QString); } @@ -200,32 +216,48 @@ void QAbstractSpinBox_connect_EditingFinished(QAbstractSpinBox* self, intptr_t s }); } -struct miqt_string* QAbstractSpinBox_Tr2(const char* s, const char* c) { +struct miqt_string QAbstractSpinBox_Tr2(const char* s, const char* c) { QString _ret = QAbstractSpinBox::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractSpinBox_Tr3(const char* s, const char* c, int n) { +struct miqt_string QAbstractSpinBox_Tr3(const char* s, const char* c, int n) { QString _ret = QAbstractSpinBox::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractSpinBox_TrUtf82(const char* s, const char* c) { +struct miqt_string QAbstractSpinBox_TrUtf82(const char* s, const char* c) { QString _ret = QAbstractSpinBox::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractSpinBox_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QAbstractSpinBox_TrUtf83(const char* s, const char* c, int n) { QString _ret = QAbstractSpinBox::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QAbstractSpinBox_Delete(QAbstractSpinBox* self) { diff --git a/qt/gen_qabstractspinbox.go b/qt/gen_qabstractspinbox.go index eda35edf..62f6333a 100644 --- a/qt/gen_qabstractspinbox.go +++ b/qt/gen_qabstractspinbox.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "runtime/cgo" "unsafe" @@ -94,24 +93,24 @@ func (this *QAbstractSpinBox) MetaObject() *QMetaObject { func (this *QAbstractSpinBox) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QAbstractSpinBox_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QAbstractSpinBox_Metacast(this.h, param1_Cstring)) } func QAbstractSpinBox_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractSpinBox_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractSpinBox_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QAbstractSpinBox_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractSpinBox_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractSpinBox_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -136,23 +135,25 @@ func (this *QAbstractSpinBox) HasAcceptableInput() bool { } func (this *QAbstractSpinBox) Text() string { - var _ms *C.struct_miqt_string = C.QAbstractSpinBox_Text(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractSpinBox_Text(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QAbstractSpinBox) SpecialValueText() string { - var _ms *C.struct_miqt_string = C.QAbstractSpinBox_SpecialValueText(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractSpinBox_SpecialValueText(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QAbstractSpinBox) SetSpecialValueText(txt string) { - txt_ms := libmiqt.Strdupg(txt) - defer C.free(txt_ms) - C.QAbstractSpinBox_SetSpecialValueText(this.h, (*C.struct_miqt_string)(txt_ms)) + txt_ms := C.struct_miqt_string{} + txt_ms.data = C.CString(txt) + txt_ms.len = C.size_t(len(txt)) + defer C.free(unsafe.Pointer(txt_ms.data)) + C.QAbstractSpinBox_SetSpecialValueText(this.h, txt_ms) } func (this *QAbstractSpinBox) Wrapping() bool { @@ -241,15 +242,19 @@ func (this *QAbstractSpinBox) InputMethodQuery(param1 InputMethodQuery) *QVarian } func (this *QAbstractSpinBox) Validate(input string, pos *int) QValidator__State { - input_ms := libmiqt.Strdupg(input) - defer C.free(input_ms) - return (QValidator__State)(C.QAbstractSpinBox_Validate(this.h, (*C.struct_miqt_string)(input_ms), (*C.int)(unsafe.Pointer(pos)))) + input_ms := C.struct_miqt_string{} + input_ms.data = C.CString(input) + input_ms.len = C.size_t(len(input)) + defer C.free(unsafe.Pointer(input_ms.data)) + return (QValidator__State)(C.QAbstractSpinBox_Validate(this.h, input_ms, (*C.int)(unsafe.Pointer(pos)))) } func (this *QAbstractSpinBox) Fixup(input string) { - input_ms := libmiqt.Strdupg(input) - defer C.free(input_ms) - C.QAbstractSpinBox_Fixup(this.h, (*C.struct_miqt_string)(input_ms)) + input_ms := C.struct_miqt_string{} + input_ms.data = C.CString(input) + input_ms.len = C.size_t(len(input)) + defer C.free(unsafe.Pointer(input_ms.data)) + C.QAbstractSpinBox_Fixup(this.h, input_ms) } func (this *QAbstractSpinBox) StepBy(steps int) { @@ -294,9 +299,9 @@ func QAbstractSpinBox_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractSpinBox_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractSpinBox_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -305,9 +310,9 @@ func QAbstractSpinBox_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractSpinBox_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractSpinBox_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -316,9 +321,9 @@ func QAbstractSpinBox_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractSpinBox_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractSpinBox_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -327,9 +332,9 @@ func QAbstractSpinBox_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractSpinBox_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractSpinBox_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qabstractspinbox.h b/qt/gen_qabstractspinbox.h index 2c2d7515..7aa86249 100644 --- a/qt/gen_qabstractspinbox.h +++ b/qt/gen_qabstractspinbox.h @@ -33,16 +33,16 @@ QAbstractSpinBox* QAbstractSpinBox_new(); QAbstractSpinBox* QAbstractSpinBox_new2(QWidget* parent); QMetaObject* QAbstractSpinBox_MetaObject(const QAbstractSpinBox* self); void* QAbstractSpinBox_Metacast(QAbstractSpinBox* self, const char* param1); -struct miqt_string* QAbstractSpinBox_Tr(const char* s); -struct miqt_string* QAbstractSpinBox_TrUtf8(const char* s); +struct miqt_string QAbstractSpinBox_Tr(const char* s); +struct miqt_string QAbstractSpinBox_TrUtf8(const char* s); int QAbstractSpinBox_ButtonSymbols(const QAbstractSpinBox* self); void QAbstractSpinBox_SetButtonSymbols(QAbstractSpinBox* self, int bs); void QAbstractSpinBox_SetCorrectionMode(QAbstractSpinBox* self, int cm); int QAbstractSpinBox_CorrectionMode(const QAbstractSpinBox* self); bool QAbstractSpinBox_HasAcceptableInput(const QAbstractSpinBox* self); -struct miqt_string* QAbstractSpinBox_Text(const QAbstractSpinBox* self); -struct miqt_string* QAbstractSpinBox_SpecialValueText(const QAbstractSpinBox* self); -void QAbstractSpinBox_SetSpecialValueText(QAbstractSpinBox* self, struct miqt_string* txt); +struct miqt_string QAbstractSpinBox_Text(const QAbstractSpinBox* self); +struct miqt_string QAbstractSpinBox_SpecialValueText(const QAbstractSpinBox* self); +void QAbstractSpinBox_SetSpecialValueText(QAbstractSpinBox* self, struct miqt_string txt); bool QAbstractSpinBox_Wrapping(const QAbstractSpinBox* self); void QAbstractSpinBox_SetWrapping(QAbstractSpinBox* self, bool w); void QAbstractSpinBox_SetReadOnly(QAbstractSpinBox* self, bool r); @@ -62,8 +62,8 @@ QSize* QAbstractSpinBox_MinimumSizeHint(const QAbstractSpinBox* self); void QAbstractSpinBox_InterpretText(QAbstractSpinBox* self); bool QAbstractSpinBox_Event(QAbstractSpinBox* self, QEvent* event); QVariant* QAbstractSpinBox_InputMethodQuery(const QAbstractSpinBox* self, int param1); -int QAbstractSpinBox_Validate(const QAbstractSpinBox* self, struct miqt_string* input, int* pos); -void QAbstractSpinBox_Fixup(const QAbstractSpinBox* self, struct miqt_string* input); +int QAbstractSpinBox_Validate(const QAbstractSpinBox* self, struct miqt_string input, int* pos); +void QAbstractSpinBox_Fixup(const QAbstractSpinBox* self, struct miqt_string input); void QAbstractSpinBox_StepBy(QAbstractSpinBox* self, int steps); void QAbstractSpinBox_StepUp(QAbstractSpinBox* self); void QAbstractSpinBox_StepDown(QAbstractSpinBox* self); @@ -71,10 +71,10 @@ void QAbstractSpinBox_SelectAll(QAbstractSpinBox* self); void QAbstractSpinBox_Clear(QAbstractSpinBox* self); void QAbstractSpinBox_EditingFinished(QAbstractSpinBox* self); void QAbstractSpinBox_connect_EditingFinished(QAbstractSpinBox* self, intptr_t slot); -struct miqt_string* QAbstractSpinBox_Tr2(const char* s, const char* c); -struct miqt_string* QAbstractSpinBox_Tr3(const char* s, const char* c, int n); -struct miqt_string* QAbstractSpinBox_TrUtf82(const char* s, const char* c); -struct miqt_string* QAbstractSpinBox_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QAbstractSpinBox_Tr2(const char* s, const char* c); +struct miqt_string QAbstractSpinBox_Tr3(const char* s, const char* c, int n); +struct miqt_string QAbstractSpinBox_TrUtf82(const char* s, const char* c); +struct miqt_string QAbstractSpinBox_TrUtf83(const char* s, const char* c, int n); void QAbstractSpinBox_Delete(QAbstractSpinBox* self); #ifdef __cplusplus diff --git a/qt/gen_qabstractstate.cpp b/qt/gen_qabstractstate.cpp index 26d9d32a..770a41f8 100644 --- a/qt/gen_qabstractstate.cpp +++ b/qt/gen_qabstractstate.cpp @@ -17,18 +17,26 @@ void* QAbstractState_Metacast(QAbstractState* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QAbstractState_Tr(const char* s) { +struct miqt_string QAbstractState_Tr(const char* s) { QString _ret = QAbstractState::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractState_TrUtf8(const char* s) { +struct miqt_string QAbstractState_TrUtf8(const char* s) { QString _ret = QAbstractState::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QState* QAbstractState_ParentState(const QAbstractState* self) { @@ -54,32 +62,48 @@ void QAbstractState_connect_ActiveChanged(QAbstractState* self, intptr_t slot) { }); } -struct miqt_string* QAbstractState_Tr2(const char* s, const char* c) { +struct miqt_string QAbstractState_Tr2(const char* s, const char* c) { QString _ret = QAbstractState::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractState_Tr3(const char* s, const char* c, int n) { +struct miqt_string QAbstractState_Tr3(const char* s, const char* c, int n) { QString _ret = QAbstractState::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractState_TrUtf82(const char* s, const char* c) { +struct miqt_string QAbstractState_TrUtf82(const char* s, const char* c) { QString _ret = QAbstractState::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractState_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QAbstractState_TrUtf83(const char* s, const char* c, int n) { QString _ret = QAbstractState::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QAbstractState_Delete(QAbstractState* self) { diff --git a/qt/gen_qabstractstate.go b/qt/gen_qabstractstate.go index 29d46224..55da541a 100644 --- a/qt/gen_qabstractstate.go +++ b/qt/gen_qabstractstate.go @@ -51,24 +51,24 @@ func (this *QAbstractState) MetaObject() *QMetaObject { func (this *QAbstractState) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QAbstractState_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QAbstractState_Metacast(this.h, param1_Cstring)) } func QAbstractState_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractState_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractState_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QAbstractState_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractState_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractState_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -109,9 +109,9 @@ func QAbstractState_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractState_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractState_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -120,9 +120,9 @@ func QAbstractState_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractState_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractState_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -131,9 +131,9 @@ func QAbstractState_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractState_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractState_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -142,9 +142,9 @@ func QAbstractState_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractState_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractState_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qabstractstate.h b/qt/gen_qabstractstate.h index 71a1e8e6..04a4e378 100644 --- a/qt/gen_qabstractstate.h +++ b/qt/gen_qabstractstate.h @@ -27,17 +27,17 @@ typedef struct QStateMachine QStateMachine; QMetaObject* QAbstractState_MetaObject(const QAbstractState* self); void* QAbstractState_Metacast(QAbstractState* self, const char* param1); -struct miqt_string* QAbstractState_Tr(const char* s); -struct miqt_string* QAbstractState_TrUtf8(const char* s); +struct miqt_string QAbstractState_Tr(const char* s); +struct miqt_string QAbstractState_TrUtf8(const char* s); QState* QAbstractState_ParentState(const QAbstractState* self); QStateMachine* QAbstractState_Machine(const QAbstractState* self); bool QAbstractState_Active(const QAbstractState* self); void QAbstractState_ActiveChanged(QAbstractState* self, bool active); void QAbstractState_connect_ActiveChanged(QAbstractState* self, intptr_t slot); -struct miqt_string* QAbstractState_Tr2(const char* s, const char* c); -struct miqt_string* QAbstractState_Tr3(const char* s, const char* c, int n); -struct miqt_string* QAbstractState_TrUtf82(const char* s, const char* c); -struct miqt_string* QAbstractState_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QAbstractState_Tr2(const char* s, const char* c); +struct miqt_string QAbstractState_Tr3(const char* s, const char* c, int n); +struct miqt_string QAbstractState_TrUtf82(const char* s, const char* c); +struct miqt_string QAbstractState_TrUtf83(const char* s, const char* c, int n); void QAbstractState_Delete(QAbstractState* self); #ifdef __cplusplus diff --git a/qt/gen_qabstracttextdocumentlayout.cpp b/qt/gen_qabstracttextdocumentlayout.cpp index 7a6abf82..959b39a4 100644 --- a/qt/gen_qabstracttextdocumentlayout.cpp +++ b/qt/gen_qabstracttextdocumentlayout.cpp @@ -28,18 +28,26 @@ void* QAbstractTextDocumentLayout_Metacast(QAbstractTextDocumentLayout* self, co return self->qt_metacast(param1); } -struct miqt_string* QAbstractTextDocumentLayout_Tr(const char* s) { +struct miqt_string QAbstractTextDocumentLayout_Tr(const char* s) { QString _ret = QAbstractTextDocumentLayout::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractTextDocumentLayout_TrUtf8(const char* s) { +struct miqt_string QAbstractTextDocumentLayout_TrUtf8(const char* s) { QString _ret = QAbstractTextDocumentLayout::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QAbstractTextDocumentLayout_Draw(QAbstractTextDocumentLayout* self, QPainter* painter, QAbstractTextDocumentLayout__PaintContext* context) { @@ -50,18 +58,26 @@ int QAbstractTextDocumentLayout_HitTest(const QAbstractTextDocumentLayout* self, return self->hitTest(*point, static_cast(accuracy)); } -struct miqt_string* QAbstractTextDocumentLayout_AnchorAt(const QAbstractTextDocumentLayout* self, QPointF* pos) { +struct miqt_string QAbstractTextDocumentLayout_AnchorAt(const QAbstractTextDocumentLayout* self, QPointF* pos) { QString _ret = self->anchorAt(*pos); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractTextDocumentLayout_ImageAt(const QAbstractTextDocumentLayout* self, QPointF* pos) { +struct miqt_string QAbstractTextDocumentLayout_ImageAt(const QAbstractTextDocumentLayout* self, QPointF* pos) { QString _ret = self->imageAt(*pos); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QTextFormat* QAbstractTextDocumentLayout_FormatAt(const QAbstractTextDocumentLayout* self, QPointF* pos) { @@ -159,32 +175,48 @@ void QAbstractTextDocumentLayout_connect_PageCountChanged(QAbstractTextDocumentL }); } -struct miqt_string* QAbstractTextDocumentLayout_Tr2(const char* s, const char* c) { +struct miqt_string QAbstractTextDocumentLayout_Tr2(const char* s, const char* c) { QString _ret = QAbstractTextDocumentLayout::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractTextDocumentLayout_Tr3(const char* s, const char* c, int n) { +struct miqt_string QAbstractTextDocumentLayout_Tr3(const char* s, const char* c, int n) { QString _ret = QAbstractTextDocumentLayout::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractTextDocumentLayout_TrUtf82(const char* s, const char* c) { +struct miqt_string QAbstractTextDocumentLayout_TrUtf82(const char* s, const char* c) { QString _ret = QAbstractTextDocumentLayout::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractTextDocumentLayout_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QAbstractTextDocumentLayout_TrUtf83(const char* s, const char* c, int n) { QString _ret = QAbstractTextDocumentLayout::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QAbstractTextDocumentLayout_UnregisterHandler2(QAbstractTextDocumentLayout* self, int objectType, QObject* component) { diff --git a/qt/gen_qabstracttextdocumentlayout.go b/qt/gen_qabstracttextdocumentlayout.go index 0ee0bab9..7cdbff67 100644 --- a/qt/gen_qabstracttextdocumentlayout.go +++ b/qt/gen_qabstracttextdocumentlayout.go @@ -51,24 +51,24 @@ func (this *QAbstractTextDocumentLayout) MetaObject() *QMetaObject { func (this *QAbstractTextDocumentLayout) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QAbstractTextDocumentLayout_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QAbstractTextDocumentLayout_Metacast(this.h, param1_Cstring)) } func QAbstractTextDocumentLayout_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractTextDocumentLayout_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractTextDocumentLayout_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QAbstractTextDocumentLayout_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractTextDocumentLayout_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractTextDocumentLayout_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -81,16 +81,16 @@ func (this *QAbstractTextDocumentLayout) HitTest(point *QPointF, accuracy HitTes } func (this *QAbstractTextDocumentLayout) AnchorAt(pos *QPointF) string { - var _ms *C.struct_miqt_string = C.QAbstractTextDocumentLayout_AnchorAt(this.h, pos.cPointer()) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractTextDocumentLayout_AnchorAt(this.h, pos.cPointer()) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QAbstractTextDocumentLayout) ImageAt(pos *QPointF) string { - var _ms *C.struct_miqt_string = C.QAbstractTextDocumentLayout_ImageAt(this.h, pos.cPointer()) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractTextDocumentLayout_ImageAt(this.h, pos.cPointer()) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -239,9 +239,9 @@ func QAbstractTextDocumentLayout_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractTextDocumentLayout_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractTextDocumentLayout_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -250,9 +250,9 @@ func QAbstractTextDocumentLayout_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractTextDocumentLayout_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractTextDocumentLayout_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -261,9 +261,9 @@ func QAbstractTextDocumentLayout_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractTextDocumentLayout_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractTextDocumentLayout_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -272,9 +272,9 @@ func QAbstractTextDocumentLayout_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractTextDocumentLayout_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractTextDocumentLayout_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qabstracttextdocumentlayout.h b/qt/gen_qabstracttextdocumentlayout.h index 7c29c6fa..9153dc97 100644 --- a/qt/gen_qabstracttextdocumentlayout.h +++ b/qt/gen_qabstracttextdocumentlayout.h @@ -57,12 +57,12 @@ typedef struct QTextObjectInterface QTextObjectInterface; QMetaObject* QAbstractTextDocumentLayout_MetaObject(const QAbstractTextDocumentLayout* self); void* QAbstractTextDocumentLayout_Metacast(QAbstractTextDocumentLayout* self, const char* param1); -struct miqt_string* QAbstractTextDocumentLayout_Tr(const char* s); -struct miqt_string* QAbstractTextDocumentLayout_TrUtf8(const char* s); +struct miqt_string QAbstractTextDocumentLayout_Tr(const char* s); +struct miqt_string QAbstractTextDocumentLayout_TrUtf8(const char* s); void QAbstractTextDocumentLayout_Draw(QAbstractTextDocumentLayout* self, QPainter* painter, QAbstractTextDocumentLayout__PaintContext* context); int QAbstractTextDocumentLayout_HitTest(const QAbstractTextDocumentLayout* self, QPointF* point, int accuracy); -struct miqt_string* QAbstractTextDocumentLayout_AnchorAt(const QAbstractTextDocumentLayout* self, QPointF* pos); -struct miqt_string* QAbstractTextDocumentLayout_ImageAt(const QAbstractTextDocumentLayout* self, QPointF* pos); +struct miqt_string QAbstractTextDocumentLayout_AnchorAt(const QAbstractTextDocumentLayout* self, QPointF* pos); +struct miqt_string QAbstractTextDocumentLayout_ImageAt(const QAbstractTextDocumentLayout* self, QPointF* pos); QTextFormat* QAbstractTextDocumentLayout_FormatAt(const QAbstractTextDocumentLayout* self, QPointF* pos); QTextBlock* QAbstractTextDocumentLayout_BlockWithMarkerAt(const QAbstractTextDocumentLayout* self, QPointF* pos); int QAbstractTextDocumentLayout_PageCount(const QAbstractTextDocumentLayout* self); @@ -83,10 +83,10 @@ void QAbstractTextDocumentLayout_DocumentSizeChanged(QAbstractTextDocumentLayout void QAbstractTextDocumentLayout_connect_DocumentSizeChanged(QAbstractTextDocumentLayout* self, intptr_t slot); void QAbstractTextDocumentLayout_PageCountChanged(QAbstractTextDocumentLayout* self, int newPages); void QAbstractTextDocumentLayout_connect_PageCountChanged(QAbstractTextDocumentLayout* self, intptr_t slot); -struct miqt_string* QAbstractTextDocumentLayout_Tr2(const char* s, const char* c); -struct miqt_string* QAbstractTextDocumentLayout_Tr3(const char* s, const char* c, int n); -struct miqt_string* QAbstractTextDocumentLayout_TrUtf82(const char* s, const char* c); -struct miqt_string* QAbstractTextDocumentLayout_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QAbstractTextDocumentLayout_Tr2(const char* s, const char* c); +struct miqt_string QAbstractTextDocumentLayout_Tr3(const char* s, const char* c, int n); +struct miqt_string QAbstractTextDocumentLayout_TrUtf82(const char* s, const char* c); +struct miqt_string QAbstractTextDocumentLayout_TrUtf83(const char* s, const char* c, int n); void QAbstractTextDocumentLayout_UnregisterHandler2(QAbstractTextDocumentLayout* self, int objectType, QObject* component); void QAbstractTextDocumentLayout_Update1(QAbstractTextDocumentLayout* self, QRectF* param1); void QAbstractTextDocumentLayout_connect_Update1(QAbstractTextDocumentLayout* self, intptr_t slot); diff --git a/qt/gen_qabstracttransition.cpp b/qt/gen_qabstracttransition.cpp index 03a464b4..f1df9bc8 100644 --- a/qt/gen_qabstracttransition.cpp +++ b/qt/gen_qabstracttransition.cpp @@ -20,18 +20,26 @@ void* QAbstractTransition_Metacast(QAbstractTransition* self, const char* param1 return self->qt_metacast(param1); } -struct miqt_string* QAbstractTransition_Tr(const char* s) { +struct miqt_string QAbstractTransition_Tr(const char* s) { QString _ret = QAbstractTransition::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractTransition_TrUtf8(const char* s) { +struct miqt_string QAbstractTransition_TrUtf8(const char* s) { QString _ret = QAbstractTransition::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QState* QAbstractTransition_SourceState(const QAbstractTransition* self) { @@ -103,32 +111,48 @@ struct miqt_array* QAbstractTransition_Animations(const QAbstractTransition* sel return _out; } -struct miqt_string* QAbstractTransition_Tr2(const char* s, const char* c) { +struct miqt_string QAbstractTransition_Tr2(const char* s, const char* c) { QString _ret = QAbstractTransition::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractTransition_Tr3(const char* s, const char* c, int n) { +struct miqt_string QAbstractTransition_Tr3(const char* s, const char* c, int n) { QString _ret = QAbstractTransition::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractTransition_TrUtf82(const char* s, const char* c) { +struct miqt_string QAbstractTransition_TrUtf82(const char* s, const char* c) { QString _ret = QAbstractTransition::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractTransition_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QAbstractTransition_TrUtf83(const char* s, const char* c, int n) { QString _ret = QAbstractTransition::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QAbstractTransition_Delete(QAbstractTransition* self) { diff --git a/qt/gen_qabstracttransition.go b/qt/gen_qabstracttransition.go index 523d33f1..b5e95694 100644 --- a/qt/gen_qabstracttransition.go +++ b/qt/gen_qabstracttransition.go @@ -57,24 +57,24 @@ func (this *QAbstractTransition) MetaObject() *QMetaObject { func (this *QAbstractTransition) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QAbstractTransition_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QAbstractTransition_Metacast(this.h, param1_Cstring)) } func QAbstractTransition_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractTransition_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractTransition_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QAbstractTransition_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractTransition_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractTransition_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -149,9 +149,9 @@ func QAbstractTransition_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractTransition_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractTransition_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -160,9 +160,9 @@ func QAbstractTransition_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractTransition_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractTransition_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -171,9 +171,9 @@ func QAbstractTransition_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractTransition_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractTransition_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -182,9 +182,9 @@ func QAbstractTransition_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractTransition_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractTransition_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qabstracttransition.h b/qt/gen_qabstracttransition.h index 3aaf9629..1c2c0010 100644 --- a/qt/gen_qabstracttransition.h +++ b/qt/gen_qabstracttransition.h @@ -31,8 +31,8 @@ typedef struct QStateMachine QStateMachine; QMetaObject* QAbstractTransition_MetaObject(const QAbstractTransition* self); void* QAbstractTransition_Metacast(QAbstractTransition* self, const char* param1); -struct miqt_string* QAbstractTransition_Tr(const char* s); -struct miqt_string* QAbstractTransition_TrUtf8(const char* s); +struct miqt_string QAbstractTransition_Tr(const char* s); +struct miqt_string QAbstractTransition_TrUtf8(const char* s); QState* QAbstractTransition_SourceState(const QAbstractTransition* self); QAbstractState* QAbstractTransition_TargetState(const QAbstractTransition* self); void QAbstractTransition_SetTargetState(QAbstractTransition* self, QAbstractState* target); @@ -44,10 +44,10 @@ QStateMachine* QAbstractTransition_Machine(const QAbstractTransition* self); void QAbstractTransition_AddAnimation(QAbstractTransition* self, QAbstractAnimation* animation); void QAbstractTransition_RemoveAnimation(QAbstractTransition* self, QAbstractAnimation* animation); struct miqt_array* QAbstractTransition_Animations(const QAbstractTransition* self); -struct miqt_string* QAbstractTransition_Tr2(const char* s, const char* c); -struct miqt_string* QAbstractTransition_Tr3(const char* s, const char* c, int n); -struct miqt_string* QAbstractTransition_TrUtf82(const char* s, const char* c); -struct miqt_string* QAbstractTransition_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QAbstractTransition_Tr2(const char* s, const char* c); +struct miqt_string QAbstractTransition_Tr3(const char* s, const char* c, int n); +struct miqt_string QAbstractTransition_TrUtf82(const char* s, const char* c); +struct miqt_string QAbstractTransition_TrUtf83(const char* s, const char* c, int n); void QAbstractTransition_Delete(QAbstractTransition* self); #ifdef __cplusplus diff --git a/qt/gen_qaccessible.cpp b/qt/gen_qaccessible.cpp index 851828ab..3bb7b666 100644 --- a/qt/gen_qaccessible.cpp +++ b/qt/gen_qaccessible.cpp @@ -123,15 +123,19 @@ int QAccessibleInterface_IndexOfChild(const QAccessibleInterface* self, QAccessi return self->indexOfChild(param1); } -struct miqt_string* QAccessibleInterface_Text(const QAccessibleInterface* self, int t) { +struct miqt_string QAccessibleInterface_Text(const QAccessibleInterface* self, int t) { QString _ret = self->text(static_cast(t)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QAccessibleInterface_SetText(QAccessibleInterface* self, int t, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QAccessibleInterface_SetText(QAccessibleInterface* self, int t, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->setText(static_cast(t), text_QString); } @@ -220,32 +224,48 @@ void QAccessibleTextInterface_SetCursorPosition(QAccessibleTextInterface* self, self->setCursorPosition(static_cast(position)); } -struct miqt_string* QAccessibleTextInterface_Text(const QAccessibleTextInterface* self, int startOffset, int endOffset) { +struct miqt_string QAccessibleTextInterface_Text(const QAccessibleTextInterface* self, int startOffset, int endOffset) { QString _ret = self->text(static_cast(startOffset), static_cast(endOffset)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAccessibleTextInterface_TextBeforeOffset(const QAccessibleTextInterface* self, int offset, int boundaryType, int* startOffset, int* endOffset) { +struct miqt_string QAccessibleTextInterface_TextBeforeOffset(const QAccessibleTextInterface* self, int offset, int boundaryType, int* startOffset, int* endOffset) { QString _ret = self->textBeforeOffset(static_cast(offset), static_cast(boundaryType), static_cast(startOffset), static_cast(endOffset)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAccessibleTextInterface_TextAfterOffset(const QAccessibleTextInterface* self, int offset, int boundaryType, int* startOffset, int* endOffset) { +struct miqt_string QAccessibleTextInterface_TextAfterOffset(const QAccessibleTextInterface* self, int offset, int boundaryType, int* startOffset, int* endOffset) { QString _ret = self->textAfterOffset(static_cast(offset), static_cast(boundaryType), static_cast(startOffset), static_cast(endOffset)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAccessibleTextInterface_TextAtOffset(const QAccessibleTextInterface* self, int offset, int boundaryType, int* startOffset, int* endOffset) { +struct miqt_string QAccessibleTextInterface_TextAtOffset(const QAccessibleTextInterface* self, int offset, int boundaryType, int* startOffset, int* endOffset) { QString _ret = self->textAtOffset(static_cast(offset), static_cast(boundaryType), static_cast(startOffset), static_cast(endOffset)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QAccessibleTextInterface_CharacterCount(const QAccessibleTextInterface* self) { @@ -264,11 +284,15 @@ void QAccessibleTextInterface_ScrollToSubstring(QAccessibleTextInterface* self, self->scrollToSubstring(static_cast(startIndex), static_cast(endIndex)); } -struct miqt_string* QAccessibleTextInterface_Attributes(const QAccessibleTextInterface* self, int offset, int* startOffset, int* endOffset) { +struct miqt_string QAccessibleTextInterface_Attributes(const QAccessibleTextInterface* self, int offset, int* startOffset, int* endOffset) { QString _ret = self->attributes(static_cast(offset), static_cast(startOffset), static_cast(endOffset)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QAccessibleTextInterface_OperatorAssign(QAccessibleTextInterface* self, QAccessibleTextInterface* param1) { @@ -283,13 +307,13 @@ void QAccessibleEditableTextInterface_DeleteText(QAccessibleEditableTextInterfac self->deleteText(static_cast(startOffset), static_cast(endOffset)); } -void QAccessibleEditableTextInterface_InsertText(QAccessibleEditableTextInterface* self, int offset, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QAccessibleEditableTextInterface_InsertText(QAccessibleEditableTextInterface* self, int offset, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->insertText(static_cast(offset), text_QString); } -void QAccessibleEditableTextInterface_ReplaceText(QAccessibleEditableTextInterface* self, int startOffset, int endOffset, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QAccessibleEditableTextInterface_ReplaceText(QAccessibleEditableTextInterface* self, int startOffset, int endOffset, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->replaceText(static_cast(startOffset), static_cast(endOffset), text_QString); } @@ -416,18 +440,26 @@ struct miqt_array* QAccessibleTableInterface_SelectedCells(const QAccessibleTabl return _out; } -struct miqt_string* QAccessibleTableInterface_ColumnDescription(const QAccessibleTableInterface* self, int column) { +struct miqt_string QAccessibleTableInterface_ColumnDescription(const QAccessibleTableInterface* self, int column) { QString _ret = self->columnDescription(static_cast(column)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAccessibleTableInterface_RowDescription(const QAccessibleTableInterface* self, int row) { +struct miqt_string QAccessibleTableInterface_RowDescription(const QAccessibleTableInterface* self, int row) { QString _ret = self->rowDescription(static_cast(row)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QAccessibleTableInterface_SelectedColumnCount(const QAccessibleTableInterface* self) { @@ -504,29 +536,41 @@ void QAccessibleTableInterface_Delete(QAccessibleTableInterface* self) { delete self; } -struct miqt_string* QAccessibleActionInterface_Tr(const char* sourceText) { +struct miqt_string QAccessibleActionInterface_Tr(const char* sourceText) { QString _ret = QAccessibleActionInterface::tr(sourceText); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAccessibleActionInterface_TrUtf8(const char* sourceText) { +struct miqt_string QAccessibleActionInterface_TrUtf8(const char* sourceText) { QString _ret = QAccessibleActionInterface::trUtf8(sourceText); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } struct miqt_array* QAccessibleActionInterface_ActionNames(const QAccessibleActionInterface* self) { QStringList _ret = self->actionNames(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -534,37 +578,49 @@ struct miqt_array* QAccessibleActionInterface_ActionNames(const QAccessibleActio return _out; } -struct miqt_string* QAccessibleActionInterface_LocalizedActionName(const QAccessibleActionInterface* self, struct miqt_string* name) { - QString name_QString = QString::fromUtf8(&name->data, name->len); +struct miqt_string QAccessibleActionInterface_LocalizedActionName(const QAccessibleActionInterface* self, struct miqt_string name) { + QString name_QString = QString::fromUtf8(name.data, name.len); QString _ret = self->localizedActionName(name_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAccessibleActionInterface_LocalizedActionDescription(const QAccessibleActionInterface* self, struct miqt_string* name) { - QString name_QString = QString::fromUtf8(&name->data, name->len); +struct miqt_string QAccessibleActionInterface_LocalizedActionDescription(const QAccessibleActionInterface* self, struct miqt_string name) { + QString name_QString = QString::fromUtf8(name.data, name.len); QString _ret = self->localizedActionDescription(name_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QAccessibleActionInterface_DoAction(QAccessibleActionInterface* self, struct miqt_string* actionName) { - QString actionName_QString = QString::fromUtf8(&actionName->data, actionName->len); +void QAccessibleActionInterface_DoAction(QAccessibleActionInterface* self, struct miqt_string actionName) { + QString actionName_QString = QString::fromUtf8(actionName.data, actionName.len); self->doAction(actionName_QString); } -struct miqt_array* QAccessibleActionInterface_KeyBindingsForAction(const QAccessibleActionInterface* self, struct miqt_string* actionName) { - QString actionName_QString = QString::fromUtf8(&actionName->data, actionName->len); +struct miqt_array* QAccessibleActionInterface_KeyBindingsForAction(const QAccessibleActionInterface* self, struct miqt_string actionName) { + QString actionName_QString = QString::fromUtf8(actionName.data, actionName.len); QStringList _ret = self->keyBindingsForAction(actionName_QString); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -572,131 +628,199 @@ struct miqt_array* QAccessibleActionInterface_KeyBindingsForAction(const QAccess return _out; } -struct miqt_string* QAccessibleActionInterface_PressAction() { +struct miqt_string QAccessibleActionInterface_PressAction() { const QString _ret = QAccessibleActionInterface::pressAction(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAccessibleActionInterface_IncreaseAction() { +struct miqt_string QAccessibleActionInterface_IncreaseAction() { const QString _ret = QAccessibleActionInterface::increaseAction(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAccessibleActionInterface_DecreaseAction() { +struct miqt_string QAccessibleActionInterface_DecreaseAction() { const QString _ret = QAccessibleActionInterface::decreaseAction(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAccessibleActionInterface_ShowMenuAction() { +struct miqt_string QAccessibleActionInterface_ShowMenuAction() { const QString _ret = QAccessibleActionInterface::showMenuAction(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAccessibleActionInterface_SetFocusAction() { +struct miqt_string QAccessibleActionInterface_SetFocusAction() { const QString _ret = QAccessibleActionInterface::setFocusAction(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAccessibleActionInterface_ToggleAction() { +struct miqt_string QAccessibleActionInterface_ToggleAction() { const QString _ret = QAccessibleActionInterface::toggleAction(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAccessibleActionInterface_ScrollLeftAction() { +struct miqt_string QAccessibleActionInterface_ScrollLeftAction() { QString _ret = QAccessibleActionInterface::scrollLeftAction(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAccessibleActionInterface_ScrollRightAction() { +struct miqt_string QAccessibleActionInterface_ScrollRightAction() { QString _ret = QAccessibleActionInterface::scrollRightAction(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAccessibleActionInterface_ScrollUpAction() { +struct miqt_string QAccessibleActionInterface_ScrollUpAction() { QString _ret = QAccessibleActionInterface::scrollUpAction(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAccessibleActionInterface_ScrollDownAction() { +struct miqt_string QAccessibleActionInterface_ScrollDownAction() { QString _ret = QAccessibleActionInterface::scrollDownAction(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAccessibleActionInterface_NextPageAction() { +struct miqt_string QAccessibleActionInterface_NextPageAction() { QString _ret = QAccessibleActionInterface::nextPageAction(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAccessibleActionInterface_PreviousPageAction() { +struct miqt_string QAccessibleActionInterface_PreviousPageAction() { QString _ret = QAccessibleActionInterface::previousPageAction(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QAccessibleActionInterface_OperatorAssign(QAccessibleActionInterface* self, QAccessibleActionInterface* param1) { self->operator=(*param1); } -struct miqt_string* QAccessibleActionInterface_Tr2(const char* sourceText, const char* disambiguation) { +struct miqt_string QAccessibleActionInterface_Tr2(const char* sourceText, const char* disambiguation) { QString _ret = QAccessibleActionInterface::tr(sourceText, disambiguation); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAccessibleActionInterface_Tr3(const char* sourceText, const char* disambiguation, int n) { +struct miqt_string QAccessibleActionInterface_Tr3(const char* sourceText, const char* disambiguation, int n) { QString _ret = QAccessibleActionInterface::tr(sourceText, disambiguation, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAccessibleActionInterface_TrUtf82(const char* sourceText, const char* disambiguation) { +struct miqt_string QAccessibleActionInterface_TrUtf82(const char* sourceText, const char* disambiguation) { QString _ret = QAccessibleActionInterface::trUtf8(sourceText, disambiguation); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAccessibleActionInterface_TrUtf83(const char* sourceText, const char* disambiguation, int n) { +struct miqt_string QAccessibleActionInterface_TrUtf83(const char* sourceText, const char* disambiguation, int n) { QString _ret = QAccessibleActionInterface::trUtf8(sourceText, disambiguation, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QAccessibleActionInterface_Delete(QAccessibleActionInterface* self) { delete self; } -struct miqt_string* QAccessibleImageInterface_ImageDescription(const QAccessibleImageInterface* self) { +struct miqt_string QAccessibleImageInterface_ImageDescription(const QAccessibleImageInterface* self) { QString _ret = self->imageDescription(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QSize* QAccessibleImageInterface_ImageSize(const QAccessibleImageInterface* self) { @@ -813,21 +937,25 @@ void QAccessibleTextSelectionEvent_Delete(QAccessibleTextSelectionEvent* self) { delete self; } -QAccessibleTextInsertEvent* QAccessibleTextInsertEvent_new(QObject* obj, int position, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QAccessibleTextInsertEvent* QAccessibleTextInsertEvent_new(QObject* obj, int position, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QAccessibleTextInsertEvent(obj, static_cast(position), text_QString); } -QAccessibleTextInsertEvent* QAccessibleTextInsertEvent_new2(QAccessibleInterface* iface, int position, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QAccessibleTextInsertEvent* QAccessibleTextInsertEvent_new2(QAccessibleInterface* iface, int position, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QAccessibleTextInsertEvent(iface, static_cast(position), text_QString); } -struct miqt_string* QAccessibleTextInsertEvent_TextInserted(const QAccessibleTextInsertEvent* self) { +struct miqt_string QAccessibleTextInsertEvent_TextInserted(const QAccessibleTextInsertEvent* self) { QString _ret = self->textInserted(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QAccessibleTextInsertEvent_ChangePosition(const QAccessibleTextInsertEvent* self) { @@ -838,21 +966,25 @@ void QAccessibleTextInsertEvent_Delete(QAccessibleTextInsertEvent* self) { delete self; } -QAccessibleTextRemoveEvent* QAccessibleTextRemoveEvent_new(QObject* obj, int position, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QAccessibleTextRemoveEvent* QAccessibleTextRemoveEvent_new(QObject* obj, int position, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QAccessibleTextRemoveEvent(obj, static_cast(position), text_QString); } -QAccessibleTextRemoveEvent* QAccessibleTextRemoveEvent_new2(QAccessibleInterface* iface, int position, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QAccessibleTextRemoveEvent* QAccessibleTextRemoveEvent_new2(QAccessibleInterface* iface, int position, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QAccessibleTextRemoveEvent(iface, static_cast(position), text_QString); } -struct miqt_string* QAccessibleTextRemoveEvent_TextRemoved(const QAccessibleTextRemoveEvent* self) { +struct miqt_string QAccessibleTextRemoveEvent_TextRemoved(const QAccessibleTextRemoveEvent* self) { QString _ret = self->textRemoved(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QAccessibleTextRemoveEvent_ChangePosition(const QAccessibleTextRemoveEvent* self) { @@ -863,30 +995,38 @@ void QAccessibleTextRemoveEvent_Delete(QAccessibleTextRemoveEvent* self) { delete self; } -QAccessibleTextUpdateEvent* QAccessibleTextUpdateEvent_new(QObject* obj, int position, struct miqt_string* oldText, struct miqt_string* text) { - QString oldText_QString = QString::fromUtf8(&oldText->data, oldText->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); +QAccessibleTextUpdateEvent* QAccessibleTextUpdateEvent_new(QObject* obj, int position, struct miqt_string oldText, struct miqt_string text) { + QString oldText_QString = QString::fromUtf8(oldText.data, oldText.len); + QString text_QString = QString::fromUtf8(text.data, text.len); return new QAccessibleTextUpdateEvent(obj, static_cast(position), oldText_QString, text_QString); } -QAccessibleTextUpdateEvent* QAccessibleTextUpdateEvent_new2(QAccessibleInterface* iface, int position, struct miqt_string* oldText, struct miqt_string* text) { - QString oldText_QString = QString::fromUtf8(&oldText->data, oldText->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); +QAccessibleTextUpdateEvent* QAccessibleTextUpdateEvent_new2(QAccessibleInterface* iface, int position, struct miqt_string oldText, struct miqt_string text) { + QString oldText_QString = QString::fromUtf8(oldText.data, oldText.len); + QString text_QString = QString::fromUtf8(text.data, text.len); return new QAccessibleTextUpdateEvent(iface, static_cast(position), oldText_QString, text_QString); } -struct miqt_string* QAccessibleTextUpdateEvent_TextRemoved(const QAccessibleTextUpdateEvent* self) { +struct miqt_string QAccessibleTextUpdateEvent_TextRemoved(const QAccessibleTextUpdateEvent* self) { QString _ret = self->textRemoved(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAccessibleTextUpdateEvent_TextInserted(const QAccessibleTextUpdateEvent* self) { +struct miqt_string QAccessibleTextUpdateEvent_TextInserted(const QAccessibleTextUpdateEvent* self) { QString _ret = self->textInserted(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QAccessibleTextUpdateEvent_ChangePosition(const QAccessibleTextUpdateEvent* self) { diff --git a/qt/gen_qaccessible.go b/qt/gen_qaccessible.go index ce9cfc9f..900f6ef0 100644 --- a/qt/gen_qaccessible.go +++ b/qt/gen_qaccessible.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -383,16 +382,18 @@ func (this *QAccessibleInterface) IndexOfChild(param1 *QAccessibleInterface) int } func (this *QAccessibleInterface) Text(t QAccessible__Text) string { - var _ms *C.struct_miqt_string = C.QAccessibleInterface_Text(this.h, (C.int)(t)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAccessibleInterface_Text(this.h, (C.int)(t)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QAccessibleInterface) SetText(t QAccessible__Text, text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QAccessibleInterface_SetText(this.h, (C.int)(t), (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QAccessibleInterface_SetText(this.h, (C.int)(t), text_ms) } func (this *QAccessibleInterface) Rect() *QRect { @@ -460,7 +461,7 @@ func (this *QAccessibleInterface) VirtualHook(id int, data unsafe.Pointer) { } func (this *QAccessibleInterface) InterfaceCast(param1 QAccessible__InterfaceType) unsafe.Pointer { - return C.QAccessibleInterface_InterfaceCast(this.h, (C.int)(param1)) + return (unsafe.Pointer)(C.QAccessibleInterface_InterfaceCast(this.h, (C.int)(param1))) } type QAccessibleTextInterface struct { @@ -521,30 +522,30 @@ func (this *QAccessibleTextInterface) SetCursorPosition(position int) { } func (this *QAccessibleTextInterface) Text(startOffset int, endOffset int) string { - var _ms *C.struct_miqt_string = C.QAccessibleTextInterface_Text(this.h, (C.int)(startOffset), (C.int)(endOffset)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAccessibleTextInterface_Text(this.h, (C.int)(startOffset), (C.int)(endOffset)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QAccessibleTextInterface) TextBeforeOffset(offset int, boundaryType QAccessible__TextBoundaryType, startOffset *int, endOffset *int) string { - var _ms *C.struct_miqt_string = C.QAccessibleTextInterface_TextBeforeOffset(this.h, (C.int)(offset), (C.int)(boundaryType), (*C.int)(unsafe.Pointer(startOffset)), (*C.int)(unsafe.Pointer(endOffset))) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAccessibleTextInterface_TextBeforeOffset(this.h, (C.int)(offset), (C.int)(boundaryType), (*C.int)(unsafe.Pointer(startOffset)), (*C.int)(unsafe.Pointer(endOffset))) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QAccessibleTextInterface) TextAfterOffset(offset int, boundaryType QAccessible__TextBoundaryType, startOffset *int, endOffset *int) string { - var _ms *C.struct_miqt_string = C.QAccessibleTextInterface_TextAfterOffset(this.h, (C.int)(offset), (C.int)(boundaryType), (*C.int)(unsafe.Pointer(startOffset)), (*C.int)(unsafe.Pointer(endOffset))) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAccessibleTextInterface_TextAfterOffset(this.h, (C.int)(offset), (C.int)(boundaryType), (*C.int)(unsafe.Pointer(startOffset)), (*C.int)(unsafe.Pointer(endOffset))) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QAccessibleTextInterface) TextAtOffset(offset int, boundaryType QAccessible__TextBoundaryType, startOffset *int, endOffset *int) string { - var _ms *C.struct_miqt_string = C.QAccessibleTextInterface_TextAtOffset(this.h, (C.int)(offset), (C.int)(boundaryType), (*C.int)(unsafe.Pointer(startOffset)), (*C.int)(unsafe.Pointer(endOffset))) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAccessibleTextInterface_TextAtOffset(this.h, (C.int)(offset), (C.int)(boundaryType), (*C.int)(unsafe.Pointer(startOffset)), (*C.int)(unsafe.Pointer(endOffset))) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -568,9 +569,9 @@ func (this *QAccessibleTextInterface) ScrollToSubstring(startIndex int, endIndex } func (this *QAccessibleTextInterface) Attributes(offset int, startOffset *int, endOffset *int) string { - var _ms *C.struct_miqt_string = C.QAccessibleTextInterface_Attributes(this.h, (C.int)(offset), (*C.int)(unsafe.Pointer(startOffset)), (*C.int)(unsafe.Pointer(endOffset))) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAccessibleTextInterface_Attributes(this.h, (C.int)(offset), (*C.int)(unsafe.Pointer(startOffset)), (*C.int)(unsafe.Pointer(endOffset))) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -626,15 +627,19 @@ func (this *QAccessibleEditableTextInterface) DeleteText(startOffset int, endOff } func (this *QAccessibleEditableTextInterface) InsertText(offset int, text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QAccessibleEditableTextInterface_InsertText(this.h, (C.int)(offset), (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QAccessibleEditableTextInterface_InsertText(this.h, (C.int)(offset), text_ms) } func (this *QAccessibleEditableTextInterface) ReplaceText(startOffset int, endOffset int, text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QAccessibleEditableTextInterface_ReplaceText(this.h, (C.int)(startOffset), (C.int)(endOffset), (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QAccessibleEditableTextInterface_ReplaceText(this.h, (C.int)(startOffset), (C.int)(endOffset), text_ms) } func (this *QAccessibleEditableTextInterface) OperatorAssign(param1 *QAccessibleEditableTextInterface) { @@ -884,16 +889,16 @@ func (this *QAccessibleTableInterface) SelectedCells() []*QAccessibleInterface { } func (this *QAccessibleTableInterface) ColumnDescription(column int) string { - var _ms *C.struct_miqt_string = C.QAccessibleTableInterface_ColumnDescription(this.h, (C.int)(column)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAccessibleTableInterface_ColumnDescription(this.h, (C.int)(column)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QAccessibleTableInterface) RowDescription(row int) string { - var _ms *C.struct_miqt_string = C.QAccessibleTableInterface_RowDescription(this.h, (C.int)(row)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAccessibleTableInterface_RowDescription(this.h, (C.int)(row)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -1009,29 +1014,29 @@ func UnsafeNewQAccessibleActionInterface(h unsafe.Pointer) *QAccessibleActionInt func QAccessibleActionInterface_Tr(sourceText string) string { sourceText_Cstring := C.CString(sourceText) defer C.free(unsafe.Pointer(sourceText_Cstring)) - var _ms *C.struct_miqt_string = C.QAccessibleActionInterface_Tr(sourceText_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAccessibleActionInterface_Tr(sourceText_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QAccessibleActionInterface_TrUtf8(sourceText string) string { sourceText_Cstring := C.CString(sourceText) defer C.free(unsafe.Pointer(sourceText_Cstring)) - var _ms *C.struct_miqt_string = C.QAccessibleActionInterface_TrUtf8(sourceText_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAccessibleActionInterface_TrUtf8(sourceText_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QAccessibleActionInterface) ActionNames() []string { var _ma *C.struct_miqt_array = C.QAccessibleActionInterface_ActionNames(this.h) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -1039,39 +1044,47 @@ func (this *QAccessibleActionInterface) ActionNames() []string { } func (this *QAccessibleActionInterface) LocalizedActionName(name string) string { - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - var _ms *C.struct_miqt_string = C.QAccessibleActionInterface_LocalizedActionName(this.h, (*C.struct_miqt_string)(name_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + var _ms C.struct_miqt_string = C.QAccessibleActionInterface_LocalizedActionName(this.h, name_ms) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QAccessibleActionInterface) LocalizedActionDescription(name string) string { - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - var _ms *C.struct_miqt_string = C.QAccessibleActionInterface_LocalizedActionDescription(this.h, (*C.struct_miqt_string)(name_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + var _ms C.struct_miqt_string = C.QAccessibleActionInterface_LocalizedActionDescription(this.h, name_ms) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QAccessibleActionInterface) DoAction(actionName string) { - actionName_ms := libmiqt.Strdupg(actionName) - defer C.free(actionName_ms) - C.QAccessibleActionInterface_DoAction(this.h, (*C.struct_miqt_string)(actionName_ms)) + actionName_ms := C.struct_miqt_string{} + actionName_ms.data = C.CString(actionName) + actionName_ms.len = C.size_t(len(actionName)) + defer C.free(unsafe.Pointer(actionName_ms.data)) + C.QAccessibleActionInterface_DoAction(this.h, actionName_ms) } func (this *QAccessibleActionInterface) KeyBindingsForAction(actionName string) []string { - actionName_ms := libmiqt.Strdupg(actionName) - defer C.free(actionName_ms) - var _ma *C.struct_miqt_array = C.QAccessibleActionInterface_KeyBindingsForAction(this.h, (*C.struct_miqt_string)(actionName_ms)) + actionName_ms := C.struct_miqt_string{} + actionName_ms.data = C.CString(actionName) + actionName_ms.len = C.size_t(len(actionName)) + defer C.free(unsafe.Pointer(actionName_ms.data)) + var _ma *C.struct_miqt_array = C.QAccessibleActionInterface_KeyBindingsForAction(this.h, actionName_ms) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -1079,86 +1092,86 @@ func (this *QAccessibleActionInterface) KeyBindingsForAction(actionName string) } func QAccessibleActionInterface_PressAction() string { - var _ms *C.struct_miqt_string = C.QAccessibleActionInterface_PressAction() - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAccessibleActionInterface_PressAction() + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QAccessibleActionInterface_IncreaseAction() string { - var _ms *C.struct_miqt_string = C.QAccessibleActionInterface_IncreaseAction() - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAccessibleActionInterface_IncreaseAction() + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QAccessibleActionInterface_DecreaseAction() string { - var _ms *C.struct_miqt_string = C.QAccessibleActionInterface_DecreaseAction() - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAccessibleActionInterface_DecreaseAction() + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QAccessibleActionInterface_ShowMenuAction() string { - var _ms *C.struct_miqt_string = C.QAccessibleActionInterface_ShowMenuAction() - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAccessibleActionInterface_ShowMenuAction() + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QAccessibleActionInterface_SetFocusAction() string { - var _ms *C.struct_miqt_string = C.QAccessibleActionInterface_SetFocusAction() - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAccessibleActionInterface_SetFocusAction() + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QAccessibleActionInterface_ToggleAction() string { - var _ms *C.struct_miqt_string = C.QAccessibleActionInterface_ToggleAction() - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAccessibleActionInterface_ToggleAction() + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QAccessibleActionInterface_ScrollLeftAction() string { - var _ms *C.struct_miqt_string = C.QAccessibleActionInterface_ScrollLeftAction() - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAccessibleActionInterface_ScrollLeftAction() + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QAccessibleActionInterface_ScrollRightAction() string { - var _ms *C.struct_miqt_string = C.QAccessibleActionInterface_ScrollRightAction() - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAccessibleActionInterface_ScrollRightAction() + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QAccessibleActionInterface_ScrollUpAction() string { - var _ms *C.struct_miqt_string = C.QAccessibleActionInterface_ScrollUpAction() - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAccessibleActionInterface_ScrollUpAction() + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QAccessibleActionInterface_ScrollDownAction() string { - var _ms *C.struct_miqt_string = C.QAccessibleActionInterface_ScrollDownAction() - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAccessibleActionInterface_ScrollDownAction() + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QAccessibleActionInterface_NextPageAction() string { - var _ms *C.struct_miqt_string = C.QAccessibleActionInterface_NextPageAction() - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAccessibleActionInterface_NextPageAction() + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QAccessibleActionInterface_PreviousPageAction() string { - var _ms *C.struct_miqt_string = C.QAccessibleActionInterface_PreviousPageAction() - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAccessibleActionInterface_PreviousPageAction() + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -1171,9 +1184,9 @@ func QAccessibleActionInterface_Tr2(sourceText string, disambiguation string) st defer C.free(unsafe.Pointer(sourceText_Cstring)) disambiguation_Cstring := C.CString(disambiguation) defer C.free(unsafe.Pointer(disambiguation_Cstring)) - var _ms *C.struct_miqt_string = C.QAccessibleActionInterface_Tr2(sourceText_Cstring, disambiguation_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAccessibleActionInterface_Tr2(sourceText_Cstring, disambiguation_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -1182,9 +1195,9 @@ func QAccessibleActionInterface_Tr3(sourceText string, disambiguation string, n defer C.free(unsafe.Pointer(sourceText_Cstring)) disambiguation_Cstring := C.CString(disambiguation) defer C.free(unsafe.Pointer(disambiguation_Cstring)) - var _ms *C.struct_miqt_string = C.QAccessibleActionInterface_Tr3(sourceText_Cstring, disambiguation_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAccessibleActionInterface_Tr3(sourceText_Cstring, disambiguation_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -1193,9 +1206,9 @@ func QAccessibleActionInterface_TrUtf82(sourceText string, disambiguation string defer C.free(unsafe.Pointer(sourceText_Cstring)) disambiguation_Cstring := C.CString(disambiguation) defer C.free(unsafe.Pointer(disambiguation_Cstring)) - var _ms *C.struct_miqt_string = C.QAccessibleActionInterface_TrUtf82(sourceText_Cstring, disambiguation_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAccessibleActionInterface_TrUtf82(sourceText_Cstring, disambiguation_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -1204,9 +1217,9 @@ func QAccessibleActionInterface_TrUtf83(sourceText string, disambiguation string defer C.free(unsafe.Pointer(sourceText_Cstring)) disambiguation_Cstring := C.CString(disambiguation) defer C.free(unsafe.Pointer(disambiguation_Cstring)) - var _ms *C.struct_miqt_string = C.QAccessibleActionInterface_TrUtf83(sourceText_Cstring, disambiguation_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAccessibleActionInterface_TrUtf83(sourceText_Cstring, disambiguation_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -1254,9 +1267,9 @@ func UnsafeNewQAccessibleImageInterface(h unsafe.Pointer) *QAccessibleImageInter } func (this *QAccessibleImageInterface) ImageDescription() string { - var _ms *C.struct_miqt_string = C.QAccessibleImageInterface_ImageDescription(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAccessibleImageInterface_ImageDescription(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -1598,24 +1611,28 @@ func UnsafeNewQAccessibleTextInsertEvent(h unsafe.Pointer) *QAccessibleTextInser // NewQAccessibleTextInsertEvent constructs a new QAccessibleTextInsertEvent object. func NewQAccessibleTextInsertEvent(obj *QObject, position int, text string) *QAccessibleTextInsertEvent { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - ret := C.QAccessibleTextInsertEvent_new(obj.cPointer(), (C.int)(position), (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + ret := C.QAccessibleTextInsertEvent_new(obj.cPointer(), (C.int)(position), text_ms) return newQAccessibleTextInsertEvent(ret) } // NewQAccessibleTextInsertEvent2 constructs a new QAccessibleTextInsertEvent object. func NewQAccessibleTextInsertEvent2(iface *QAccessibleInterface, position int, text string) *QAccessibleTextInsertEvent { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - ret := C.QAccessibleTextInsertEvent_new2(iface.cPointer(), (C.int)(position), (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + ret := C.QAccessibleTextInsertEvent_new2(iface.cPointer(), (C.int)(position), text_ms) return newQAccessibleTextInsertEvent(ret) } func (this *QAccessibleTextInsertEvent) TextInserted() string { - var _ms *C.struct_miqt_string = C.QAccessibleTextInsertEvent_TextInserted(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAccessibleTextInsertEvent_TextInserted(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -1669,24 +1686,28 @@ func UnsafeNewQAccessibleTextRemoveEvent(h unsafe.Pointer) *QAccessibleTextRemov // NewQAccessibleTextRemoveEvent constructs a new QAccessibleTextRemoveEvent object. func NewQAccessibleTextRemoveEvent(obj *QObject, position int, text string) *QAccessibleTextRemoveEvent { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - ret := C.QAccessibleTextRemoveEvent_new(obj.cPointer(), (C.int)(position), (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + ret := C.QAccessibleTextRemoveEvent_new(obj.cPointer(), (C.int)(position), text_ms) return newQAccessibleTextRemoveEvent(ret) } // NewQAccessibleTextRemoveEvent2 constructs a new QAccessibleTextRemoveEvent object. func NewQAccessibleTextRemoveEvent2(iface *QAccessibleInterface, position int, text string) *QAccessibleTextRemoveEvent { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - ret := C.QAccessibleTextRemoveEvent_new2(iface.cPointer(), (C.int)(position), (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + ret := C.QAccessibleTextRemoveEvent_new2(iface.cPointer(), (C.int)(position), text_ms) return newQAccessibleTextRemoveEvent(ret) } func (this *QAccessibleTextRemoveEvent) TextRemoved() string { - var _ms *C.struct_miqt_string = C.QAccessibleTextRemoveEvent_TextRemoved(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAccessibleTextRemoveEvent_TextRemoved(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -1740,35 +1761,43 @@ func UnsafeNewQAccessibleTextUpdateEvent(h unsafe.Pointer) *QAccessibleTextUpdat // NewQAccessibleTextUpdateEvent constructs a new QAccessibleTextUpdateEvent object. func NewQAccessibleTextUpdateEvent(obj *QObject, position int, oldText string, text string) *QAccessibleTextUpdateEvent { - oldText_ms := libmiqt.Strdupg(oldText) - defer C.free(oldText_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - ret := C.QAccessibleTextUpdateEvent_new(obj.cPointer(), (C.int)(position), (*C.struct_miqt_string)(oldText_ms), (*C.struct_miqt_string)(text_ms)) + oldText_ms := C.struct_miqt_string{} + oldText_ms.data = C.CString(oldText) + oldText_ms.len = C.size_t(len(oldText)) + defer C.free(unsafe.Pointer(oldText_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + ret := C.QAccessibleTextUpdateEvent_new(obj.cPointer(), (C.int)(position), oldText_ms, text_ms) return newQAccessibleTextUpdateEvent(ret) } // NewQAccessibleTextUpdateEvent2 constructs a new QAccessibleTextUpdateEvent object. func NewQAccessibleTextUpdateEvent2(iface *QAccessibleInterface, position int, oldText string, text string) *QAccessibleTextUpdateEvent { - oldText_ms := libmiqt.Strdupg(oldText) - defer C.free(oldText_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - ret := C.QAccessibleTextUpdateEvent_new2(iface.cPointer(), (C.int)(position), (*C.struct_miqt_string)(oldText_ms), (*C.struct_miqt_string)(text_ms)) + oldText_ms := C.struct_miqt_string{} + oldText_ms.data = C.CString(oldText) + oldText_ms.len = C.size_t(len(oldText)) + defer C.free(unsafe.Pointer(oldText_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + ret := C.QAccessibleTextUpdateEvent_new2(iface.cPointer(), (C.int)(position), oldText_ms, text_ms) return newQAccessibleTextUpdateEvent(ret) } func (this *QAccessibleTextUpdateEvent) TextRemoved() string { - var _ms *C.struct_miqt_string = C.QAccessibleTextUpdateEvent_TextRemoved(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAccessibleTextUpdateEvent_TextRemoved(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QAccessibleTextUpdateEvent) TextInserted() string { - var _ms *C.struct_miqt_string = C.QAccessibleTextUpdateEvent_TextInserted(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAccessibleTextUpdateEvent_TextInserted(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qaccessible.h b/qt/gen_qaccessible.h index a751c66b..d6b93181 100644 --- a/qt/gen_qaccessible.h +++ b/qt/gen_qaccessible.h @@ -102,8 +102,8 @@ QAccessibleInterface* QAccessibleInterface_Parent(const QAccessibleInterface* se QAccessibleInterface* QAccessibleInterface_Child(const QAccessibleInterface* self, int index); int QAccessibleInterface_ChildCount(const QAccessibleInterface* self); int QAccessibleInterface_IndexOfChild(const QAccessibleInterface* self, QAccessibleInterface* param1); -struct miqt_string* QAccessibleInterface_Text(const QAccessibleInterface* self, int t); -void QAccessibleInterface_SetText(QAccessibleInterface* self, int t, struct miqt_string* text); +struct miqt_string QAccessibleInterface_Text(const QAccessibleInterface* self, int t); +void QAccessibleInterface_SetText(QAccessibleInterface* self, int t, struct miqt_string text); QRect* QAccessibleInterface_Rect(const QAccessibleInterface* self); int QAccessibleInterface_Role(const QAccessibleInterface* self); QAccessible__State* QAccessibleInterface_State(const QAccessibleInterface* self); @@ -126,21 +126,21 @@ void QAccessibleTextInterface_RemoveSelection(QAccessibleTextInterface* self, in void QAccessibleTextInterface_SetSelection(QAccessibleTextInterface* self, int selectionIndex, int startOffset, int endOffset); int QAccessibleTextInterface_CursorPosition(const QAccessibleTextInterface* self); void QAccessibleTextInterface_SetCursorPosition(QAccessibleTextInterface* self, int position); -struct miqt_string* QAccessibleTextInterface_Text(const QAccessibleTextInterface* self, int startOffset, int endOffset); -struct miqt_string* QAccessibleTextInterface_TextBeforeOffset(const QAccessibleTextInterface* self, int offset, int boundaryType, int* startOffset, int* endOffset); -struct miqt_string* QAccessibleTextInterface_TextAfterOffset(const QAccessibleTextInterface* self, int offset, int boundaryType, int* startOffset, int* endOffset); -struct miqt_string* QAccessibleTextInterface_TextAtOffset(const QAccessibleTextInterface* self, int offset, int boundaryType, int* startOffset, int* endOffset); +struct miqt_string QAccessibleTextInterface_Text(const QAccessibleTextInterface* self, int startOffset, int endOffset); +struct miqt_string QAccessibleTextInterface_TextBeforeOffset(const QAccessibleTextInterface* self, int offset, int boundaryType, int* startOffset, int* endOffset); +struct miqt_string QAccessibleTextInterface_TextAfterOffset(const QAccessibleTextInterface* self, int offset, int boundaryType, int* startOffset, int* endOffset); +struct miqt_string QAccessibleTextInterface_TextAtOffset(const QAccessibleTextInterface* self, int offset, int boundaryType, int* startOffset, int* endOffset); int QAccessibleTextInterface_CharacterCount(const QAccessibleTextInterface* self); QRect* QAccessibleTextInterface_CharacterRect(const QAccessibleTextInterface* self, int offset); int QAccessibleTextInterface_OffsetAtPoint(const QAccessibleTextInterface* self, QPoint* point); void QAccessibleTextInterface_ScrollToSubstring(QAccessibleTextInterface* self, int startIndex, int endIndex); -struct miqt_string* QAccessibleTextInterface_Attributes(const QAccessibleTextInterface* self, int offset, int* startOffset, int* endOffset); +struct miqt_string QAccessibleTextInterface_Attributes(const QAccessibleTextInterface* self, int offset, int* startOffset, int* endOffset); void QAccessibleTextInterface_OperatorAssign(QAccessibleTextInterface* self, QAccessibleTextInterface* param1); void QAccessibleTextInterface_Delete(QAccessibleTextInterface* self); void QAccessibleEditableTextInterface_DeleteText(QAccessibleEditableTextInterface* self, int startOffset, int endOffset); -void QAccessibleEditableTextInterface_InsertText(QAccessibleEditableTextInterface* self, int offset, struct miqt_string* text); -void QAccessibleEditableTextInterface_ReplaceText(QAccessibleEditableTextInterface* self, int startOffset, int endOffset, struct miqt_string* text); +void QAccessibleEditableTextInterface_InsertText(QAccessibleEditableTextInterface* self, int offset, struct miqt_string text); +void QAccessibleEditableTextInterface_ReplaceText(QAccessibleEditableTextInterface* self, int startOffset, int endOffset, struct miqt_string text); void QAccessibleEditableTextInterface_OperatorAssign(QAccessibleEditableTextInterface* self, QAccessibleEditableTextInterface* param1); void QAccessibleEditableTextInterface_Delete(QAccessibleEditableTextInterface* self); @@ -168,8 +168,8 @@ QAccessibleInterface* QAccessibleTableInterface_Summary(const QAccessibleTableIn QAccessibleInterface* QAccessibleTableInterface_CellAt(const QAccessibleTableInterface* self, int row, int column); int QAccessibleTableInterface_SelectedCellCount(const QAccessibleTableInterface* self); struct miqt_array* QAccessibleTableInterface_SelectedCells(const QAccessibleTableInterface* self); -struct miqt_string* QAccessibleTableInterface_ColumnDescription(const QAccessibleTableInterface* self, int column); -struct miqt_string* QAccessibleTableInterface_RowDescription(const QAccessibleTableInterface* self, int row); +struct miqt_string QAccessibleTableInterface_ColumnDescription(const QAccessibleTableInterface* self, int column); +struct miqt_string QAccessibleTableInterface_RowDescription(const QAccessibleTableInterface* self, int row); int QAccessibleTableInterface_SelectedColumnCount(const QAccessibleTableInterface* self); int QAccessibleTableInterface_SelectedRowCount(const QAccessibleTableInterface* self); int QAccessibleTableInterface_ColumnCount(const QAccessibleTableInterface* self); @@ -185,33 +185,33 @@ bool QAccessibleTableInterface_UnselectColumn(QAccessibleTableInterface* self, i void QAccessibleTableInterface_ModelChange(QAccessibleTableInterface* self, QAccessibleTableModelChangeEvent* event); void QAccessibleTableInterface_Delete(QAccessibleTableInterface* self); -struct miqt_string* QAccessibleActionInterface_Tr(const char* sourceText); -struct miqt_string* QAccessibleActionInterface_TrUtf8(const char* sourceText); +struct miqt_string QAccessibleActionInterface_Tr(const char* sourceText); +struct miqt_string QAccessibleActionInterface_TrUtf8(const char* sourceText); struct miqt_array* QAccessibleActionInterface_ActionNames(const QAccessibleActionInterface* self); -struct miqt_string* QAccessibleActionInterface_LocalizedActionName(const QAccessibleActionInterface* self, struct miqt_string* name); -struct miqt_string* QAccessibleActionInterface_LocalizedActionDescription(const QAccessibleActionInterface* self, struct miqt_string* name); -void QAccessibleActionInterface_DoAction(QAccessibleActionInterface* self, struct miqt_string* actionName); -struct miqt_array* QAccessibleActionInterface_KeyBindingsForAction(const QAccessibleActionInterface* self, struct miqt_string* actionName); -struct miqt_string* QAccessibleActionInterface_PressAction(); -struct miqt_string* QAccessibleActionInterface_IncreaseAction(); -struct miqt_string* QAccessibleActionInterface_DecreaseAction(); -struct miqt_string* QAccessibleActionInterface_ShowMenuAction(); -struct miqt_string* QAccessibleActionInterface_SetFocusAction(); -struct miqt_string* QAccessibleActionInterface_ToggleAction(); -struct miqt_string* QAccessibleActionInterface_ScrollLeftAction(); -struct miqt_string* QAccessibleActionInterface_ScrollRightAction(); -struct miqt_string* QAccessibleActionInterface_ScrollUpAction(); -struct miqt_string* QAccessibleActionInterface_ScrollDownAction(); -struct miqt_string* QAccessibleActionInterface_NextPageAction(); -struct miqt_string* QAccessibleActionInterface_PreviousPageAction(); +struct miqt_string QAccessibleActionInterface_LocalizedActionName(const QAccessibleActionInterface* self, struct miqt_string name); +struct miqt_string QAccessibleActionInterface_LocalizedActionDescription(const QAccessibleActionInterface* self, struct miqt_string name); +void QAccessibleActionInterface_DoAction(QAccessibleActionInterface* self, struct miqt_string actionName); +struct miqt_array* QAccessibleActionInterface_KeyBindingsForAction(const QAccessibleActionInterface* self, struct miqt_string actionName); +struct miqt_string QAccessibleActionInterface_PressAction(); +struct miqt_string QAccessibleActionInterface_IncreaseAction(); +struct miqt_string QAccessibleActionInterface_DecreaseAction(); +struct miqt_string QAccessibleActionInterface_ShowMenuAction(); +struct miqt_string QAccessibleActionInterface_SetFocusAction(); +struct miqt_string QAccessibleActionInterface_ToggleAction(); +struct miqt_string QAccessibleActionInterface_ScrollLeftAction(); +struct miqt_string QAccessibleActionInterface_ScrollRightAction(); +struct miqt_string QAccessibleActionInterface_ScrollUpAction(); +struct miqt_string QAccessibleActionInterface_ScrollDownAction(); +struct miqt_string QAccessibleActionInterface_NextPageAction(); +struct miqt_string QAccessibleActionInterface_PreviousPageAction(); void QAccessibleActionInterface_OperatorAssign(QAccessibleActionInterface* self, QAccessibleActionInterface* param1); -struct miqt_string* QAccessibleActionInterface_Tr2(const char* sourceText, const char* disambiguation); -struct miqt_string* QAccessibleActionInterface_Tr3(const char* sourceText, const char* disambiguation, int n); -struct miqt_string* QAccessibleActionInterface_TrUtf82(const char* sourceText, const char* disambiguation); -struct miqt_string* QAccessibleActionInterface_TrUtf83(const char* sourceText, const char* disambiguation, int n); +struct miqt_string QAccessibleActionInterface_Tr2(const char* sourceText, const char* disambiguation); +struct miqt_string QAccessibleActionInterface_Tr3(const char* sourceText, const char* disambiguation, int n); +struct miqt_string QAccessibleActionInterface_TrUtf82(const char* sourceText, const char* disambiguation); +struct miqt_string QAccessibleActionInterface_TrUtf83(const char* sourceText, const char* disambiguation, int n); void QAccessibleActionInterface_Delete(QAccessibleActionInterface* self); -struct miqt_string* QAccessibleImageInterface_ImageDescription(const QAccessibleImageInterface* self); +struct miqt_string QAccessibleImageInterface_ImageDescription(const QAccessibleImageInterface* self); QSize* QAccessibleImageInterface_ImageSize(const QAccessibleImageInterface* self); QPoint* QAccessibleImageInterface_ImagePosition(const QAccessibleImageInterface* self); void QAccessibleImageInterface_OperatorAssign(QAccessibleImageInterface* self, QAccessibleImageInterface* param1); @@ -245,22 +245,22 @@ int QAccessibleTextSelectionEvent_SelectionStart(const QAccessibleTextSelectionE int QAccessibleTextSelectionEvent_SelectionEnd(const QAccessibleTextSelectionEvent* self); void QAccessibleTextSelectionEvent_Delete(QAccessibleTextSelectionEvent* self); -QAccessibleTextInsertEvent* QAccessibleTextInsertEvent_new(QObject* obj, int position, struct miqt_string* text); -QAccessibleTextInsertEvent* QAccessibleTextInsertEvent_new2(QAccessibleInterface* iface, int position, struct miqt_string* text); -struct miqt_string* QAccessibleTextInsertEvent_TextInserted(const QAccessibleTextInsertEvent* self); +QAccessibleTextInsertEvent* QAccessibleTextInsertEvent_new(QObject* obj, int position, struct miqt_string text); +QAccessibleTextInsertEvent* QAccessibleTextInsertEvent_new2(QAccessibleInterface* iface, int position, struct miqt_string text); +struct miqt_string QAccessibleTextInsertEvent_TextInserted(const QAccessibleTextInsertEvent* self); int QAccessibleTextInsertEvent_ChangePosition(const QAccessibleTextInsertEvent* self); void QAccessibleTextInsertEvent_Delete(QAccessibleTextInsertEvent* self); -QAccessibleTextRemoveEvent* QAccessibleTextRemoveEvent_new(QObject* obj, int position, struct miqt_string* text); -QAccessibleTextRemoveEvent* QAccessibleTextRemoveEvent_new2(QAccessibleInterface* iface, int position, struct miqt_string* text); -struct miqt_string* QAccessibleTextRemoveEvent_TextRemoved(const QAccessibleTextRemoveEvent* self); +QAccessibleTextRemoveEvent* QAccessibleTextRemoveEvent_new(QObject* obj, int position, struct miqt_string text); +QAccessibleTextRemoveEvent* QAccessibleTextRemoveEvent_new2(QAccessibleInterface* iface, int position, struct miqt_string text); +struct miqt_string QAccessibleTextRemoveEvent_TextRemoved(const QAccessibleTextRemoveEvent* self); int QAccessibleTextRemoveEvent_ChangePosition(const QAccessibleTextRemoveEvent* self); void QAccessibleTextRemoveEvent_Delete(QAccessibleTextRemoveEvent* self); -QAccessibleTextUpdateEvent* QAccessibleTextUpdateEvent_new(QObject* obj, int position, struct miqt_string* oldText, struct miqt_string* text); -QAccessibleTextUpdateEvent* QAccessibleTextUpdateEvent_new2(QAccessibleInterface* iface, int position, struct miqt_string* oldText, struct miqt_string* text); -struct miqt_string* QAccessibleTextUpdateEvent_TextRemoved(const QAccessibleTextUpdateEvent* self); -struct miqt_string* QAccessibleTextUpdateEvent_TextInserted(const QAccessibleTextUpdateEvent* self); +QAccessibleTextUpdateEvent* QAccessibleTextUpdateEvent_new(QObject* obj, int position, struct miqt_string oldText, struct miqt_string text); +QAccessibleTextUpdateEvent* QAccessibleTextUpdateEvent_new2(QAccessibleInterface* iface, int position, struct miqt_string oldText, struct miqt_string text); +struct miqt_string QAccessibleTextUpdateEvent_TextRemoved(const QAccessibleTextUpdateEvent* self); +struct miqt_string QAccessibleTextUpdateEvent_TextInserted(const QAccessibleTextUpdateEvent* self); int QAccessibleTextUpdateEvent_ChangePosition(const QAccessibleTextUpdateEvent* self); void QAccessibleTextUpdateEvent_Delete(QAccessibleTextUpdateEvent* self); diff --git a/qt/gen_qaccessiblebridge.cpp b/qt/gen_qaccessiblebridge.cpp index e2e19e24..8804af7e 100644 --- a/qt/gen_qaccessiblebridge.cpp +++ b/qt/gen_qaccessiblebridge.cpp @@ -34,51 +34,75 @@ void* QAccessibleBridgePlugin_Metacast(QAccessibleBridgePlugin* self, const char return self->qt_metacast(param1); } -struct miqt_string* QAccessibleBridgePlugin_Tr(const char* s) { +struct miqt_string QAccessibleBridgePlugin_Tr(const char* s) { QString _ret = QAccessibleBridgePlugin::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAccessibleBridgePlugin_TrUtf8(const char* s) { +struct miqt_string QAccessibleBridgePlugin_TrUtf8(const char* s) { QString _ret = QAccessibleBridgePlugin::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -QAccessibleBridge* QAccessibleBridgePlugin_Create(QAccessibleBridgePlugin* self, struct miqt_string* key) { - QString key_QString = QString::fromUtf8(&key->data, key->len); +QAccessibleBridge* QAccessibleBridgePlugin_Create(QAccessibleBridgePlugin* self, struct miqt_string key) { + QString key_QString = QString::fromUtf8(key.data, key.len); return self->create(key_QString); } -struct miqt_string* QAccessibleBridgePlugin_Tr2(const char* s, const char* c) { +struct miqt_string QAccessibleBridgePlugin_Tr2(const char* s, const char* c) { QString _ret = QAccessibleBridgePlugin::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAccessibleBridgePlugin_Tr3(const char* s, const char* c, int n) { +struct miqt_string QAccessibleBridgePlugin_Tr3(const char* s, const char* c, int n) { QString _ret = QAccessibleBridgePlugin::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAccessibleBridgePlugin_TrUtf82(const char* s, const char* c) { +struct miqt_string QAccessibleBridgePlugin_TrUtf82(const char* s, const char* c) { QString _ret = QAccessibleBridgePlugin::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAccessibleBridgePlugin_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QAccessibleBridgePlugin_TrUtf83(const char* s, const char* c, int n) { QString _ret = QAccessibleBridgePlugin::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QAccessibleBridgePlugin_Delete(QAccessibleBridgePlugin* self) { diff --git a/qt/gen_qaccessiblebridge.go b/qt/gen_qaccessiblebridge.go index 87cdf691..6ad36b62 100644 --- a/qt/gen_qaccessiblebridge.go +++ b/qt/gen_qaccessiblebridge.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -106,31 +105,33 @@ func (this *QAccessibleBridgePlugin) MetaObject() *QMetaObject { func (this *QAccessibleBridgePlugin) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QAccessibleBridgePlugin_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QAccessibleBridgePlugin_Metacast(this.h, param1_Cstring)) } func QAccessibleBridgePlugin_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QAccessibleBridgePlugin_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAccessibleBridgePlugin_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QAccessibleBridgePlugin_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QAccessibleBridgePlugin_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAccessibleBridgePlugin_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QAccessibleBridgePlugin) Create(key string) *QAccessibleBridge { - key_ms := libmiqt.Strdupg(key) - defer C.free(key_ms) - return UnsafeNewQAccessibleBridge(unsafe.Pointer(C.QAccessibleBridgePlugin_Create(this.h, (*C.struct_miqt_string)(key_ms)))) + key_ms := C.struct_miqt_string{} + key_ms.data = C.CString(key) + key_ms.len = C.size_t(len(key)) + defer C.free(unsafe.Pointer(key_ms.data)) + return UnsafeNewQAccessibleBridge(unsafe.Pointer(C.QAccessibleBridgePlugin_Create(this.h, key_ms))) } func QAccessibleBridgePlugin_Tr2(s string, c string) string { @@ -138,9 +139,9 @@ func QAccessibleBridgePlugin_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAccessibleBridgePlugin_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAccessibleBridgePlugin_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -149,9 +150,9 @@ func QAccessibleBridgePlugin_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAccessibleBridgePlugin_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAccessibleBridgePlugin_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -160,9 +161,9 @@ func QAccessibleBridgePlugin_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAccessibleBridgePlugin_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAccessibleBridgePlugin_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -171,9 +172,9 @@ func QAccessibleBridgePlugin_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAccessibleBridgePlugin_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAccessibleBridgePlugin_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qaccessiblebridge.h b/qt/gen_qaccessiblebridge.h index 34612e0a..3ab461a0 100644 --- a/qt/gen_qaccessiblebridge.h +++ b/qt/gen_qaccessiblebridge.h @@ -34,13 +34,13 @@ void QAccessibleBridge_Delete(QAccessibleBridge* self); QMetaObject* QAccessibleBridgePlugin_MetaObject(const QAccessibleBridgePlugin* self); void* QAccessibleBridgePlugin_Metacast(QAccessibleBridgePlugin* self, const char* param1); -struct miqt_string* QAccessibleBridgePlugin_Tr(const char* s); -struct miqt_string* QAccessibleBridgePlugin_TrUtf8(const char* s); -QAccessibleBridge* QAccessibleBridgePlugin_Create(QAccessibleBridgePlugin* self, struct miqt_string* key); -struct miqt_string* QAccessibleBridgePlugin_Tr2(const char* s, const char* c); -struct miqt_string* QAccessibleBridgePlugin_Tr3(const char* s, const char* c, int n); -struct miqt_string* QAccessibleBridgePlugin_TrUtf82(const char* s, const char* c); -struct miqt_string* QAccessibleBridgePlugin_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QAccessibleBridgePlugin_Tr(const char* s); +struct miqt_string QAccessibleBridgePlugin_TrUtf8(const char* s); +QAccessibleBridge* QAccessibleBridgePlugin_Create(QAccessibleBridgePlugin* self, struct miqt_string key); +struct miqt_string QAccessibleBridgePlugin_Tr2(const char* s, const char* c); +struct miqt_string QAccessibleBridgePlugin_Tr3(const char* s, const char* c, int n); +struct miqt_string QAccessibleBridgePlugin_TrUtf82(const char* s, const char* c); +struct miqt_string QAccessibleBridgePlugin_TrUtf83(const char* s, const char* c, int n); void QAccessibleBridgePlugin_Delete(QAccessibleBridgePlugin* self); #ifdef __cplusplus diff --git a/qt/gen_qaccessibleobject.cpp b/qt/gen_qaccessibleobject.cpp index d2c52354..4b2abecf 100644 --- a/qt/gen_qaccessibleobject.cpp +++ b/qt/gen_qaccessibleobject.cpp @@ -24,8 +24,8 @@ QRect* QAccessibleObject_Rect(const QAccessibleObject* self) { return new QRect(self->rect()); } -void QAccessibleObject_SetText(QAccessibleObject* self, int t, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QAccessibleObject_SetText(QAccessibleObject* self, int t, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->setText(static_cast(t), text_QString); } @@ -61,11 +61,15 @@ QAccessibleInterface* QAccessibleApplication_Child(const QAccessibleApplication* return self->child(static_cast(index)); } -struct miqt_string* QAccessibleApplication_Text(const QAccessibleApplication* self, int t) { +struct miqt_string QAccessibleApplication_Text(const QAccessibleApplication* self, int t) { QString _ret = self->text(static_cast(t)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QAccessibleApplication_Role(const QAccessibleApplication* self) { diff --git a/qt/gen_qaccessibleobject.go b/qt/gen_qaccessibleobject.go index 6419f06b..7ade45a8 100644 --- a/qt/gen_qaccessibleobject.go +++ b/qt/gen_qaccessibleobject.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -60,9 +59,11 @@ func (this *QAccessibleObject) Rect() *QRect { } func (this *QAccessibleObject) SetText(t QAccessible__Text, text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QAccessibleObject_SetText(this.h, (C.int)(t), (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QAccessibleObject_SetText(this.h, (C.int)(t), text_ms) } func (this *QAccessibleObject) ChildAt(x int, y int) *QAccessibleInterface { @@ -130,9 +131,9 @@ func (this *QAccessibleApplication) Child(index int) *QAccessibleInterface { } func (this *QAccessibleApplication) Text(t QAccessible__Text) string { - var _ms *C.struct_miqt_string = C.QAccessibleApplication_Text(this.h, (C.int)(t)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAccessibleApplication_Text(this.h, (C.int)(t)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qaccessibleobject.h b/qt/gen_qaccessibleobject.h index 0fbb5188..aa2bfa4d 100644 --- a/qt/gen_qaccessibleobject.h +++ b/qt/gen_qaccessibleobject.h @@ -38,7 +38,7 @@ typedef struct QWindow QWindow; bool QAccessibleObject_IsValid(const QAccessibleObject* self); QObject* QAccessibleObject_Object(const QAccessibleObject* self); QRect* QAccessibleObject_Rect(const QAccessibleObject* self); -void QAccessibleObject_SetText(QAccessibleObject* self, int t, struct miqt_string* text); +void QAccessibleObject_SetText(QAccessibleObject* self, int t, struct miqt_string text); QAccessibleInterface* QAccessibleObject_ChildAt(const QAccessibleObject* self, int x, int y); QAccessibleApplication* QAccessibleApplication_new(); @@ -48,7 +48,7 @@ int QAccessibleApplication_IndexOfChild(const QAccessibleApplication* self, QAcc QAccessibleInterface* QAccessibleApplication_FocusChild(const QAccessibleApplication* self); QAccessibleInterface* QAccessibleApplication_Parent(const QAccessibleApplication* self); QAccessibleInterface* QAccessibleApplication_Child(const QAccessibleApplication* self, int index); -struct miqt_string* QAccessibleApplication_Text(const QAccessibleApplication* self, int t); +struct miqt_string QAccessibleApplication_Text(const QAccessibleApplication* self, int t); int QAccessibleApplication_Role(const QAccessibleApplication* self); QAccessible__State* QAccessibleApplication_State(const QAccessibleApplication* self); void QAccessibleApplication_Delete(QAccessibleApplication* self); diff --git a/qt/gen_qaccessibleplugin.cpp b/qt/gen_qaccessibleplugin.cpp index 4cc3b0ce..88a8005e 100644 --- a/qt/gen_qaccessibleplugin.cpp +++ b/qt/gen_qaccessibleplugin.cpp @@ -17,51 +17,75 @@ void* QAccessiblePlugin_Metacast(QAccessiblePlugin* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QAccessiblePlugin_Tr(const char* s) { +struct miqt_string QAccessiblePlugin_Tr(const char* s) { QString _ret = QAccessiblePlugin::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAccessiblePlugin_TrUtf8(const char* s) { +struct miqt_string QAccessiblePlugin_TrUtf8(const char* s) { QString _ret = QAccessiblePlugin::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -QAccessibleInterface* QAccessiblePlugin_Create(QAccessiblePlugin* self, struct miqt_string* key, QObject* object) { - QString key_QString = QString::fromUtf8(&key->data, key->len); +QAccessibleInterface* QAccessiblePlugin_Create(QAccessiblePlugin* self, struct miqt_string key, QObject* object) { + QString key_QString = QString::fromUtf8(key.data, key.len); return self->create(key_QString, object); } -struct miqt_string* QAccessiblePlugin_Tr2(const char* s, const char* c) { +struct miqt_string QAccessiblePlugin_Tr2(const char* s, const char* c) { QString _ret = QAccessiblePlugin::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAccessiblePlugin_Tr3(const char* s, const char* c, int n) { +struct miqt_string QAccessiblePlugin_Tr3(const char* s, const char* c, int n) { QString _ret = QAccessiblePlugin::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAccessiblePlugin_TrUtf82(const char* s, const char* c) { +struct miqt_string QAccessiblePlugin_TrUtf82(const char* s, const char* c) { QString _ret = QAccessiblePlugin::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAccessiblePlugin_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QAccessiblePlugin_TrUtf83(const char* s, const char* c, int n) { QString _ret = QAccessiblePlugin::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QAccessiblePlugin_Delete(QAccessiblePlugin* self) { diff --git a/qt/gen_qaccessibleplugin.go b/qt/gen_qaccessibleplugin.go index a1d161e5..6868efa1 100644 --- a/qt/gen_qaccessibleplugin.go +++ b/qt/gen_qaccessibleplugin.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -51,31 +50,33 @@ func (this *QAccessiblePlugin) MetaObject() *QMetaObject { func (this *QAccessiblePlugin) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QAccessiblePlugin_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QAccessiblePlugin_Metacast(this.h, param1_Cstring)) } func QAccessiblePlugin_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QAccessiblePlugin_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAccessiblePlugin_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QAccessiblePlugin_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QAccessiblePlugin_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAccessiblePlugin_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QAccessiblePlugin) Create(key string, object *QObject) *QAccessibleInterface { - key_ms := libmiqt.Strdupg(key) - defer C.free(key_ms) - return UnsafeNewQAccessibleInterface(unsafe.Pointer(C.QAccessiblePlugin_Create(this.h, (*C.struct_miqt_string)(key_ms), object.cPointer()))) + key_ms := C.struct_miqt_string{} + key_ms.data = C.CString(key) + key_ms.len = C.size_t(len(key)) + defer C.free(unsafe.Pointer(key_ms.data)) + return UnsafeNewQAccessibleInterface(unsafe.Pointer(C.QAccessiblePlugin_Create(this.h, key_ms, object.cPointer()))) } func QAccessiblePlugin_Tr2(s string, c string) string { @@ -83,9 +84,9 @@ func QAccessiblePlugin_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAccessiblePlugin_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAccessiblePlugin_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -94,9 +95,9 @@ func QAccessiblePlugin_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAccessiblePlugin_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAccessiblePlugin_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -105,9 +106,9 @@ func QAccessiblePlugin_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAccessiblePlugin_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAccessiblePlugin_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -116,9 +117,9 @@ func QAccessiblePlugin_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAccessiblePlugin_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAccessiblePlugin_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qaccessibleplugin.h b/qt/gen_qaccessibleplugin.h index 02492afc..36644950 100644 --- a/qt/gen_qaccessibleplugin.h +++ b/qt/gen_qaccessibleplugin.h @@ -27,13 +27,13 @@ typedef struct QObject QObject; QMetaObject* QAccessiblePlugin_MetaObject(const QAccessiblePlugin* self); void* QAccessiblePlugin_Metacast(QAccessiblePlugin* self, const char* param1); -struct miqt_string* QAccessiblePlugin_Tr(const char* s); -struct miqt_string* QAccessiblePlugin_TrUtf8(const char* s); -QAccessibleInterface* QAccessiblePlugin_Create(QAccessiblePlugin* self, struct miqt_string* key, QObject* object); -struct miqt_string* QAccessiblePlugin_Tr2(const char* s, const char* c); -struct miqt_string* QAccessiblePlugin_Tr3(const char* s, const char* c, int n); -struct miqt_string* QAccessiblePlugin_TrUtf82(const char* s, const char* c); -struct miqt_string* QAccessiblePlugin_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QAccessiblePlugin_Tr(const char* s); +struct miqt_string QAccessiblePlugin_TrUtf8(const char* s); +QAccessibleInterface* QAccessiblePlugin_Create(QAccessiblePlugin* self, struct miqt_string key, QObject* object); +struct miqt_string QAccessiblePlugin_Tr2(const char* s, const char* c); +struct miqt_string QAccessiblePlugin_Tr3(const char* s, const char* c, int n); +struct miqt_string QAccessiblePlugin_TrUtf82(const char* s, const char* c); +struct miqt_string QAccessiblePlugin_TrUtf83(const char* s, const char* c, int n); void QAccessiblePlugin_Delete(QAccessiblePlugin* self); #ifdef __cplusplus diff --git a/qt/gen_qaccessiblewidget.cpp b/qt/gen_qaccessiblewidget.cpp index 01b88d59..6f24396b 100644 --- a/qt/gen_qaccessiblewidget.cpp +++ b/qt/gen_qaccessiblewidget.cpp @@ -21,8 +21,8 @@ QAccessibleWidget* QAccessibleWidget_new2(QWidget* o, int r) { return new QAccessibleWidget(o, static_cast(r)); } -QAccessibleWidget* QAccessibleWidget_new3(QWidget* o, int r, struct miqt_string* name) { - QString name_QString = QString::fromUtf8(&name->data, name->len); +QAccessibleWidget* QAccessibleWidget_new3(QWidget* o, int r, struct miqt_string name) { + QString name_QString = QString::fromUtf8(name.data, name.len); return new QAccessibleWidget(o, static_cast(r), name_QString); } @@ -58,11 +58,15 @@ QAccessibleInterface* QAccessibleWidget_Child(const QAccessibleWidget* self, int return self->child(static_cast(index)); } -struct miqt_string* QAccessibleWidget_Text(const QAccessibleWidget* self, int t) { +struct miqt_string QAccessibleWidget_Text(const QAccessibleWidget* self, int t) { QString _ret = self->text(static_cast(t)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QAccessibleWidget_Role(const QAccessibleWidget* self) { @@ -89,12 +93,16 @@ void* QAccessibleWidget_InterfaceCast(QAccessibleWidget* self, int t) { struct miqt_array* QAccessibleWidget_ActionNames(const QAccessibleWidget* self) { QStringList _ret = self->actionNames(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -102,21 +110,25 @@ struct miqt_array* QAccessibleWidget_ActionNames(const QAccessibleWidget* self) return _out; } -void QAccessibleWidget_DoAction(QAccessibleWidget* self, struct miqt_string* actionName) { - QString actionName_QString = QString::fromUtf8(&actionName->data, actionName->len); +void QAccessibleWidget_DoAction(QAccessibleWidget* self, struct miqt_string actionName) { + QString actionName_QString = QString::fromUtf8(actionName.data, actionName.len); self->doAction(actionName_QString); } -struct miqt_array* QAccessibleWidget_KeyBindingsForAction(const QAccessibleWidget* self, struct miqt_string* actionName) { - QString actionName_QString = QString::fromUtf8(&actionName->data, actionName->len); +struct miqt_array* QAccessibleWidget_KeyBindingsForAction(const QAccessibleWidget* self, struct miqt_string actionName) { + QString actionName_QString = QString::fromUtf8(actionName.data, actionName.len); QStringList _ret = self->keyBindingsForAction(actionName_QString); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); diff --git a/qt/gen_qaccessiblewidget.go b/qt/gen_qaccessiblewidget.go index c0294574..138e1301 100644 --- a/qt/gen_qaccessiblewidget.go +++ b/qt/gen_qaccessiblewidget.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "unsafe" ) @@ -58,9 +57,11 @@ func NewQAccessibleWidget2(o *QWidget, r QAccessible__Role) *QAccessibleWidget { // NewQAccessibleWidget3 constructs a new QAccessibleWidget object. func NewQAccessibleWidget3(o *QWidget, r QAccessible__Role, name string) *QAccessibleWidget { - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - ret := C.QAccessibleWidget_new3(o.cPointer(), (C.int)(r), (*C.struct_miqt_string)(name_ms)) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + ret := C.QAccessibleWidget_new3(o.cPointer(), (C.int)(r), name_ms) return newQAccessibleWidget(ret) } @@ -100,9 +101,9 @@ func (this *QAccessibleWidget) Child(index int) *QAccessibleInterface { } func (this *QAccessibleWidget) Text(t QAccessible__Text) string { - var _ms *C.struct_miqt_string = C.QAccessibleWidget_Text(this.h, (C.int)(t)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAccessibleWidget_Text(this.h, (C.int)(t)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -132,17 +133,17 @@ func (this *QAccessibleWidget) BackgroundColor() *QColor { } func (this *QAccessibleWidget) InterfaceCast(t QAccessible__InterfaceType) unsafe.Pointer { - return C.QAccessibleWidget_InterfaceCast(this.h, (C.int)(t)) + return (unsafe.Pointer)(C.QAccessibleWidget_InterfaceCast(this.h, (C.int)(t))) } func (this *QAccessibleWidget) ActionNames() []string { var _ma *C.struct_miqt_array = C.QAccessibleWidget_ActionNames(this.h) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -150,21 +151,25 @@ func (this *QAccessibleWidget) ActionNames() []string { } func (this *QAccessibleWidget) DoAction(actionName string) { - actionName_ms := libmiqt.Strdupg(actionName) - defer C.free(actionName_ms) - C.QAccessibleWidget_DoAction(this.h, (*C.struct_miqt_string)(actionName_ms)) + actionName_ms := C.struct_miqt_string{} + actionName_ms.data = C.CString(actionName) + actionName_ms.len = C.size_t(len(actionName)) + defer C.free(unsafe.Pointer(actionName_ms.data)) + C.QAccessibleWidget_DoAction(this.h, actionName_ms) } func (this *QAccessibleWidget) KeyBindingsForAction(actionName string) []string { - actionName_ms := libmiqt.Strdupg(actionName) - defer C.free(actionName_ms) - var _ma *C.struct_miqt_array = C.QAccessibleWidget_KeyBindingsForAction(this.h, (*C.struct_miqt_string)(actionName_ms)) + actionName_ms := C.struct_miqt_string{} + actionName_ms.data = C.CString(actionName) + actionName_ms.len = C.size_t(len(actionName)) + defer C.free(unsafe.Pointer(actionName_ms.data)) + var _ma *C.struct_miqt_array = C.QAccessibleWidget_KeyBindingsForAction(this.h, actionName_ms) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) diff --git a/qt/gen_qaccessiblewidget.h b/qt/gen_qaccessiblewidget.h index c0c319b4..bb1fbc73 100644 --- a/qt/gen_qaccessiblewidget.h +++ b/qt/gen_qaccessiblewidget.h @@ -37,7 +37,7 @@ typedef struct QWindow QWindow; QAccessibleWidget* QAccessibleWidget_new(QWidget* o); QAccessibleWidget* QAccessibleWidget_new2(QWidget* o, int r); -QAccessibleWidget* QAccessibleWidget_new3(QWidget* o, int r, struct miqt_string* name); +QAccessibleWidget* QAccessibleWidget_new3(QWidget* o, int r, struct miqt_string name); bool QAccessibleWidget_IsValid(const QAccessibleWidget* self); QWindow* QAccessibleWidget_Window(const QAccessibleWidget* self); int QAccessibleWidget_ChildCount(const QAccessibleWidget* self); @@ -46,15 +46,15 @@ QAccessibleInterface* QAccessibleWidget_FocusChild(const QAccessibleWidget* self QRect* QAccessibleWidget_Rect(const QAccessibleWidget* self); QAccessibleInterface* QAccessibleWidget_Parent(const QAccessibleWidget* self); QAccessibleInterface* QAccessibleWidget_Child(const QAccessibleWidget* self, int index); -struct miqt_string* QAccessibleWidget_Text(const QAccessibleWidget* self, int t); +struct miqt_string QAccessibleWidget_Text(const QAccessibleWidget* self, int t); int QAccessibleWidget_Role(const QAccessibleWidget* self); QAccessible__State* QAccessibleWidget_State(const QAccessibleWidget* self); QColor* QAccessibleWidget_ForegroundColor(const QAccessibleWidget* self); QColor* QAccessibleWidget_BackgroundColor(const QAccessibleWidget* self); void* QAccessibleWidget_InterfaceCast(QAccessibleWidget* self, int t); struct miqt_array* QAccessibleWidget_ActionNames(const QAccessibleWidget* self); -void QAccessibleWidget_DoAction(QAccessibleWidget* self, struct miqt_string* actionName); -struct miqt_array* QAccessibleWidget_KeyBindingsForAction(const QAccessibleWidget* self, struct miqt_string* actionName); +void QAccessibleWidget_DoAction(QAccessibleWidget* self, struct miqt_string actionName); +struct miqt_array* QAccessibleWidget_KeyBindingsForAction(const QAccessibleWidget* self, struct miqt_string actionName); #ifdef __cplusplus } /* extern C */ diff --git a/qt/gen_qaction.cpp b/qt/gen_qaction.cpp index 1d17a0c5..1675d8c2 100644 --- a/qt/gen_qaction.cpp +++ b/qt/gen_qaction.cpp @@ -21,13 +21,13 @@ QAction* QAction_new() { return new QAction(); } -QAction* QAction_new2(struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QAction* QAction_new2(struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QAction(text_QString); } -QAction* QAction_new3(QIcon* icon, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QAction* QAction_new3(QIcon* icon, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QAction(*icon, text_QString); } @@ -35,13 +35,13 @@ QAction* QAction_new4(QObject* parent) { return new QAction(parent); } -QAction* QAction_new5(struct miqt_string* text, QObject* parent) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QAction* QAction_new5(struct miqt_string text, QObject* parent) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QAction(text_QString, parent); } -QAction* QAction_new6(QIcon* icon, struct miqt_string* text, QObject* parent) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QAction* QAction_new6(QIcon* icon, struct miqt_string text, QObject* parent) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QAction(*icon, text_QString, parent); } @@ -53,18 +53,26 @@ void* QAction_Metacast(QAction* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QAction_Tr(const char* s) { +struct miqt_string QAction_Tr(const char* s) { QString _ret = QAction::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAction_TrUtf8(const char* s) { +struct miqt_string QAction_TrUtf8(const char* s) { QString _ret = QAction::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QAction_SetActionGroup(QAction* self, QActionGroup* group) { @@ -83,64 +91,84 @@ QIcon* QAction_Icon(const QAction* self) { return new QIcon(self->icon()); } -void QAction_SetText(QAction* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QAction_SetText(QAction* self, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->setText(text_QString); } -struct miqt_string* QAction_Text(const QAction* self) { +struct miqt_string QAction_Text(const QAction* self) { QString _ret = self->text(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QAction_SetIconText(QAction* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QAction_SetIconText(QAction* self, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->setIconText(text_QString); } -struct miqt_string* QAction_IconText(const QAction* self) { +struct miqt_string QAction_IconText(const QAction* self) { QString _ret = self->iconText(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QAction_SetToolTip(QAction* self, struct miqt_string* tip) { - QString tip_QString = QString::fromUtf8(&tip->data, tip->len); +void QAction_SetToolTip(QAction* self, struct miqt_string tip) { + QString tip_QString = QString::fromUtf8(tip.data, tip.len); self->setToolTip(tip_QString); } -struct miqt_string* QAction_ToolTip(const QAction* self) { +struct miqt_string QAction_ToolTip(const QAction* self) { QString _ret = self->toolTip(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QAction_SetStatusTip(QAction* self, struct miqt_string* statusTip) { - QString statusTip_QString = QString::fromUtf8(&statusTip->data, statusTip->len); +void QAction_SetStatusTip(QAction* self, struct miqt_string statusTip) { + QString statusTip_QString = QString::fromUtf8(statusTip.data, statusTip.len); self->setStatusTip(statusTip_QString); } -struct miqt_string* QAction_StatusTip(const QAction* self) { +struct miqt_string QAction_StatusTip(const QAction* self) { QString _ret = self->statusTip(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QAction_SetWhatsThis(QAction* self, struct miqt_string* what) { - QString what_QString = QString::fromUtf8(&what->data, what->len); +void QAction_SetWhatsThis(QAction* self, struct miqt_string what) { + QString what_QString = QString::fromUtf8(what.data, what.len); self->setWhatsThis(what_QString); } -struct miqt_string* QAction_WhatsThis(const QAction* self) { +struct miqt_string QAction_WhatsThis(const QAction* self) { QString _ret = self->whatsThis(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QAction_SetPriority(QAction* self, int priority) { @@ -388,32 +416,48 @@ void QAction_connect_Toggled(QAction* self, intptr_t slot) { }); } -struct miqt_string* QAction_Tr2(const char* s, const char* c) { +struct miqt_string QAction_Tr2(const char* s, const char* c) { QString _ret = QAction::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAction_Tr3(const char* s, const char* c, int n) { +struct miqt_string QAction_Tr3(const char* s, const char* c, int n) { QString _ret = QAction::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAction_TrUtf82(const char* s, const char* c) { +struct miqt_string QAction_TrUtf82(const char* s, const char* c) { QString _ret = QAction::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAction_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QAction_TrUtf83(const char* s, const char* c, int n) { QString _ret = QAction::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } bool QAction_ShowStatusText1(QAction* self, QWidget* widget) { diff --git a/qt/gen_qaction.go b/qt/gen_qaction.go index 0488305d..9bc430d5 100644 --- a/qt/gen_qaction.go +++ b/qt/gen_qaction.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "runtime/cgo" "unsafe" @@ -80,17 +79,21 @@ func NewQAction() *QAction { // NewQAction2 constructs a new QAction object. func NewQAction2(text string) *QAction { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - ret := C.QAction_new2((*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + ret := C.QAction_new2(text_ms) return newQAction(ret) } // NewQAction3 constructs a new QAction object. func NewQAction3(icon *QIcon, text string) *QAction { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - ret := C.QAction_new3(icon.cPointer(), (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + ret := C.QAction_new3(icon.cPointer(), text_ms) return newQAction(ret) } @@ -102,17 +105,21 @@ func NewQAction4(parent *QObject) *QAction { // NewQAction5 constructs a new QAction object. func NewQAction5(text string, parent *QObject) *QAction { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - ret := C.QAction_new5((*C.struct_miqt_string)(text_ms), parent.cPointer()) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + ret := C.QAction_new5(text_ms, parent.cPointer()) return newQAction(ret) } // NewQAction6 constructs a new QAction object. func NewQAction6(icon *QIcon, text string, parent *QObject) *QAction { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - ret := C.QAction_new6(icon.cPointer(), (*C.struct_miqt_string)(text_ms), parent.cPointer()) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + ret := C.QAction_new6(icon.cPointer(), text_ms, parent.cPointer()) return newQAction(ret) } @@ -123,24 +130,24 @@ func (this *QAction) MetaObject() *QMetaObject { func (this *QAction) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QAction_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QAction_Metacast(this.h, param1_Cstring)) } func QAction_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QAction_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAction_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QAction_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QAction_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAction_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -164,67 +171,77 @@ func (this *QAction) Icon() *QIcon { } func (this *QAction) SetText(text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QAction_SetText(this.h, (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QAction_SetText(this.h, text_ms) } func (this *QAction) Text() string { - var _ms *C.struct_miqt_string = C.QAction_Text(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAction_Text(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QAction) SetIconText(text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QAction_SetIconText(this.h, (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QAction_SetIconText(this.h, text_ms) } func (this *QAction) IconText() string { - var _ms *C.struct_miqt_string = C.QAction_IconText(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAction_IconText(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QAction) SetToolTip(tip string) { - tip_ms := libmiqt.Strdupg(tip) - defer C.free(tip_ms) - C.QAction_SetToolTip(this.h, (*C.struct_miqt_string)(tip_ms)) + tip_ms := C.struct_miqt_string{} + tip_ms.data = C.CString(tip) + tip_ms.len = C.size_t(len(tip)) + defer C.free(unsafe.Pointer(tip_ms.data)) + C.QAction_SetToolTip(this.h, tip_ms) } func (this *QAction) ToolTip() string { - var _ms *C.struct_miqt_string = C.QAction_ToolTip(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAction_ToolTip(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QAction) SetStatusTip(statusTip string) { - statusTip_ms := libmiqt.Strdupg(statusTip) - defer C.free(statusTip_ms) - C.QAction_SetStatusTip(this.h, (*C.struct_miqt_string)(statusTip_ms)) + statusTip_ms := C.struct_miqt_string{} + statusTip_ms.data = C.CString(statusTip) + statusTip_ms.len = C.size_t(len(statusTip)) + defer C.free(unsafe.Pointer(statusTip_ms.data)) + C.QAction_SetStatusTip(this.h, statusTip_ms) } func (this *QAction) StatusTip() string { - var _ms *C.struct_miqt_string = C.QAction_StatusTip(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAction_StatusTip(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QAction) SetWhatsThis(what string) { - what_ms := libmiqt.Strdupg(what) - defer C.free(what_ms) - C.QAction_SetWhatsThis(this.h, (*C.struct_miqt_string)(what_ms)) + what_ms := C.struct_miqt_string{} + what_ms.data = C.CString(what) + what_ms.len = C.size_t(len(what)) + defer C.free(unsafe.Pointer(what_ms.data)) + C.QAction_SetWhatsThis(this.h, what_ms) } func (this *QAction) WhatsThis() string { - var _ms *C.struct_miqt_string = C.QAction_WhatsThis(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAction_WhatsThis(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -513,9 +530,9 @@ func QAction_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAction_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAction_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -524,9 +541,9 @@ func QAction_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAction_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAction_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -535,9 +552,9 @@ func QAction_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAction_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAction_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -546,9 +563,9 @@ func QAction_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAction_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAction_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qaction.h b/qt/gen_qaction.h index fea982ae..cc451e35 100644 --- a/qt/gen_qaction.h +++ b/qt/gen_qaction.h @@ -40,29 +40,29 @@ typedef struct QWidget QWidget; #endif QAction* QAction_new(); -QAction* QAction_new2(struct miqt_string* text); -QAction* QAction_new3(QIcon* icon, struct miqt_string* text); +QAction* QAction_new2(struct miqt_string text); +QAction* QAction_new3(QIcon* icon, struct miqt_string text); QAction* QAction_new4(QObject* parent); -QAction* QAction_new5(struct miqt_string* text, QObject* parent); -QAction* QAction_new6(QIcon* icon, struct miqt_string* text, QObject* parent); +QAction* QAction_new5(struct miqt_string text, QObject* parent); +QAction* QAction_new6(QIcon* icon, struct miqt_string text, QObject* parent); QMetaObject* QAction_MetaObject(const QAction* self); void* QAction_Metacast(QAction* self, const char* param1); -struct miqt_string* QAction_Tr(const char* s); -struct miqt_string* QAction_TrUtf8(const char* s); +struct miqt_string QAction_Tr(const char* s); +struct miqt_string QAction_TrUtf8(const char* s); void QAction_SetActionGroup(QAction* self, QActionGroup* group); QActionGroup* QAction_ActionGroup(const QAction* self); void QAction_SetIcon(QAction* self, QIcon* icon); QIcon* QAction_Icon(const QAction* self); -void QAction_SetText(QAction* self, struct miqt_string* text); -struct miqt_string* QAction_Text(const QAction* self); -void QAction_SetIconText(QAction* self, struct miqt_string* text); -struct miqt_string* QAction_IconText(const QAction* self); -void QAction_SetToolTip(QAction* self, struct miqt_string* tip); -struct miqt_string* QAction_ToolTip(const QAction* self); -void QAction_SetStatusTip(QAction* self, struct miqt_string* statusTip); -struct miqt_string* QAction_StatusTip(const QAction* self); -void QAction_SetWhatsThis(QAction* self, struct miqt_string* what); -struct miqt_string* QAction_WhatsThis(const QAction* self); +void QAction_SetText(QAction* self, struct miqt_string text); +struct miqt_string QAction_Text(const QAction* self); +void QAction_SetIconText(QAction* self, struct miqt_string text); +struct miqt_string QAction_IconText(const QAction* self); +void QAction_SetToolTip(QAction* self, struct miqt_string tip); +struct miqt_string QAction_ToolTip(const QAction* self); +void QAction_SetStatusTip(QAction* self, struct miqt_string statusTip); +struct miqt_string QAction_StatusTip(const QAction* self); +void QAction_SetWhatsThis(QAction* self, struct miqt_string what); +struct miqt_string QAction_WhatsThis(const QAction* self); void QAction_SetPriority(QAction* self, int priority); int QAction_Priority(const QAction* self); QMenu* QAction_Menu(const QAction* self); @@ -113,10 +113,10 @@ void QAction_Hovered(QAction* self); void QAction_connect_Hovered(QAction* self, intptr_t slot); void QAction_Toggled(QAction* self, bool param1); void QAction_connect_Toggled(QAction* self, intptr_t slot); -struct miqt_string* QAction_Tr2(const char* s, const char* c); -struct miqt_string* QAction_Tr3(const char* s, const char* c, int n); -struct miqt_string* QAction_TrUtf82(const char* s, const char* c); -struct miqt_string* QAction_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QAction_Tr2(const char* s, const char* c); +struct miqt_string QAction_Tr3(const char* s, const char* c, int n); +struct miqt_string QAction_TrUtf82(const char* s, const char* c); +struct miqt_string QAction_TrUtf83(const char* s, const char* c, int n); bool QAction_ShowStatusText1(QAction* self, QWidget* widget); void QAction_Triggered1(QAction* self, bool checked); void QAction_connect_Triggered1(QAction* self, intptr_t slot); diff --git a/qt/gen_qactiongroup.cpp b/qt/gen_qactiongroup.cpp index 9a9cf676..abcd5485 100644 --- a/qt/gen_qactiongroup.cpp +++ b/qt/gen_qactiongroup.cpp @@ -23,31 +23,39 @@ void* QActionGroup_Metacast(QActionGroup* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QActionGroup_Tr(const char* s) { +struct miqt_string QActionGroup_Tr(const char* s) { QString _ret = QActionGroup::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QActionGroup_TrUtf8(const char* s) { +struct miqt_string QActionGroup_TrUtf8(const char* s) { QString _ret = QActionGroup::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QAction* QActionGroup_AddAction(QActionGroup* self, QAction* a) { return self->addAction(a); } -QAction* QActionGroup_AddActionWithText(QActionGroup* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QAction* QActionGroup_AddActionWithText(QActionGroup* self, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); return self->addAction(text_QString); } -QAction* QActionGroup_AddAction2(QActionGroup* self, QIcon* icon, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QAction* QActionGroup_AddAction2(QActionGroup* self, QIcon* icon, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); return self->addAction(*icon, text_QString); } @@ -131,32 +139,48 @@ void QActionGroup_connect_Hovered(QActionGroup* self, intptr_t slot) { }); } -struct miqt_string* QActionGroup_Tr2(const char* s, const char* c) { +struct miqt_string QActionGroup_Tr2(const char* s, const char* c) { QString _ret = QActionGroup::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QActionGroup_Tr3(const char* s, const char* c, int n) { +struct miqt_string QActionGroup_Tr3(const char* s, const char* c, int n) { QString _ret = QActionGroup::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QActionGroup_TrUtf82(const char* s, const char* c) { +struct miqt_string QActionGroup_TrUtf82(const char* s, const char* c) { QString _ret = QActionGroup::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QActionGroup_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QActionGroup_TrUtf83(const char* s, const char* c, int n) { QString _ret = QActionGroup::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QActionGroup_Delete(QActionGroup* self) { diff --git a/qt/gen_qactiongroup.go b/qt/gen_qactiongroup.go index 1781ee09..3321aa54 100644 --- a/qt/gen_qactiongroup.go +++ b/qt/gen_qactiongroup.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "runtime/cgo" "unsafe" @@ -66,24 +65,24 @@ func (this *QActionGroup) MetaObject() *QMetaObject { func (this *QActionGroup) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QActionGroup_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QActionGroup_Metacast(this.h, param1_Cstring)) } func QActionGroup_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QActionGroup_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QActionGroup_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QActionGroup_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QActionGroup_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QActionGroup_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -92,15 +91,19 @@ func (this *QActionGroup) AddAction(a *QAction) *QAction { } func (this *QActionGroup) AddActionWithText(text string) *QAction { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - return UnsafeNewQAction(unsafe.Pointer(C.QActionGroup_AddActionWithText(this.h, (*C.struct_miqt_string)(text_ms)))) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + return UnsafeNewQAction(unsafe.Pointer(C.QActionGroup_AddActionWithText(this.h, text_ms))) } func (this *QActionGroup) AddAction2(icon *QIcon, text string) *QAction { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - return UnsafeNewQAction(unsafe.Pointer(C.QActionGroup_AddAction2(this.h, icon.cPointer(), (*C.struct_miqt_string)(text_ms)))) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + return UnsafeNewQAction(unsafe.Pointer(C.QActionGroup_AddAction2(this.h, icon.cPointer(), text_ms))) } func (this *QActionGroup) RemoveAction(a *QAction) { @@ -203,9 +206,9 @@ func QActionGroup_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QActionGroup_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QActionGroup_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -214,9 +217,9 @@ func QActionGroup_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QActionGroup_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QActionGroup_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -225,9 +228,9 @@ func QActionGroup_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QActionGroup_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QActionGroup_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -236,9 +239,9 @@ func QActionGroup_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QActionGroup_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QActionGroup_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qactiongroup.h b/qt/gen_qactiongroup.h index 1ac273db..12740220 100644 --- a/qt/gen_qactiongroup.h +++ b/qt/gen_qactiongroup.h @@ -30,11 +30,11 @@ typedef struct QObject QObject; QActionGroup* QActionGroup_new(QObject* parent); QMetaObject* QActionGroup_MetaObject(const QActionGroup* self); void* QActionGroup_Metacast(QActionGroup* self, const char* param1); -struct miqt_string* QActionGroup_Tr(const char* s); -struct miqt_string* QActionGroup_TrUtf8(const char* s); +struct miqt_string QActionGroup_Tr(const char* s); +struct miqt_string QActionGroup_TrUtf8(const char* s); QAction* QActionGroup_AddAction(QActionGroup* self, QAction* a); -QAction* QActionGroup_AddActionWithText(QActionGroup* self, struct miqt_string* text); -QAction* QActionGroup_AddAction2(QActionGroup* self, QIcon* icon, struct miqt_string* text); +QAction* QActionGroup_AddActionWithText(QActionGroup* self, struct miqt_string text); +QAction* QActionGroup_AddAction2(QActionGroup* self, QIcon* icon, struct miqt_string text); void QActionGroup_RemoveAction(QActionGroup* self, QAction* a); struct miqt_array* QActionGroup_Actions(const QActionGroup* self); QAction* QActionGroup_CheckedAction(const QActionGroup* self); @@ -51,10 +51,10 @@ void QActionGroup_Triggered(QActionGroup* self, QAction* param1); void QActionGroup_connect_Triggered(QActionGroup* self, intptr_t slot); void QActionGroup_Hovered(QActionGroup* self, QAction* param1); void QActionGroup_connect_Hovered(QActionGroup* self, intptr_t slot); -struct miqt_string* QActionGroup_Tr2(const char* s, const char* c); -struct miqt_string* QActionGroup_Tr3(const char* s, const char* c, int n); -struct miqt_string* QActionGroup_TrUtf82(const char* s, const char* c); -struct miqt_string* QActionGroup_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QActionGroup_Tr2(const char* s, const char* c); +struct miqt_string QActionGroup_Tr3(const char* s, const char* c, int n); +struct miqt_string QActionGroup_TrUtf82(const char* s, const char* c); +struct miqt_string QActionGroup_TrUtf83(const char* s, const char* c, int n); void QActionGroup_Delete(QActionGroup* self); #ifdef __cplusplus diff --git a/qt/gen_qanimationgroup.cpp b/qt/gen_qanimationgroup.cpp index 912617e5..521ea12b 100644 --- a/qt/gen_qanimationgroup.cpp +++ b/qt/gen_qanimationgroup.cpp @@ -16,18 +16,26 @@ void* QAnimationGroup_Metacast(QAnimationGroup* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QAnimationGroup_Tr(const char* s) { +struct miqt_string QAnimationGroup_Tr(const char* s) { QString _ret = QAnimationGroup::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAnimationGroup_TrUtf8(const char* s) { +struct miqt_string QAnimationGroup_TrUtf8(const char* s) { QString _ret = QAnimationGroup::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QAbstractAnimation* QAnimationGroup_AnimationAt(const QAnimationGroup* self, int index) { @@ -62,32 +70,48 @@ void QAnimationGroup_Clear(QAnimationGroup* self) { self->clear(); } -struct miqt_string* QAnimationGroup_Tr2(const char* s, const char* c) { +struct miqt_string QAnimationGroup_Tr2(const char* s, const char* c) { QString _ret = QAnimationGroup::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAnimationGroup_Tr3(const char* s, const char* c, int n) { +struct miqt_string QAnimationGroup_Tr3(const char* s, const char* c, int n) { QString _ret = QAnimationGroup::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAnimationGroup_TrUtf82(const char* s, const char* c) { +struct miqt_string QAnimationGroup_TrUtf82(const char* s, const char* c) { QString _ret = QAnimationGroup::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAnimationGroup_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QAnimationGroup_TrUtf83(const char* s, const char* c, int n) { QString _ret = QAnimationGroup::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QAnimationGroup_Delete(QAnimationGroup* self) { diff --git a/qt/gen_qanimationgroup.go b/qt/gen_qanimationgroup.go index 64ff64d2..5dce7580 100644 --- a/qt/gen_qanimationgroup.go +++ b/qt/gen_qanimationgroup.go @@ -50,24 +50,24 @@ func (this *QAnimationGroup) MetaObject() *QMetaObject { func (this *QAnimationGroup) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QAnimationGroup_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QAnimationGroup_Metacast(this.h, param1_Cstring)) } func QAnimationGroup_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QAnimationGroup_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAnimationGroup_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QAnimationGroup_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QAnimationGroup_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAnimationGroup_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -108,9 +108,9 @@ func QAnimationGroup_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAnimationGroup_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAnimationGroup_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -119,9 +119,9 @@ func QAnimationGroup_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAnimationGroup_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAnimationGroup_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -130,9 +130,9 @@ func QAnimationGroup_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAnimationGroup_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAnimationGroup_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -141,9 +141,9 @@ func QAnimationGroup_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAnimationGroup_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAnimationGroup_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qanimationgroup.h b/qt/gen_qanimationgroup.h index 4da53b9e..a85e8398 100644 --- a/qt/gen_qanimationgroup.h +++ b/qt/gen_qanimationgroup.h @@ -25,8 +25,8 @@ typedef struct QMetaObject QMetaObject; QMetaObject* QAnimationGroup_MetaObject(const QAnimationGroup* self); void* QAnimationGroup_Metacast(QAnimationGroup* self, const char* param1); -struct miqt_string* QAnimationGroup_Tr(const char* s); -struct miqt_string* QAnimationGroup_TrUtf8(const char* s); +struct miqt_string QAnimationGroup_Tr(const char* s); +struct miqt_string QAnimationGroup_TrUtf8(const char* s); QAbstractAnimation* QAnimationGroup_AnimationAt(const QAnimationGroup* self, int index); int QAnimationGroup_AnimationCount(const QAnimationGroup* self); int QAnimationGroup_IndexOfAnimation(const QAnimationGroup* self, QAbstractAnimation* animation); @@ -35,10 +35,10 @@ void QAnimationGroup_InsertAnimation(QAnimationGroup* self, int index, QAbstract void QAnimationGroup_RemoveAnimation(QAnimationGroup* self, QAbstractAnimation* animation); QAbstractAnimation* QAnimationGroup_TakeAnimation(QAnimationGroup* self, int index); void QAnimationGroup_Clear(QAnimationGroup* self); -struct miqt_string* QAnimationGroup_Tr2(const char* s, const char* c); -struct miqt_string* QAnimationGroup_Tr3(const char* s, const char* c, int n); -struct miqt_string* QAnimationGroup_TrUtf82(const char* s, const char* c); -struct miqt_string* QAnimationGroup_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QAnimationGroup_Tr2(const char* s, const char* c); +struct miqt_string QAnimationGroup_Tr3(const char* s, const char* c, int n); +struct miqt_string QAnimationGroup_TrUtf82(const char* s, const char* c); +struct miqt_string QAnimationGroup_TrUtf83(const char* s, const char* c, int n); void QAnimationGroup_Delete(QAnimationGroup* self); #ifdef __cplusplus diff --git a/qt/gen_qapplication.cpp b/qt/gen_qapplication.cpp index 13a3d77e..2fdf2f62 100644 --- a/qt/gen_qapplication.cpp +++ b/qt/gen_qapplication.cpp @@ -35,18 +35,26 @@ void* QApplication_Metacast(QApplication* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QApplication_Tr(const char* s) { +struct miqt_string QApplication_Tr(const char* s) { QString _ret = QApplication::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QApplication_TrUtf8(const char* s) { +struct miqt_string QApplication_TrUtf8(const char* s) { QString _ret = QApplication::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QStyle* QApplication_Style() { @@ -57,8 +65,8 @@ void QApplication_SetStyle(QStyle* style) { QApplication::setStyle(style); } -QStyle* QApplication_SetStyleWithStyle(struct miqt_string* style) { - QString style_QString = QString::fromUtf8(&style->data, style->len); +QStyle* QApplication_SetStyleWithStyle(struct miqt_string style) { + QString style_QString = QString::fromUtf8(style.data, style.len); return QApplication::setStyle(style_QString); } @@ -268,15 +276,19 @@ void QApplication_connect_FocusChanged(QApplication* self, intptr_t slot) { }); } -struct miqt_string* QApplication_StyleSheet(const QApplication* self) { +struct miqt_string QApplication_StyleSheet(const QApplication* self) { QString _ret = self->styleSheet(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QApplication_SetStyleSheet(QApplication* self, struct miqt_string* sheet) { - QString sheet_QString = QString::fromUtf8(&sheet->data, sheet->len); +void QApplication_SetStyleSheet(QApplication* self, struct miqt_string sheet) { + QString sheet_QString = QString::fromUtf8(sheet.data, sheet.len); self->setStyleSheet(sheet_QString); } @@ -296,32 +308,48 @@ void QApplication_AboutQt() { QApplication::aboutQt(); } -struct miqt_string* QApplication_Tr2(const char* s, const char* c) { +struct miqt_string QApplication_Tr2(const char* s, const char* c) { QString _ret = QApplication::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QApplication_Tr3(const char* s, const char* c, int n) { +struct miqt_string QApplication_Tr3(const char* s, const char* c, int n) { QString _ret = QApplication::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QApplication_TrUtf82(const char* s, const char* c) { +struct miqt_string QApplication_TrUtf82(const char* s, const char* c) { QString _ret = QApplication::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QApplication_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QApplication_TrUtf83(const char* s, const char* c, int n) { QString _ret = QApplication::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QApplication_SetPalette2(QPalette* param1, const char* className) { diff --git a/qt/gen_qapplication.go b/qt/gen_qapplication.go index 4fd8d8e4..d3db4ff9 100644 --- a/qt/gen_qapplication.go +++ b/qt/gen_qapplication.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "runtime/cgo" "unsafe" @@ -86,24 +85,24 @@ func (this *QApplication) MetaObject() *QMetaObject { func (this *QApplication) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QApplication_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QApplication_Metacast(this.h, param1_Cstring)) } func QApplication_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QApplication_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QApplication_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QApplication_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QApplication_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QApplication_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -116,9 +115,11 @@ func QApplication_SetStyle(style *QStyle) { } func QApplication_SetStyleWithStyle(style string) *QStyle { - style_ms := libmiqt.Strdupg(style) - defer C.free(style_ms) - return UnsafeNewQStyle(unsafe.Pointer(C.QApplication_SetStyleWithStyle((*C.struct_miqt_string)(style_ms)))) + style_ms := C.struct_miqt_string{} + style_ms.data = C.CString(style) + style_ms.len = C.size_t(len(style)) + defer C.free(unsafe.Pointer(style_ms.data)) + return UnsafeNewQStyle(unsafe.Pointer(C.QApplication_SetStyleWithStyle(style_ms))) } func QApplication_ColorSpec() int { @@ -361,16 +362,18 @@ func miqt_exec_callback_QApplication_FocusChanged(cb C.intptr_t, old *C.QWidget, } func (this *QApplication) StyleSheet() string { - var _ms *C.struct_miqt_string = C.QApplication_StyleSheet(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QApplication_StyleSheet(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QApplication) SetStyleSheet(sheet string) { - sheet_ms := libmiqt.Strdupg(sheet) - defer C.free(sheet_ms) - C.QApplication_SetStyleSheet(this.h, (*C.struct_miqt_string)(sheet_ms)) + sheet_ms := C.struct_miqt_string{} + sheet_ms.data = C.CString(sheet) + sheet_ms.len = C.size_t(len(sheet)) + defer C.free(unsafe.Pointer(sheet_ms.data)) + C.QApplication_SetStyleSheet(this.h, sheet_ms) } func (this *QApplication) SetAutoSipEnabled(enabled bool) { @@ -394,9 +397,9 @@ func QApplication_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QApplication_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QApplication_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -405,9 +408,9 @@ func QApplication_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QApplication_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QApplication_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -416,9 +419,9 @@ func QApplication_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QApplication_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QApplication_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -427,9 +430,9 @@ func QApplication_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QApplication_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QApplication_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qapplication.h b/qt/gen_qapplication.h index 2319a481..b9bf2827 100644 --- a/qt/gen_qapplication.h +++ b/qt/gen_qapplication.h @@ -47,11 +47,11 @@ QApplication* QApplication_new(int* argc, char** argv); QApplication* QApplication_new2(int* argc, char** argv, int param3); QMetaObject* QApplication_MetaObject(const QApplication* self); void* QApplication_Metacast(QApplication* self, const char* param1); -struct miqt_string* QApplication_Tr(const char* s); -struct miqt_string* QApplication_TrUtf8(const char* s); +struct miqt_string QApplication_Tr(const char* s); +struct miqt_string QApplication_TrUtf8(const char* s); QStyle* QApplication_Style(); void QApplication_SetStyle(QStyle* style); -QStyle* QApplication_SetStyleWithStyle(struct miqt_string* style); +QStyle* QApplication_SetStyleWithStyle(struct miqt_string style); int QApplication_ColorSpec(); void QApplication_SetColorSpec(int colorSpec); QPalette* QApplication_Palette(QWidget* param1); @@ -98,16 +98,16 @@ int QApplication_Exec(); bool QApplication_Notify(QApplication* self, QObject* param1, QEvent* param2); void QApplication_FocusChanged(QApplication* self, QWidget* old, QWidget* now); void QApplication_connect_FocusChanged(QApplication* self, intptr_t slot); -struct miqt_string* QApplication_StyleSheet(const QApplication* self); -void QApplication_SetStyleSheet(QApplication* self, struct miqt_string* sheet); +struct miqt_string QApplication_StyleSheet(const QApplication* self); +void QApplication_SetStyleSheet(QApplication* self, struct miqt_string sheet); void QApplication_SetAutoSipEnabled(QApplication* self, const bool enabled); bool QApplication_AutoSipEnabled(const QApplication* self); void QApplication_CloseAllWindows(); void QApplication_AboutQt(); -struct miqt_string* QApplication_Tr2(const char* s, const char* c); -struct miqt_string* QApplication_Tr3(const char* s, const char* c, int n); -struct miqt_string* QApplication_TrUtf82(const char* s, const char* c); -struct miqt_string* QApplication_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QApplication_Tr2(const char* s, const char* c); +struct miqt_string QApplication_Tr3(const char* s, const char* c, int n); +struct miqt_string QApplication_TrUtf82(const char* s, const char* c); +struct miqt_string QApplication_TrUtf83(const char* s, const char* c, int n); void QApplication_SetPalette2(QPalette* param1, const char* className); void QApplication_SetFont2(QFont* param1, const char* className); void QApplication_Alert2(QWidget* widget, int duration); diff --git a/qt/gen_qarraydata.go b/qt/gen_qarraydata.go index 32b27d85..bd96dc7e 100644 --- a/qt/gen_qarraydata.go +++ b/qt/gen_qarraydata.go @@ -62,11 +62,11 @@ func UnsafeNewQArrayData(h unsafe.Pointer) *QArrayData { } func (this *QArrayData) Data() unsafe.Pointer { - return C.QArrayData_Data(this.h) + return (unsafe.Pointer)(C.QArrayData_Data(this.h)) } func (this *QArrayData) Data2() unsafe.Pointer { - return C.QArrayData_Data2(this.h) + return (unsafe.Pointer)(C.QArrayData_Data2(this.h)) } func (this *QArrayData) IsMutable() bool { diff --git a/qt/gen_qbitarray.go b/qt/gen_qbitarray.go index 27becb6d..1102ea9f 100644 --- a/qt/gen_qbitarray.go +++ b/qt/gen_qbitarray.go @@ -195,9 +195,9 @@ func (this *QBitArray) Truncate(pos int) { C.QBitArray_Truncate(this.h, (C.int)(pos)) } -func (this *QBitArray) Bits() unsafe.Pointer { +func (this *QBitArray) Bits() string { _ret := C.QBitArray_Bits(this.h) - return (unsafe.Pointer)(_ret) + return C.GoString(_ret) } func QBitArray_FromBits(data string, lenVal int64) *QBitArray { diff --git a/qt/gen_qbitmap.cpp b/qt/gen_qbitmap.cpp index 4737279d..b5581800 100644 --- a/qt/gen_qbitmap.cpp +++ b/qt/gen_qbitmap.cpp @@ -27,8 +27,8 @@ QBitmap* QBitmap_new4(QSize* param1) { return new QBitmap(*param1); } -QBitmap* QBitmap_new5(struct miqt_string* fileName) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +QBitmap* QBitmap_new5(struct miqt_string fileName) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); return new QBitmap(fileName_QString); } @@ -36,8 +36,8 @@ QBitmap* QBitmap_new6(QBitmap* other) { return new QBitmap(*other); } -QBitmap* QBitmap_new7(struct miqt_string* fileName, const char* format) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +QBitmap* QBitmap_new7(struct miqt_string fileName, const char* format) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); return new QBitmap(fileName_QString, format); } diff --git a/qt/gen_qbitmap.go b/qt/gen_qbitmap.go index 11c17c2b..bae6dfad 100644 --- a/qt/gen_qbitmap.go +++ b/qt/gen_qbitmap.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -70,9 +69,11 @@ func NewQBitmap4(param1 *QSize) *QBitmap { // NewQBitmap5 constructs a new QBitmap object. func NewQBitmap5(fileName string) *QBitmap { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - ret := C.QBitmap_new5((*C.struct_miqt_string)(fileName_ms)) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + ret := C.QBitmap_new5(fileName_ms) return newQBitmap(ret) } @@ -84,11 +85,13 @@ func NewQBitmap6(other *QBitmap) *QBitmap { // NewQBitmap7 constructs a new QBitmap object. func NewQBitmap7(fileName string, format string) *QBitmap { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) format_Cstring := C.CString(format) defer C.free(unsafe.Pointer(format_Cstring)) - ret := C.QBitmap_new7((*C.struct_miqt_string)(fileName_ms), format_Cstring) + ret := C.QBitmap_new7(fileName_ms, format_Cstring) return newQBitmap(ret) } diff --git a/qt/gen_qbitmap.h b/qt/gen_qbitmap.h index 60b38f7f..ce298d89 100644 --- a/qt/gen_qbitmap.h +++ b/qt/gen_qbitmap.h @@ -33,9 +33,9 @@ QBitmap* QBitmap_new(); QBitmap* QBitmap_new2(QPixmap* param1); QBitmap* QBitmap_new3(int w, int h); QBitmap* QBitmap_new4(QSize* param1); -QBitmap* QBitmap_new5(struct miqt_string* fileName); +QBitmap* QBitmap_new5(struct miqt_string fileName); QBitmap* QBitmap_new6(QBitmap* other); -QBitmap* QBitmap_new7(struct miqt_string* fileName, const char* format); +QBitmap* QBitmap_new7(struct miqt_string fileName, const char* format); void QBitmap_OperatorAssign(QBitmap* self, QBitmap* other); void QBitmap_OperatorAssignWithQPixmap(QBitmap* self, QPixmap* param1); void QBitmap_Swap(QBitmap* self, QBitmap* other); diff --git a/qt/gen_qboxlayout.cpp b/qt/gen_qboxlayout.cpp index 78a07734..1a92812f 100644 --- a/qt/gen_qboxlayout.cpp +++ b/qt/gen_qboxlayout.cpp @@ -31,18 +31,26 @@ void* QBoxLayout_Metacast(QBoxLayout* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QBoxLayout_Tr(const char* s) { +struct miqt_string QBoxLayout_Tr(const char* s) { QString _ret = QBoxLayout::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QBoxLayout_TrUtf8(const char* s) { +struct miqt_string QBoxLayout_TrUtf8(const char* s) { QString _ret = QBoxLayout::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QBoxLayout_Direction(const QBoxLayout* self) { @@ -179,32 +187,48 @@ void QBoxLayout_SetGeometry(QBoxLayout* self, QRect* geometry) { self->setGeometry(*geometry); } -struct miqt_string* QBoxLayout_Tr2(const char* s, const char* c) { +struct miqt_string QBoxLayout_Tr2(const char* s, const char* c) { QString _ret = QBoxLayout::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QBoxLayout_Tr3(const char* s, const char* c, int n) { +struct miqt_string QBoxLayout_Tr3(const char* s, const char* c, int n) { QString _ret = QBoxLayout::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QBoxLayout_TrUtf82(const char* s, const char* c) { +struct miqt_string QBoxLayout_TrUtf82(const char* s, const char* c) { QString _ret = QBoxLayout::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QBoxLayout_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QBoxLayout_TrUtf83(const char* s, const char* c, int n) { QString _ret = QBoxLayout::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QBoxLayout_AddStretch1(QBoxLayout* self, int stretch) { @@ -259,46 +283,70 @@ void* QHBoxLayout_Metacast(QHBoxLayout* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QHBoxLayout_Tr(const char* s) { +struct miqt_string QHBoxLayout_Tr(const char* s) { QString _ret = QHBoxLayout::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QHBoxLayout_TrUtf8(const char* s) { +struct miqt_string QHBoxLayout_TrUtf8(const char* s) { QString _ret = QHBoxLayout::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QHBoxLayout_Tr2(const char* s, const char* c) { +struct miqt_string QHBoxLayout_Tr2(const char* s, const char* c) { QString _ret = QHBoxLayout::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QHBoxLayout_Tr3(const char* s, const char* c, int n) { +struct miqt_string QHBoxLayout_Tr3(const char* s, const char* c, int n) { QString _ret = QHBoxLayout::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QHBoxLayout_TrUtf82(const char* s, const char* c) { +struct miqt_string QHBoxLayout_TrUtf82(const char* s, const char* c) { QString _ret = QHBoxLayout::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QHBoxLayout_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QHBoxLayout_TrUtf83(const char* s, const char* c, int n) { QString _ret = QHBoxLayout::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QHBoxLayout_Delete(QHBoxLayout* self) { @@ -321,46 +369,70 @@ void* QVBoxLayout_Metacast(QVBoxLayout* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QVBoxLayout_Tr(const char* s) { +struct miqt_string QVBoxLayout_Tr(const char* s) { QString _ret = QVBoxLayout::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QVBoxLayout_TrUtf8(const char* s) { +struct miqt_string QVBoxLayout_TrUtf8(const char* s) { QString _ret = QVBoxLayout::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QVBoxLayout_Tr2(const char* s, const char* c) { +struct miqt_string QVBoxLayout_Tr2(const char* s, const char* c) { QString _ret = QVBoxLayout::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QVBoxLayout_Tr3(const char* s, const char* c, int n) { +struct miqt_string QVBoxLayout_Tr3(const char* s, const char* c, int n) { QString _ret = QVBoxLayout::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QVBoxLayout_TrUtf82(const char* s, const char* c) { +struct miqt_string QVBoxLayout_TrUtf82(const char* s, const char* c) { QString _ret = QVBoxLayout::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QVBoxLayout_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QVBoxLayout_TrUtf83(const char* s, const char* c, int n) { QString _ret = QVBoxLayout::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QVBoxLayout_Delete(QVBoxLayout* self) { diff --git a/qt/gen_qboxlayout.go b/qt/gen_qboxlayout.go index f0444e0a..e6091a8a 100644 --- a/qt/gen_qboxlayout.go +++ b/qt/gen_qboxlayout.go @@ -73,24 +73,24 @@ func (this *QBoxLayout) MetaObject() *QMetaObject { func (this *QBoxLayout) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QBoxLayout_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QBoxLayout_Metacast(this.h, param1_Cstring)) } func QBoxLayout_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QBoxLayout_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QBoxLayout_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QBoxLayout_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QBoxLayout_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QBoxLayout_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -240,9 +240,9 @@ func QBoxLayout_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QBoxLayout_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QBoxLayout_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -251,9 +251,9 @@ func QBoxLayout_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QBoxLayout_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QBoxLayout_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -262,9 +262,9 @@ func QBoxLayout_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QBoxLayout_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QBoxLayout_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -273,9 +273,9 @@ func QBoxLayout_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QBoxLayout_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QBoxLayout_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -374,24 +374,24 @@ func (this *QHBoxLayout) MetaObject() *QMetaObject { func (this *QHBoxLayout) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QHBoxLayout_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QHBoxLayout_Metacast(this.h, param1_Cstring)) } func QHBoxLayout_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QHBoxLayout_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QHBoxLayout_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QHBoxLayout_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QHBoxLayout_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QHBoxLayout_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -400,9 +400,9 @@ func QHBoxLayout_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QHBoxLayout_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QHBoxLayout_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -411,9 +411,9 @@ func QHBoxLayout_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QHBoxLayout_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QHBoxLayout_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -422,9 +422,9 @@ func QHBoxLayout_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QHBoxLayout_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QHBoxLayout_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -433,9 +433,9 @@ func QHBoxLayout_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QHBoxLayout_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QHBoxLayout_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -502,24 +502,24 @@ func (this *QVBoxLayout) MetaObject() *QMetaObject { func (this *QVBoxLayout) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QVBoxLayout_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QVBoxLayout_Metacast(this.h, param1_Cstring)) } func QVBoxLayout_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QVBoxLayout_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QVBoxLayout_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QVBoxLayout_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QVBoxLayout_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QVBoxLayout_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -528,9 +528,9 @@ func QVBoxLayout_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QVBoxLayout_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QVBoxLayout_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -539,9 +539,9 @@ func QVBoxLayout_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QVBoxLayout_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QVBoxLayout_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -550,9 +550,9 @@ func QVBoxLayout_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QVBoxLayout_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QVBoxLayout_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -561,9 +561,9 @@ func QVBoxLayout_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QVBoxLayout_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QVBoxLayout_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qboxlayout.h b/qt/gen_qboxlayout.h index ae9b554e..72a9fe32 100644 --- a/qt/gen_qboxlayout.h +++ b/qt/gen_qboxlayout.h @@ -41,8 +41,8 @@ QBoxLayout* QBoxLayout_new(int param1); QBoxLayout* QBoxLayout_new2(int param1, QWidget* parent); QMetaObject* QBoxLayout_MetaObject(const QBoxLayout* self); void* QBoxLayout_Metacast(QBoxLayout* self, const char* param1); -struct miqt_string* QBoxLayout_Tr(const char* s); -struct miqt_string* QBoxLayout_TrUtf8(const char* s); +struct miqt_string QBoxLayout_Tr(const char* s); +struct miqt_string QBoxLayout_TrUtf8(const char* s); int QBoxLayout_Direction(const QBoxLayout* self); void QBoxLayout_SetDirection(QBoxLayout* self, int direction); void QBoxLayout_AddSpacing(QBoxLayout* self, int size); @@ -76,10 +76,10 @@ QLayoutItem* QBoxLayout_ItemAt(const QBoxLayout* self, int param1); QLayoutItem* QBoxLayout_TakeAt(QBoxLayout* self, int param1); int QBoxLayout_Count(const QBoxLayout* self); void QBoxLayout_SetGeometry(QBoxLayout* self, QRect* geometry); -struct miqt_string* QBoxLayout_Tr2(const char* s, const char* c); -struct miqt_string* QBoxLayout_Tr3(const char* s, const char* c, int n); -struct miqt_string* QBoxLayout_TrUtf82(const char* s, const char* c); -struct miqt_string* QBoxLayout_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QBoxLayout_Tr2(const char* s, const char* c); +struct miqt_string QBoxLayout_Tr3(const char* s, const char* c, int n); +struct miqt_string QBoxLayout_TrUtf82(const char* s, const char* c); +struct miqt_string QBoxLayout_TrUtf83(const char* s, const char* c, int n); void QBoxLayout_AddStretch1(QBoxLayout* self, int stretch); void QBoxLayout_AddWidget2(QBoxLayout* self, QWidget* param1, int stretch); void QBoxLayout_AddWidget3(QBoxLayout* self, QWidget* param1, int stretch, int alignment); @@ -94,24 +94,24 @@ QHBoxLayout* QHBoxLayout_new(); QHBoxLayout* QHBoxLayout_new2(QWidget* parent); QMetaObject* QHBoxLayout_MetaObject(const QHBoxLayout* self); void* QHBoxLayout_Metacast(QHBoxLayout* self, const char* param1); -struct miqt_string* QHBoxLayout_Tr(const char* s); -struct miqt_string* QHBoxLayout_TrUtf8(const char* s); -struct miqt_string* QHBoxLayout_Tr2(const char* s, const char* c); -struct miqt_string* QHBoxLayout_Tr3(const char* s, const char* c, int n); -struct miqt_string* QHBoxLayout_TrUtf82(const char* s, const char* c); -struct miqt_string* QHBoxLayout_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QHBoxLayout_Tr(const char* s); +struct miqt_string QHBoxLayout_TrUtf8(const char* s); +struct miqt_string QHBoxLayout_Tr2(const char* s, const char* c); +struct miqt_string QHBoxLayout_Tr3(const char* s, const char* c, int n); +struct miqt_string QHBoxLayout_TrUtf82(const char* s, const char* c); +struct miqt_string QHBoxLayout_TrUtf83(const char* s, const char* c, int n); void QHBoxLayout_Delete(QHBoxLayout* self); QVBoxLayout* QVBoxLayout_new(); QVBoxLayout* QVBoxLayout_new2(QWidget* parent); QMetaObject* QVBoxLayout_MetaObject(const QVBoxLayout* self); void* QVBoxLayout_Metacast(QVBoxLayout* self, const char* param1); -struct miqt_string* QVBoxLayout_Tr(const char* s); -struct miqt_string* QVBoxLayout_TrUtf8(const char* s); -struct miqt_string* QVBoxLayout_Tr2(const char* s, const char* c); -struct miqt_string* QVBoxLayout_Tr3(const char* s, const char* c, int n); -struct miqt_string* QVBoxLayout_TrUtf82(const char* s, const char* c); -struct miqt_string* QVBoxLayout_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QVBoxLayout_Tr(const char* s); +struct miqt_string QVBoxLayout_TrUtf8(const char* s); +struct miqt_string QVBoxLayout_Tr2(const char* s, const char* c); +struct miqt_string QVBoxLayout_Tr3(const char* s, const char* c, int n); +struct miqt_string QVBoxLayout_TrUtf82(const char* s, const char* c); +struct miqt_string QVBoxLayout_TrUtf83(const char* s, const char* c, int n); void QVBoxLayout_Delete(QVBoxLayout* self); #ifdef __cplusplus diff --git a/qt/gen_qbuffer.cpp b/qt/gen_qbuffer.cpp index 6c567eba..ff304707 100644 --- a/qt/gen_qbuffer.cpp +++ b/qt/gen_qbuffer.cpp @@ -13,18 +13,10 @@ QBuffer* QBuffer_new() { return new QBuffer(); } -QBuffer* QBuffer_new2(QByteArray* buf) { - return new QBuffer(buf); -} - -QBuffer* QBuffer_new3(QObject* parent) { +QBuffer* QBuffer_new2(QObject* parent) { return new QBuffer(parent); } -QBuffer* QBuffer_new4(QByteArray* buf, QObject* parent) { - return new QBuffer(buf, parent); -} - QMetaObject* QBuffer_MetaObject(const QBuffer* self) { return (QMetaObject*) self->metaObject(); } @@ -33,48 +25,62 @@ void* QBuffer_Metacast(QBuffer* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QBuffer_Tr(const char* s) { +struct miqt_string QBuffer_Tr(const char* s) { QString _ret = QBuffer::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QBuffer_TrUtf8(const char* s) { +struct miqt_string QBuffer_TrUtf8(const char* s) { QString _ret = QBuffer::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -QByteArray* QBuffer_Buffer(QBuffer* self) { - QByteArray& _ret = self->buffer(); - // Cast returned reference into pointer - return &_ret; +struct miqt_string QBuffer_Buffer(QBuffer* self) { + QByteArray _qb = self->buffer(); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } -QByteArray* QBuffer_Buffer2(const QBuffer* self) { - const QByteArray& _ret = self->buffer(); - // Cast returned reference into pointer - return const_cast(&_ret); +struct miqt_string QBuffer_Buffer2(const QBuffer* self) { + const QByteArray _qb = self->buffer(); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } -void QBuffer_SetBuffer(QBuffer* self, QByteArray* a) { - self->setBuffer(a); -} - -void QBuffer_SetData(QBuffer* self, QByteArray* data) { - self->setData(*data); +void QBuffer_SetData(QBuffer* self, struct miqt_string data) { + QByteArray data_QByteArray(data.data, data.len); + self->setData(data_QByteArray); } void QBuffer_SetData2(QBuffer* self, const char* data, int lenVal) { self->setData(data, static_cast(lenVal)); } -QByteArray* QBuffer_Data(const QBuffer* self) { - const QByteArray& _ret = self->data(); - // Cast returned reference into pointer - return const_cast(&_ret); +struct miqt_string QBuffer_Data(const QBuffer* self) { + const QByteArray _qb = self->data(); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } bool QBuffer_Open(QBuffer* self, int openMode) { @@ -107,32 +113,48 @@ bool QBuffer_CanReadLine(const QBuffer* self) { return self->canReadLine(); } -struct miqt_string* QBuffer_Tr2(const char* s, const char* c) { +struct miqt_string QBuffer_Tr2(const char* s, const char* c) { QString _ret = QBuffer::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QBuffer_Tr3(const char* s, const char* c, int n) { +struct miqt_string QBuffer_Tr3(const char* s, const char* c, int n) { QString _ret = QBuffer::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QBuffer_TrUtf82(const char* s, const char* c) { +struct miqt_string QBuffer_TrUtf82(const char* s, const char* c) { QString _ret = QBuffer::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QBuffer_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QBuffer_TrUtf83(const char* s, const char* c, int n) { QString _ret = QBuffer::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QBuffer_Delete(QBuffer* self) { diff --git a/qt/gen_qbuffer.go b/qt/gen_qbuffer.go index 6157d08c..979e8639 100644 --- a/qt/gen_qbuffer.go +++ b/qt/gen_qbuffer.go @@ -50,20 +50,8 @@ func NewQBuffer() *QBuffer { } // NewQBuffer2 constructs a new QBuffer object. -func NewQBuffer2(buf *QByteArray) *QBuffer { - ret := C.QBuffer_new2(buf.cPointer()) - return newQBuffer(ret) -} - -// NewQBuffer3 constructs a new QBuffer object. -func NewQBuffer3(parent *QObject) *QBuffer { - ret := C.QBuffer_new3(parent.cPointer()) - return newQBuffer(ret) -} - -// NewQBuffer4 constructs a new QBuffer object. -func NewQBuffer4(buf *QByteArray, parent *QObject) *QBuffer { - ret := C.QBuffer_new4(buf.cPointer(), parent.cPointer()) +func NewQBuffer2(parent *QObject) *QBuffer { + ret := C.QBuffer_new2(parent.cPointer()) return newQBuffer(ret) } @@ -74,41 +62,46 @@ func (this *QBuffer) MetaObject() *QMetaObject { func (this *QBuffer) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QBuffer_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QBuffer_Metacast(this.h, param1_Cstring)) } func QBuffer_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QBuffer_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QBuffer_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QBuffer_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QBuffer_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QBuffer_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } -func (this *QBuffer) Buffer() *QByteArray { - return UnsafeNewQByteArray(unsafe.Pointer(C.QBuffer_Buffer(this.h))) +func (this *QBuffer) Buffer() []byte { + var _bytearray C.struct_miqt_string = C.QBuffer_Buffer(this.h) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } -func (this *QBuffer) Buffer2() *QByteArray { - return UnsafeNewQByteArray(unsafe.Pointer(C.QBuffer_Buffer2(this.h))) +func (this *QBuffer) Buffer2() []byte { + var _bytearray C.struct_miqt_string = C.QBuffer_Buffer2(this.h) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } -func (this *QBuffer) SetBuffer(a *QByteArray) { - C.QBuffer_SetBuffer(this.h, a.cPointer()) -} - -func (this *QBuffer) SetData(data *QByteArray) { - C.QBuffer_SetData(this.h, data.cPointer()) +func (this *QBuffer) SetData(data []byte) { + data_alias := C.struct_miqt_string{} + data_alias.data = (*C.char)(unsafe.Pointer(&data[0])) + data_alias.len = C.size_t(len(data)) + C.QBuffer_SetData(this.h, data_alias) } func (this *QBuffer) SetData2(data string, lenVal int) { @@ -117,8 +110,11 @@ func (this *QBuffer) SetData2(data string, lenVal int) { C.QBuffer_SetData2(this.h, data_Cstring, (C.int)(lenVal)) } -func (this *QBuffer) Data() *QByteArray { - return UnsafeNewQByteArray(unsafe.Pointer(C.QBuffer_Data(this.h))) +func (this *QBuffer) Data() []byte { + var _bytearray C.struct_miqt_string = C.QBuffer_Data(this.h) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } func (this *QBuffer) Open(openMode QIODevice__OpenModeFlag) bool { @@ -154,9 +150,9 @@ func QBuffer_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QBuffer_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QBuffer_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -165,9 +161,9 @@ func QBuffer_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QBuffer_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QBuffer_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -176,9 +172,9 @@ func QBuffer_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QBuffer_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QBuffer_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -187,9 +183,9 @@ func QBuffer_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QBuffer_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QBuffer_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qbuffer.h b/qt/gen_qbuffer.h index b0088707..5f4a84c1 100644 --- a/qt/gen_qbuffer.h +++ b/qt/gen_qbuffer.h @@ -26,19 +26,16 @@ typedef struct QObject QObject; #endif QBuffer* QBuffer_new(); -QBuffer* QBuffer_new2(QByteArray* buf); -QBuffer* QBuffer_new3(QObject* parent); -QBuffer* QBuffer_new4(QByteArray* buf, QObject* parent); +QBuffer* QBuffer_new2(QObject* parent); QMetaObject* QBuffer_MetaObject(const QBuffer* self); void* QBuffer_Metacast(QBuffer* self, const char* param1); -struct miqt_string* QBuffer_Tr(const char* s); -struct miqt_string* QBuffer_TrUtf8(const char* s); -QByteArray* QBuffer_Buffer(QBuffer* self); -QByteArray* QBuffer_Buffer2(const QBuffer* self); -void QBuffer_SetBuffer(QBuffer* self, QByteArray* a); -void QBuffer_SetData(QBuffer* self, QByteArray* data); +struct miqt_string QBuffer_Tr(const char* s); +struct miqt_string QBuffer_TrUtf8(const char* s); +struct miqt_string QBuffer_Buffer(QBuffer* self); +struct miqt_string QBuffer_Buffer2(const QBuffer* self); +void QBuffer_SetData(QBuffer* self, struct miqt_string data); void QBuffer_SetData2(QBuffer* self, const char* data, int lenVal); -QByteArray* QBuffer_Data(const QBuffer* self); +struct miqt_string QBuffer_Data(const QBuffer* self); bool QBuffer_Open(QBuffer* self, int openMode); void QBuffer_Close(QBuffer* self); long long QBuffer_Size(const QBuffer* self); @@ -46,10 +43,10 @@ long long QBuffer_Pos(const QBuffer* self); bool QBuffer_Seek(QBuffer* self, long long off); bool QBuffer_AtEnd(const QBuffer* self); bool QBuffer_CanReadLine(const QBuffer* self); -struct miqt_string* QBuffer_Tr2(const char* s, const char* c); -struct miqt_string* QBuffer_Tr3(const char* s, const char* c, int n); -struct miqt_string* QBuffer_TrUtf82(const char* s, const char* c); -struct miqt_string* QBuffer_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QBuffer_Tr2(const char* s, const char* c); +struct miqt_string QBuffer_Tr3(const char* s, const char* c, int n); +struct miqt_string QBuffer_TrUtf82(const char* s, const char* c); +struct miqt_string QBuffer_TrUtf83(const char* s, const char* c, int n); void QBuffer_Delete(QBuffer* self); #ifdef __cplusplus diff --git a/qt/gen_qbuttongroup.cpp b/qt/gen_qbuttongroup.cpp index 5edb242d..d38997e0 100644 --- a/qt/gen_qbuttongroup.cpp +++ b/qt/gen_qbuttongroup.cpp @@ -26,18 +26,26 @@ void* QButtonGroup_Metacast(QButtonGroup* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QButtonGroup_Tr(const char* s) { +struct miqt_string QButtonGroup_Tr(const char* s) { QString _ret = QButtonGroup::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QButtonGroup_TrUtf8(const char* s) { +struct miqt_string QButtonGroup_TrUtf8(const char* s) { QString _ret = QButtonGroup::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QButtonGroup_SetExclusive(QButtonGroup* self, bool exclusive) { @@ -224,32 +232,48 @@ void QButtonGroup_connect_ButtonToggled2(QButtonGroup* self, intptr_t slot) { }); } -struct miqt_string* QButtonGroup_Tr2(const char* s, const char* c) { +struct miqt_string QButtonGroup_Tr2(const char* s, const char* c) { QString _ret = QButtonGroup::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QButtonGroup_Tr3(const char* s, const char* c, int n) { +struct miqt_string QButtonGroup_Tr3(const char* s, const char* c, int n) { QString _ret = QButtonGroup::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QButtonGroup_TrUtf82(const char* s, const char* c) { +struct miqt_string QButtonGroup_TrUtf82(const char* s, const char* c) { QString _ret = QButtonGroup::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QButtonGroup_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QButtonGroup_TrUtf83(const char* s, const char* c, int n) { QString _ret = QButtonGroup::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QButtonGroup_AddButton2(QButtonGroup* self, QAbstractButton* param1, int id) { diff --git a/qt/gen_qbuttongroup.go b/qt/gen_qbuttongroup.go index ca28af29..1ac95b77 100644 --- a/qt/gen_qbuttongroup.go +++ b/qt/gen_qbuttongroup.go @@ -63,24 +63,24 @@ func (this *QButtonGroup) MetaObject() *QMetaObject { func (this *QButtonGroup) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QButtonGroup_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QButtonGroup_Metacast(this.h, param1_Cstring)) } func QButtonGroup_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QButtonGroup_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QButtonGroup_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QButtonGroup_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QButtonGroup_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QButtonGroup_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -381,9 +381,9 @@ func QButtonGroup_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QButtonGroup_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QButtonGroup_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -392,9 +392,9 @@ func QButtonGroup_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QButtonGroup_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QButtonGroup_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -403,9 +403,9 @@ func QButtonGroup_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QButtonGroup_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QButtonGroup_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -414,9 +414,9 @@ func QButtonGroup_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QButtonGroup_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QButtonGroup_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qbuttongroup.h b/qt/gen_qbuttongroup.h index 21890c28..1e2fde9a 100644 --- a/qt/gen_qbuttongroup.h +++ b/qt/gen_qbuttongroup.h @@ -29,8 +29,8 @@ QButtonGroup* QButtonGroup_new(); QButtonGroup* QButtonGroup_new2(QObject* parent); QMetaObject* QButtonGroup_MetaObject(const QButtonGroup* self); void* QButtonGroup_Metacast(QButtonGroup* self, const char* param1); -struct miqt_string* QButtonGroup_Tr(const char* s); -struct miqt_string* QButtonGroup_TrUtf8(const char* s); +struct miqt_string QButtonGroup_Tr(const char* s); +struct miqt_string QButtonGroup_TrUtf8(const char* s); void QButtonGroup_SetExclusive(QButtonGroup* self, bool exclusive); bool QButtonGroup_Exclusive(const QButtonGroup* self); void QButtonGroup_AddButton(QButtonGroup* self, QAbstractButton* param1); @@ -65,10 +65,10 @@ void QButtonGroup_ButtonReleasedWithInt(QButtonGroup* self, int param1); void QButtonGroup_connect_ButtonReleasedWithInt(QButtonGroup* self, intptr_t slot); void QButtonGroup_ButtonToggled2(QButtonGroup* self, int param1, bool param2); void QButtonGroup_connect_ButtonToggled2(QButtonGroup* self, intptr_t slot); -struct miqt_string* QButtonGroup_Tr2(const char* s, const char* c); -struct miqt_string* QButtonGroup_Tr3(const char* s, const char* c, int n); -struct miqt_string* QButtonGroup_TrUtf82(const char* s, const char* c); -struct miqt_string* QButtonGroup_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QButtonGroup_Tr2(const char* s, const char* c); +struct miqt_string QButtonGroup_Tr3(const char* s, const char* c, int n); +struct miqt_string QButtonGroup_TrUtf82(const char* s, const char* c); +struct miqt_string QButtonGroup_TrUtf83(const char* s, const char* c, int n); void QButtonGroup_AddButton2(QButtonGroup* self, QAbstractButton* param1, int id); void QButtonGroup_Delete(QButtonGroup* self); diff --git a/qt/gen_qbytearray.cpp b/qt/gen_qbytearray.cpp deleted file mode 100644 index 639d496a..00000000 --- a/qt/gen_qbytearray.cpp +++ /dev/null @@ -1,1142 +0,0 @@ -#include -#define WORKAROUND_INNER_CLASS_DEFINITION_QByteArray__FromBase64Result -#include -#include -#include -#include -#include -#include -#include -#include "gen_qbytearray.h" -#include "_cgo_export.h" - -QByteArrayDataPtr* QByteArrayDataPtr_new() { - return new QByteArrayDataPtr(); -} - -QByteArrayDataPtr* QByteArrayDataPtr_new2(QByteArrayDataPtr* param1) { - return new QByteArrayDataPtr(*param1); -} - -void QByteArrayDataPtr_Delete(QByteArrayDataPtr* self) { - delete self; -} - -QByteArray* QByteArray_new() { - return new QByteArray(); -} - -QByteArray* QByteArray_new2(const char* param1) { - return new QByteArray(param1); -} - -QByteArray* QByteArray_new3(int size, char c) { - return new QByteArray(static_cast(size), static_cast(c)); -} - -QByteArray* QByteArray_new4(int size, int param2) { - return new QByteArray(static_cast(size), static_cast(param2)); -} - -QByteArray* QByteArray_new5(QByteArray* param1) { - return new QByteArray(*param1); -} - -QByteArray* QByteArray_new6(QByteArrayDataPtr* dd) { - return new QByteArray(*dd); -} - -QByteArray* QByteArray_new7(const char* param1, int size) { - return new QByteArray(param1, static_cast(size)); -} - -void QByteArray_OperatorAssign(QByteArray* self, QByteArray* param1) { - self->operator=(*param1); -} - -void QByteArray_OperatorAssignWithStr(QByteArray* self, const char* str) { - self->operator=(str); -} - -void QByteArray_Swap(QByteArray* self, QByteArray* other) { - self->swap(*other); -} - -int QByteArray_Size(const QByteArray* self) { - return self->size(); -} - -bool QByteArray_IsEmpty(const QByteArray* self) { - return self->isEmpty(); -} - -void QByteArray_Resize(QByteArray* self, int size) { - self->resize(static_cast(size)); -} - -QByteArray* QByteArray_Fill(QByteArray* self, char c) { - QByteArray& _ret = self->fill(static_cast(c)); - // Cast returned reference into pointer - return &_ret; -} - -int QByteArray_Capacity(const QByteArray* self) { - return self->capacity(); -} - -void QByteArray_Reserve(QByteArray* self, int size) { - self->reserve(static_cast(size)); -} - -void QByteArray_Squeeze(QByteArray* self) { - self->squeeze(); -} - -char* QByteArray_Data(QByteArray* self) { - return self->data(); -} - -const char* QByteArray_Data2(const QByteArray* self) { - return (const char*) self->data(); -} - -const char* QByteArray_ConstData(const QByteArray* self) { - return (const char*) self->constData(); -} - -void QByteArray_Detach(QByteArray* self) { - self->detach(); -} - -bool QByteArray_IsDetached(const QByteArray* self) { - return self->isDetached(); -} - -bool QByteArray_IsSharedWith(const QByteArray* self, QByteArray* other) { - return self->isSharedWith(*other); -} - -void QByteArray_Clear(QByteArray* self) { - self->clear(); -} - -char QByteArray_At(const QByteArray* self, int i) { - return self->at(static_cast(i)); -} - -char QByteArray_OperatorSubscript(const QByteArray* self, int i) { - return self->operator[](static_cast(i)); -} - -char QByteArray_OperatorSubscriptWithUint(const QByteArray* self, unsigned int i) { - return self->operator[](static_cast(i)); -} - -QByteRef* QByteArray_OperatorSubscriptWithInt(QByteArray* self, int i) { - return new QByteRef(self->operator[](static_cast(i))); -} - -QByteRef* QByteArray_OperatorSubscript2(QByteArray* self, unsigned int i) { - return new QByteRef(self->operator[](static_cast(i))); -} - -char QByteArray_Front(const QByteArray* self) { - return self->front(); -} - -QByteRef* QByteArray_Front2(QByteArray* self) { - return new QByteRef(self->front()); -} - -char QByteArray_Back(const QByteArray* self) { - return self->back(); -} - -QByteRef* QByteArray_Back2(QByteArray* self) { - return new QByteRef(self->back()); -} - -int QByteArray_IndexOf(const QByteArray* self, char c) { - return self->indexOf(static_cast(c)); -} - -int QByteArray_IndexOfWithChar(const QByteArray* self, const char* c) { - return self->indexOf(c); -} - -int QByteArray_IndexOfWithQByteArray(const QByteArray* self, QByteArray* a) { - return self->indexOf(*a); -} - -int QByteArray_LastIndexOf(const QByteArray* self, char c) { - return self->lastIndexOf(static_cast(c)); -} - -int QByteArray_LastIndexOfWithChar(const QByteArray* self, const char* c) { - return self->lastIndexOf(c); -} - -int QByteArray_LastIndexOfWithQByteArray(const QByteArray* self, QByteArray* a) { - return self->lastIndexOf(*a); -} - -bool QByteArray_Contains(const QByteArray* self, char c) { - return self->contains(static_cast(c)); -} - -bool QByteArray_ContainsWithChar(const QByteArray* self, const char* a) { - return self->contains(a); -} - -bool QByteArray_ContainsWithQByteArray(const QByteArray* self, QByteArray* a) { - return self->contains(*a); -} - -int QByteArray_Count(const QByteArray* self, char c) { - return self->count(static_cast(c)); -} - -int QByteArray_CountWithChar(const QByteArray* self, const char* a) { - return self->count(a); -} - -int QByteArray_CountWithQByteArray(const QByteArray* self, QByteArray* a) { - return self->count(*a); -} - -int QByteArray_Compare(const QByteArray* self, const char* c) { - return self->compare(c); -} - -int QByteArray_CompareWithQByteArray(const QByteArray* self, QByteArray* a) { - return self->compare(*a); -} - -QByteArray* QByteArray_Left(const QByteArray* self, int lenVal) { - return new QByteArray(self->left(static_cast(lenVal))); -} - -QByteArray* QByteArray_Right(const QByteArray* self, int lenVal) { - return new QByteArray(self->right(static_cast(lenVal))); -} - -QByteArray* QByteArray_Mid(const QByteArray* self, int index) { - return new QByteArray(self->mid(static_cast(index))); -} - -QByteArray* QByteArray_Chopped(const QByteArray* self, int lenVal) { - return new QByteArray(self->chopped(static_cast(lenVal))); -} - -bool QByteArray_StartsWith(const QByteArray* self, QByteArray* a) { - return self->startsWith(*a); -} - -bool QByteArray_StartsWithWithChar(const QByteArray* self, char c) { - return self->startsWith(static_cast(c)); -} - -bool QByteArray_StartsWith2(const QByteArray* self, const char* c) { - return self->startsWith(c); -} - -bool QByteArray_EndsWith(const QByteArray* self, QByteArray* a) { - return self->endsWith(*a); -} - -bool QByteArray_EndsWithWithChar(const QByteArray* self, char c) { - return self->endsWith(static_cast(c)); -} - -bool QByteArray_EndsWith2(const QByteArray* self, const char* c) { - return self->endsWith(c); -} - -bool QByteArray_IsUpper(const QByteArray* self) { - return self->isUpper(); -} - -bool QByteArray_IsLower(const QByteArray* self) { - return self->isLower(); -} - -void QByteArray_Truncate(QByteArray* self, int pos) { - self->truncate(static_cast(pos)); -} - -void QByteArray_Chop(QByteArray* self, int n) { - self->chop(static_cast(n)); -} - -QByteArray* QByteArray_ToLower(const QByteArray* self) { - return new QByteArray(self->toLower()); -} - -QByteArray* QByteArray_ToUpper(const QByteArray* self) { - return new QByteArray(self->toUpper()); -} - -QByteArray* QByteArray_Trimmed(const QByteArray* self) { - return new QByteArray(self->trimmed()); -} - -QByteArray* QByteArray_Simplified(const QByteArray* self) { - return new QByteArray(self->simplified()); -} - -QByteArray* QByteArray_LeftJustified(const QByteArray* self, int width) { - return new QByteArray(self->leftJustified(static_cast(width))); -} - -QByteArray* QByteArray_RightJustified(const QByteArray* self, int width) { - return new QByteArray(self->rightJustified(static_cast(width))); -} - -QByteArray* QByteArray_Prepend(QByteArray* self, char c) { - QByteArray& _ret = self->prepend(static_cast(c)); - // Cast returned reference into pointer - return &_ret; -} - -QByteArray* QByteArray_Prepend2(QByteArray* self, int count, char c) { - QByteArray& _ret = self->prepend(static_cast(count), static_cast(c)); - // Cast returned reference into pointer - return &_ret; -} - -QByteArray* QByteArray_PrependWithChar(QByteArray* self, const char* s) { - QByteArray& _ret = self->prepend(s); - // Cast returned reference into pointer - return &_ret; -} - -QByteArray* QByteArray_Prepend3(QByteArray* self, const char* s, int lenVal) { - QByteArray& _ret = self->prepend(s, static_cast(lenVal)); - // Cast returned reference into pointer - return &_ret; -} - -QByteArray* QByteArray_PrependWithQByteArray(QByteArray* self, QByteArray* a) { - QByteArray& _ret = self->prepend(*a); - // Cast returned reference into pointer - return &_ret; -} - -QByteArray* QByteArray_Append(QByteArray* self, char c) { - QByteArray& _ret = self->append(static_cast(c)); - // Cast returned reference into pointer - return &_ret; -} - -QByteArray* QByteArray_Append2(QByteArray* self, int count, char c) { - QByteArray& _ret = self->append(static_cast(count), static_cast(c)); - // Cast returned reference into pointer - return &_ret; -} - -QByteArray* QByteArray_AppendWithChar(QByteArray* self, const char* s) { - QByteArray& _ret = self->append(s); - // Cast returned reference into pointer - return &_ret; -} - -QByteArray* QByteArray_Append3(QByteArray* self, const char* s, int lenVal) { - QByteArray& _ret = self->append(s, static_cast(lenVal)); - // Cast returned reference into pointer - return &_ret; -} - -QByteArray* QByteArray_AppendWithQByteArray(QByteArray* self, QByteArray* a) { - QByteArray& _ret = self->append(*a); - // Cast returned reference into pointer - return &_ret; -} - -QByteArray* QByteArray_Insert(QByteArray* self, int i, char c) { - QByteArray& _ret = self->insert(static_cast(i), static_cast(c)); - // Cast returned reference into pointer - return &_ret; -} - -QByteArray* QByteArray_Insert2(QByteArray* self, int i, int count, char c) { - QByteArray& _ret = self->insert(static_cast(i), static_cast(count), static_cast(c)); - // Cast returned reference into pointer - return &_ret; -} - -QByteArray* QByteArray_Insert3(QByteArray* self, int i, const char* s) { - QByteArray& _ret = self->insert(static_cast(i), s); - // Cast returned reference into pointer - return &_ret; -} - -QByteArray* QByteArray_Insert4(QByteArray* self, int i, const char* s, int lenVal) { - QByteArray& _ret = self->insert(static_cast(i), s, static_cast(lenVal)); - // Cast returned reference into pointer - return &_ret; -} - -QByteArray* QByteArray_Insert5(QByteArray* self, int i, QByteArray* a) { - QByteArray& _ret = self->insert(static_cast(i), *a); - // Cast returned reference into pointer - return &_ret; -} - -QByteArray* QByteArray_Remove(QByteArray* self, int index, int lenVal) { - QByteArray& _ret = self->remove(static_cast(index), static_cast(lenVal)); - // Cast returned reference into pointer - return &_ret; -} - -QByteArray* QByteArray_Replace(QByteArray* self, int index, int lenVal, const char* s) { - QByteArray& _ret = self->replace(static_cast(index), static_cast(lenVal), s); - // Cast returned reference into pointer - return &_ret; -} - -QByteArray* QByteArray_Replace2(QByteArray* self, int index, int lenVal, const char* s, int alen) { - QByteArray& _ret = self->replace(static_cast(index), static_cast(lenVal), s, static_cast(alen)); - // Cast returned reference into pointer - return &_ret; -} - -QByteArray* QByteArray_Replace3(QByteArray* self, int index, int lenVal, QByteArray* s) { - QByteArray& _ret = self->replace(static_cast(index), static_cast(lenVal), *s); - // Cast returned reference into pointer - return &_ret; -} - -QByteArray* QByteArray_Replace4(QByteArray* self, char before, const char* after) { - QByteArray& _ret = self->replace(static_cast(before), after); - // Cast returned reference into pointer - return &_ret; -} - -QByteArray* QByteArray_Replace5(QByteArray* self, char before, QByteArray* after) { - QByteArray& _ret = self->replace(static_cast(before), *after); - // Cast returned reference into pointer - return &_ret; -} - -QByteArray* QByteArray_Replace6(QByteArray* self, const char* before, const char* after) { - QByteArray& _ret = self->replace(before, after); - // Cast returned reference into pointer - return &_ret; -} - -QByteArray* QByteArray_Replace7(QByteArray* self, const char* before, int bsize, const char* after, int asize) { - QByteArray& _ret = self->replace(before, static_cast(bsize), after, static_cast(asize)); - // Cast returned reference into pointer - return &_ret; -} - -QByteArray* QByteArray_Replace8(QByteArray* self, QByteArray* before, QByteArray* after) { - QByteArray& _ret = self->replace(*before, *after); - // Cast returned reference into pointer - return &_ret; -} - -QByteArray* QByteArray_Replace9(QByteArray* self, QByteArray* before, const char* after) { - QByteArray& _ret = self->replace(*before, after); - // Cast returned reference into pointer - return &_ret; -} - -QByteArray* QByteArray_Replace10(QByteArray* self, const char* before, QByteArray* after) { - QByteArray& _ret = self->replace(before, *after); - // Cast returned reference into pointer - return &_ret; -} - -QByteArray* QByteArray_Replace11(QByteArray* self, char before, char after) { - QByteArray& _ret = self->replace(static_cast(before), static_cast(after)); - // Cast returned reference into pointer - return &_ret; -} - -QByteArray* QByteArray_OperatorPlusAssign(QByteArray* self, char c) { - QByteArray& _ret = self->operator+=(static_cast(c)); - // Cast returned reference into pointer - return &_ret; -} - -QByteArray* QByteArray_OperatorPlusAssignWithChar(QByteArray* self, const char* s) { - QByteArray& _ret = self->operator+=(s); - // Cast returned reference into pointer - return &_ret; -} - -QByteArray* QByteArray_OperatorPlusAssignWithQByteArray(QByteArray* self, QByteArray* a) { - QByteArray& _ret = self->operator+=(*a); - // Cast returned reference into pointer - return &_ret; -} - -struct miqt_array* QByteArray_Split(const QByteArray* self, char sep) { - QList _ret = self->split(static_cast(sep)); - // Convert QList<> from C++ memory to manually-managed C memory - QByteArray** _arr = static_cast(malloc(sizeof(QByteArray*) * _ret.length())); - for (size_t i = 0, e = _ret.length(); i < e; ++i) { - _arr[i] = new QByteArray(_ret[i]); - } - struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); - _out->len = _ret.length(); - _out->data = static_cast(_arr); - return _out; -} - -QByteArray* QByteArray_Repeated(const QByteArray* self, int times) { - return new QByteArray(self->repeated(static_cast(times))); -} - -QByteArray* QByteArray_AppendWithQString(QByteArray* self, struct miqt_string* s) { - QString s_QString = QString::fromUtf8(&s->data, s->len); - QByteArray& _ret = self->append(s_QString); - // Cast returned reference into pointer - return &_ret; -} - -QByteArray* QByteArray_Insert6(QByteArray* self, int i, struct miqt_string* s) { - QString s_QString = QString::fromUtf8(&s->data, s->len); - QByteArray& _ret = self->insert(static_cast(i), s_QString); - // Cast returned reference into pointer - return &_ret; -} - -QByteArray* QByteArray_Replace12(QByteArray* self, struct miqt_string* before, const char* after) { - QString before_QString = QString::fromUtf8(&before->data, before->len); - QByteArray& _ret = self->replace(before_QString, after); - // Cast returned reference into pointer - return &_ret; -} - -QByteArray* QByteArray_Replace13(QByteArray* self, char c, struct miqt_string* after) { - QString after_QString = QString::fromUtf8(&after->data, after->len); - QByteArray& _ret = self->replace(static_cast(c), after_QString); - // Cast returned reference into pointer - return &_ret; -} - -QByteArray* QByteArray_Replace14(QByteArray* self, struct miqt_string* before, QByteArray* after) { - QString before_QString = QString::fromUtf8(&before->data, before->len); - QByteArray& _ret = self->replace(before_QString, *after); - // Cast returned reference into pointer - return &_ret; -} - -QByteArray* QByteArray_OperatorPlusAssignWithQString(QByteArray* self, struct miqt_string* s) { - QString s_QString = QString::fromUtf8(&s->data, s->len); - QByteArray& _ret = self->operator+=(s_QString); - // Cast returned reference into pointer - return &_ret; -} - -int QByteArray_IndexOfWithQString(const QByteArray* self, struct miqt_string* s) { - QString s_QString = QString::fromUtf8(&s->data, s->len); - return self->indexOf(s_QString); -} - -int QByteArray_LastIndexOfWithQString(const QByteArray* self, struct miqt_string* s) { - QString s_QString = QString::fromUtf8(&s->data, s->len); - return self->lastIndexOf(s_QString); -} - -bool QByteArray_OperatorEqual(const QByteArray* self, struct miqt_string* s2) { - QString s2_QString = QString::fromUtf8(&s2->data, s2->len); - return self->operator==(s2_QString); -} - -bool QByteArray_OperatorNotEqual(const QByteArray* self, struct miqt_string* s2) { - QString s2_QString = QString::fromUtf8(&s2->data, s2->len); - return self->operator!=(s2_QString); -} - -bool QByteArray_OperatorLesser(const QByteArray* self, struct miqt_string* s2) { - QString s2_QString = QString::fromUtf8(&s2->data, s2->len); - return self->operator<(s2_QString); -} - -bool QByteArray_OperatorGreater(const QByteArray* self, struct miqt_string* s2) { - QString s2_QString = QString::fromUtf8(&s2->data, s2->len); - return self->operator>(s2_QString); -} - -bool QByteArray_OperatorLesserOrEqual(const QByteArray* self, struct miqt_string* s2) { - QString s2_QString = QString::fromUtf8(&s2->data, s2->len); - return self->operator<=(s2_QString); -} - -bool QByteArray_OperatorGreaterOrEqual(const QByteArray* self, struct miqt_string* s2) { - QString s2_QString = QString::fromUtf8(&s2->data, s2->len); - return self->operator>=(s2_QString); -} - -int16_t QByteArray_ToShort(const QByteArray* self) { - return self->toShort(); -} - -uint16_t QByteArray_ToUShort(const QByteArray* self) { - ushort _ret = self->toUShort(); - return static_cast(_ret); -} - -int QByteArray_ToInt(const QByteArray* self) { - return self->toInt(); -} - -unsigned int QByteArray_ToUInt(const QByteArray* self) { - uint _ret = self->toUInt(); - return static_cast(_ret); -} - -long QByteArray_ToLong(const QByteArray* self) { - return self->toLong(); -} - -unsigned long QByteArray_ToULong(const QByteArray* self) { - ulong _ret = self->toULong(); - return static_cast(_ret); -} - -long long QByteArray_ToLongLong(const QByteArray* self) { - qlonglong _ret = self->toLongLong(); - return static_cast(_ret); -} - -unsigned long long QByteArray_ToULongLong(const QByteArray* self) { - qulonglong _ret = self->toULongLong(); - return static_cast(_ret); -} - -float QByteArray_ToFloat(const QByteArray* self) { - return self->toFloat(); -} - -double QByteArray_ToDouble(const QByteArray* self) { - return self->toDouble(); -} - -QByteArray* QByteArray_ToBase64(const QByteArray* self, int options) { - return new QByteArray(self->toBase64(static_cast(options))); -} - -QByteArray* QByteArray_ToBase642(const QByteArray* self) { - return new QByteArray(self->toBase64()); -} - -QByteArray* QByteArray_ToHex(const QByteArray* self) { - return new QByteArray(self->toHex()); -} - -QByteArray* QByteArray_ToHexWithSeparator(const QByteArray* self, char separator) { - return new QByteArray(self->toHex(static_cast(separator))); -} - -QByteArray* QByteArray_ToPercentEncoding(const QByteArray* self) { - return new QByteArray(self->toPercentEncoding()); -} - -QByteArray* QByteArray_SetNum(QByteArray* self, int16_t param1) { - QByteArray& _ret = self->setNum(static_cast(param1)); - // Cast returned reference into pointer - return &_ret; -} - -QByteArray* QByteArray_SetNumWithUshort(QByteArray* self, uint16_t param1) { - QByteArray& _ret = self->setNum(static_cast(param1)); - // Cast returned reference into pointer - return &_ret; -} - -QByteArray* QByteArray_SetNumWithInt(QByteArray* self, int param1) { - QByteArray& _ret = self->setNum(static_cast(param1)); - // Cast returned reference into pointer - return &_ret; -} - -QByteArray* QByteArray_SetNumWithUint(QByteArray* self, unsigned int param1) { - QByteArray& _ret = self->setNum(static_cast(param1)); - // Cast returned reference into pointer - return &_ret; -} - -QByteArray* QByteArray_SetNumWithQlonglong(QByteArray* self, long long param1) { - QByteArray& _ret = self->setNum(static_cast(param1)); - // Cast returned reference into pointer - return &_ret; -} - -QByteArray* QByteArray_SetNumWithQulonglong(QByteArray* self, unsigned long long param1) { - QByteArray& _ret = self->setNum(static_cast(param1)); - // Cast returned reference into pointer - return &_ret; -} - -QByteArray* QByteArray_SetNumWithFloat(QByteArray* self, float param1) { - QByteArray& _ret = self->setNum(static_cast(param1)); - // Cast returned reference into pointer - return &_ret; -} - -QByteArray* QByteArray_SetNumWithDouble(QByteArray* self, double param1) { - QByteArray& _ret = self->setNum(static_cast(param1)); - // Cast returned reference into pointer - return &_ret; -} - -QByteArray* QByteArray_SetRawData(QByteArray* self, const char* a, unsigned int n) { - QByteArray& _ret = self->setRawData(a, static_cast(n)); - // Cast returned reference into pointer - return &_ret; -} - -QByteArray* QByteArray_Number(int param1) { - return new QByteArray(QByteArray::number(static_cast(param1))); -} - -QByteArray* QByteArray_NumberWithUint(unsigned int param1) { - return new QByteArray(QByteArray::number(static_cast(param1))); -} - -QByteArray* QByteArray_NumberWithQlonglong(long long param1) { - return new QByteArray(QByteArray::number(static_cast(param1))); -} - -QByteArray* QByteArray_NumberWithQulonglong(unsigned long long param1) { - return new QByteArray(QByteArray::number(static_cast(param1))); -} - -QByteArray* QByteArray_NumberWithDouble(double param1) { - return new QByteArray(QByteArray::number(static_cast(param1))); -} - -QByteArray* QByteArray_FromRawData(const char* param1, int size) { - return new QByteArray(QByteArray::fromRawData(param1, static_cast(size))); -} - -QByteArray__FromBase64Result* QByteArray_FromBase64Encoding(QByteArray* base64) { - return new QByteArray::FromBase64Result(QByteArray::fromBase64Encoding(*base64)); -} - -QByteArray* QByteArray_FromBase64(QByteArray* base64, int options) { - return new QByteArray(QByteArray::fromBase64(*base64, static_cast(options))); -} - -QByteArray* QByteArray_FromBase64WithBase64(QByteArray* base64) { - return new QByteArray(QByteArray::fromBase64(*base64)); -} - -QByteArray* QByteArray_FromHex(QByteArray* hexEncoded) { - return new QByteArray(QByteArray::fromHex(*hexEncoded)); -} - -QByteArray* QByteArray_FromPercentEncoding(QByteArray* pctEncoded) { - return new QByteArray(QByteArray::fromPercentEncoding(*pctEncoded)); -} - -char* QByteArray_Begin(QByteArray* self) { - QByteArray::iterator _ret = self->begin(); - return static_cast(_ret); -} - -const char* QByteArray_Begin2(const QByteArray* self) { - QByteArray::const_iterator _ret = self->begin(); - return const_cast(static_cast(_ret)); -} - -const char* QByteArray_Cbegin(const QByteArray* self) { - QByteArray::const_iterator _ret = self->cbegin(); - return const_cast(static_cast(_ret)); -} - -const char* QByteArray_ConstBegin(const QByteArray* self) { - QByteArray::const_iterator _ret = self->constBegin(); - return const_cast(static_cast(_ret)); -} - -char* QByteArray_End(QByteArray* self) { - QByteArray::iterator _ret = self->end(); - return static_cast(_ret); -} - -const char* QByteArray_End2(const QByteArray* self) { - QByteArray::const_iterator _ret = self->end(); - return const_cast(static_cast(_ret)); -} - -const char* QByteArray_Cend(const QByteArray* self) { - QByteArray::const_iterator _ret = self->cend(); - return const_cast(static_cast(_ret)); -} - -const char* QByteArray_ConstEnd(const QByteArray* self) { - QByteArray::const_iterator _ret = self->constEnd(); - return const_cast(static_cast(_ret)); -} - -void QByteArray_PushBack(QByteArray* self, char c) { - self->push_back(static_cast(c)); -} - -void QByteArray_PushBackWithChar(QByteArray* self, const char* c) { - self->push_back(c); -} - -void QByteArray_PushBackWithQByteArray(QByteArray* self, QByteArray* a) { - self->push_back(*a); -} - -void QByteArray_PushFront(QByteArray* self, char c) { - self->push_front(static_cast(c)); -} - -void QByteArray_PushFrontWithChar(QByteArray* self, const char* c) { - self->push_front(c); -} - -void QByteArray_PushFrontWithQByteArray(QByteArray* self, QByteArray* a) { - self->push_front(*a); -} - -void QByteArray_ShrinkToFit(QByteArray* self) { - self->shrink_to_fit(); -} - -int QByteArray_Count2(const QByteArray* self) { - return self->count(); -} - -int QByteArray_Length(const QByteArray* self) { - return self->length(); -} - -bool QByteArray_IsNull(const QByteArray* self) { - return self->isNull(); -} - -QByteArray* QByteArray_Fill2(QByteArray* self, char c, int size) { - QByteArray& _ret = self->fill(static_cast(c), static_cast(size)); - // Cast returned reference into pointer - return &_ret; -} - -int QByteArray_IndexOf2(const QByteArray* self, char c, int from) { - return self->indexOf(static_cast(c), static_cast(from)); -} - -int QByteArray_IndexOf22(const QByteArray* self, const char* c, int from) { - return self->indexOf(c, static_cast(from)); -} - -int QByteArray_IndexOf23(const QByteArray* self, QByteArray* a, int from) { - return self->indexOf(*a, static_cast(from)); -} - -int QByteArray_LastIndexOf2(const QByteArray* self, char c, int from) { - return self->lastIndexOf(static_cast(c), static_cast(from)); -} - -int QByteArray_LastIndexOf22(const QByteArray* self, const char* c, int from) { - return self->lastIndexOf(c, static_cast(from)); -} - -int QByteArray_LastIndexOf23(const QByteArray* self, QByteArray* a, int from) { - return self->lastIndexOf(*a, static_cast(from)); -} - -int QByteArray_Compare2(const QByteArray* self, const char* c, int cs) { - return self->compare(c, static_cast(cs)); -} - -int QByteArray_Compare22(const QByteArray* self, QByteArray* a, int cs) { - return self->compare(*a, static_cast(cs)); -} - -QByteArray* QByteArray_Mid2(const QByteArray* self, int index, int lenVal) { - return new QByteArray(self->mid(static_cast(index), static_cast(lenVal))); -} - -QByteArray* QByteArray_LeftJustified2(const QByteArray* self, int width, char fill) { - return new QByteArray(self->leftJustified(static_cast(width), static_cast(fill))); -} - -QByteArray* QByteArray_LeftJustified3(const QByteArray* self, int width, char fill, bool truncate) { - return new QByteArray(self->leftJustified(static_cast(width), static_cast(fill), truncate)); -} - -QByteArray* QByteArray_RightJustified2(const QByteArray* self, int width, char fill) { - return new QByteArray(self->rightJustified(static_cast(width), static_cast(fill))); -} - -QByteArray* QByteArray_RightJustified3(const QByteArray* self, int width, char fill, bool truncate) { - return new QByteArray(self->rightJustified(static_cast(width), static_cast(fill), truncate)); -} - -int QByteArray_IndexOf24(const QByteArray* self, struct miqt_string* s, int from) { - QString s_QString = QString::fromUtf8(&s->data, s->len); - return self->indexOf(s_QString, static_cast(from)); -} - -int QByteArray_LastIndexOf24(const QByteArray* self, struct miqt_string* s, int from) { - QString s_QString = QString::fromUtf8(&s->data, s->len); - return self->lastIndexOf(s_QString, static_cast(from)); -} - -int16_t QByteArray_ToShort1(const QByteArray* self, bool* ok) { - return self->toShort(ok); -} - -int16_t QByteArray_ToShort2(const QByteArray* self, bool* ok, int base) { - return self->toShort(ok, static_cast(base)); -} - -uint16_t QByteArray_ToUShort1(const QByteArray* self, bool* ok) { - ushort _ret = self->toUShort(ok); - return static_cast(_ret); -} - -uint16_t QByteArray_ToUShort2(const QByteArray* self, bool* ok, int base) { - ushort _ret = self->toUShort(ok, static_cast(base)); - return static_cast(_ret); -} - -int QByteArray_ToInt1(const QByteArray* self, bool* ok) { - return self->toInt(ok); -} - -int QByteArray_ToInt2(const QByteArray* self, bool* ok, int base) { - return self->toInt(ok, static_cast(base)); -} - -unsigned int QByteArray_ToUInt1(const QByteArray* self, bool* ok) { - uint _ret = self->toUInt(ok); - return static_cast(_ret); -} - -unsigned int QByteArray_ToUInt2(const QByteArray* self, bool* ok, int base) { - uint _ret = self->toUInt(ok, static_cast(base)); - return static_cast(_ret); -} - -long QByteArray_ToLong1(const QByteArray* self, bool* ok) { - return self->toLong(ok); -} - -long QByteArray_ToLong2(const QByteArray* self, bool* ok, int base) { - return self->toLong(ok, static_cast(base)); -} - -unsigned long QByteArray_ToULong1(const QByteArray* self, bool* ok) { - ulong _ret = self->toULong(ok); - return static_cast(_ret); -} - -unsigned long QByteArray_ToULong2(const QByteArray* self, bool* ok, int base) { - ulong _ret = self->toULong(ok, static_cast(base)); - return static_cast(_ret); -} - -long long QByteArray_ToLongLong1(const QByteArray* self, bool* ok) { - qlonglong _ret = self->toLongLong(ok); - return static_cast(_ret); -} - -long long QByteArray_ToLongLong2(const QByteArray* self, bool* ok, int base) { - qlonglong _ret = self->toLongLong(ok, static_cast(base)); - return static_cast(_ret); -} - -unsigned long long QByteArray_ToULongLong1(const QByteArray* self, bool* ok) { - qulonglong _ret = self->toULongLong(ok); - return static_cast(_ret); -} - -unsigned long long QByteArray_ToULongLong2(const QByteArray* self, bool* ok, int base) { - qulonglong _ret = self->toULongLong(ok, static_cast(base)); - return static_cast(_ret); -} - -float QByteArray_ToFloat1(const QByteArray* self, bool* ok) { - return self->toFloat(ok); -} - -double QByteArray_ToDouble1(const QByteArray* self, bool* ok) { - return self->toDouble(ok); -} - -QByteArray* QByteArray_ToPercentEncoding1(const QByteArray* self, QByteArray* exclude) { - return new QByteArray(self->toPercentEncoding(*exclude)); -} - -QByteArray* QByteArray_ToPercentEncoding2(const QByteArray* self, QByteArray* exclude, QByteArray* include) { - return new QByteArray(self->toPercentEncoding(*exclude, *include)); -} - -QByteArray* QByteArray_ToPercentEncoding3(const QByteArray* self, QByteArray* exclude, QByteArray* include, char percent) { - return new QByteArray(self->toPercentEncoding(*exclude, *include, static_cast(percent))); -} - -QByteArray* QByteArray_SetNum2(QByteArray* self, int16_t param1, int base) { - QByteArray& _ret = self->setNum(static_cast(param1), static_cast(base)); - // Cast returned reference into pointer - return &_ret; -} - -QByteArray* QByteArray_SetNum22(QByteArray* self, uint16_t param1, int base) { - QByteArray& _ret = self->setNum(static_cast(param1), static_cast(base)); - // Cast returned reference into pointer - return &_ret; -} - -QByteArray* QByteArray_SetNum23(QByteArray* self, int param1, int base) { - QByteArray& _ret = self->setNum(static_cast(param1), static_cast(base)); - // Cast returned reference into pointer - return &_ret; -} - -QByteArray* QByteArray_SetNum24(QByteArray* self, unsigned int param1, int base) { - QByteArray& _ret = self->setNum(static_cast(param1), static_cast(base)); - // Cast returned reference into pointer - return &_ret; -} - -QByteArray* QByteArray_SetNum25(QByteArray* self, long long param1, int base) { - QByteArray& _ret = self->setNum(static_cast(param1), static_cast(base)); - // Cast returned reference into pointer - return &_ret; -} - -QByteArray* QByteArray_SetNum26(QByteArray* self, unsigned long long param1, int base) { - QByteArray& _ret = self->setNum(static_cast(param1), static_cast(base)); - // Cast returned reference into pointer - return &_ret; -} - -QByteArray* QByteArray_SetNum27(QByteArray* self, float param1, char f) { - QByteArray& _ret = self->setNum(static_cast(param1), static_cast(f)); - // Cast returned reference into pointer - return &_ret; -} - -QByteArray* QByteArray_SetNum3(QByteArray* self, float param1, char f, int prec) { - QByteArray& _ret = self->setNum(static_cast(param1), static_cast(f), static_cast(prec)); - // Cast returned reference into pointer - return &_ret; -} - -QByteArray* QByteArray_SetNum28(QByteArray* self, double param1, char f) { - QByteArray& _ret = self->setNum(static_cast(param1), static_cast(f)); - // Cast returned reference into pointer - return &_ret; -} - -QByteArray* QByteArray_SetNum32(QByteArray* self, double param1, char f, int prec) { - QByteArray& _ret = self->setNum(static_cast(param1), static_cast(f), static_cast(prec)); - // Cast returned reference into pointer - return &_ret; -} - -QByteArray* QByteArray_Number2(int param1, int base) { - return new QByteArray(QByteArray::number(static_cast(param1), static_cast(base))); -} - -QByteArray* QByteArray_Number22(unsigned int param1, int base) { - return new QByteArray(QByteArray::number(static_cast(param1), static_cast(base))); -} - -QByteArray* QByteArray_Number23(long long param1, int base) { - return new QByteArray(QByteArray::number(static_cast(param1), static_cast(base))); -} - -QByteArray* QByteArray_Number24(unsigned long long param1, int base) { - return new QByteArray(QByteArray::number(static_cast(param1), static_cast(base))); -} - -QByteArray* QByteArray_Number25(double param1, char f) { - return new QByteArray(QByteArray::number(static_cast(param1), static_cast(f))); -} - -QByteArray* QByteArray_Number3(double param1, char f, int prec) { - return new QByteArray(QByteArray::number(static_cast(param1), static_cast(f), static_cast(prec))); -} - -QByteArray__FromBase64Result* QByteArray_FromBase64Encoding2(QByteArray* base64, int options) { - return new QByteArray::FromBase64Result(QByteArray::fromBase64Encoding(*base64, static_cast(options))); -} - -QByteArray* QByteArray_FromPercentEncoding2(QByteArray* pctEncoded, char percent) { - return new QByteArray(QByteArray::fromPercentEncoding(*pctEncoded, static_cast(percent))); -} - -void QByteArray_Delete(QByteArray* self) { - delete self; -} - -QByteRef* QByteRef_new(QByteRef* param1) { - return new QByteRef(*param1); -} - -void QByteRef_OperatorAssign(QByteRef* self, char c) { - self->operator=(static_cast(c)); -} - -void QByteRef_OperatorAssignWithQByteRef(QByteRef* self, QByteRef* c) { - self->operator=(*c); -} - -bool QByteRef_OperatorEqual(const QByteRef* self, char c) { - return self->operator==(static_cast(c)); -} - -bool QByteRef_OperatorNotEqual(const QByteRef* self, char c) { - return self->operator!=(static_cast(c)); -} - -bool QByteRef_OperatorGreater(const QByteRef* self, char c) { - return self->operator>(static_cast(c)); -} - -bool QByteRef_OperatorGreaterOrEqual(const QByteRef* self, char c) { - return self->operator>=(static_cast(c)); -} - -bool QByteRef_OperatorLesser(const QByteRef* self, char c) { - return self->operator<(static_cast(c)); -} - -bool QByteRef_OperatorLesserOrEqual(const QByteRef* self, char c) { - return self->operator<=(static_cast(c)); -} - -void QByteRef_Delete(QByteRef* self) { - delete self; -} - -QByteArray__FromBase64Result* QByteArray__FromBase64Result_new(QByteArray__FromBase64Result* param1) { - return new QByteArray::FromBase64Result(*param1); -} - -void QByteArray__FromBase64Result_Swap(QByteArray__FromBase64Result* self, QByteArray__FromBase64Result* other) { - self->swap(*other); -} - -QByteArray* QByteArray__FromBase64Result_OperatorMultiply(QByteArray__FromBase64Result* self) { - QByteArray& _ret = self->operator*(); - // Cast returned reference into pointer - return &_ret; -} - -QByteArray* QByteArray__FromBase64Result_OperatorMultiply2(const QByteArray__FromBase64Result* self) { - const QByteArray& _ret = self->operator*(); - // Cast returned reference into pointer - return const_cast(&_ret); -} - -void QByteArray__FromBase64Result_OperatorAssign(QByteArray__FromBase64Result* self, QByteArray__FromBase64Result* param1) { - self->operator=(*param1); -} - -void QByteArray__FromBase64Result_Delete(QByteArray__FromBase64Result* self) { - delete self; -} - diff --git a/qt/gen_qbytearray.go b/qt/gen_qbytearray.go deleted file mode 100644 index c8f01140..00000000 --- a/qt/gen_qbytearray.go +++ /dev/null @@ -1,1453 +0,0 @@ -package qt - -/* - -#include "gen_qbytearray.h" -#include - -*/ -import "C" - -import ( - "github.com/mappu/miqt/libmiqt" - "runtime" - "unsafe" -) - -type DeprecatedRefClassBehavior__EmittingClass int - -const ( - DeprecatedRefClassBehavior__QByteRef DeprecatedRefClassBehavior__EmittingClass = 0 - DeprecatedRefClassBehavior__QCharRef DeprecatedRefClassBehavior__EmittingClass = 1 -) - -type DeprecatedRefClassBehavior__WarningType int - -const ( - DeprecatedRefClassBehavior__OutOfRange DeprecatedRefClassBehavior__WarningType = 0 - DeprecatedRefClassBehavior__DelayedDetach DeprecatedRefClassBehavior__WarningType = 1 -) - -type QByteArray__Base64Option int - -const ( - QByteArray__Base64Encoding QByteArray__Base64Option = 0 - QByteArray__Base64UrlEncoding QByteArray__Base64Option = 1 - QByteArray__KeepTrailingEquals QByteArray__Base64Option = 0 - QByteArray__OmitTrailingEquals QByteArray__Base64Option = 2 - QByteArray__IgnoreBase64DecodingErrors QByteArray__Base64Option = 0 - QByteArray__AbortOnBase64DecodingErrors QByteArray__Base64Option = 4 -) - -type QByteArray__Base64DecodingStatus int - -const ( - QByteArray__Ok QByteArray__Base64DecodingStatus = 0 - QByteArray__IllegalInputLength QByteArray__Base64DecodingStatus = 1 - QByteArray__IllegalCharacter QByteArray__Base64DecodingStatus = 2 - QByteArray__IllegalPadding QByteArray__Base64DecodingStatus = 3 -) - -type QByteArrayDataPtr struct { - h *C.QByteArrayDataPtr -} - -func (this *QByteArrayDataPtr) cPointer() *C.QByteArrayDataPtr { - if this == nil { - return nil - } - return this.h -} - -func (this *QByteArrayDataPtr) UnsafePointer() unsafe.Pointer { - if this == nil { - return nil - } - return unsafe.Pointer(this.h) -} - -func newQByteArrayDataPtr(h *C.QByteArrayDataPtr) *QByteArrayDataPtr { - if h == nil { - return nil - } - return &QByteArrayDataPtr{h: h} -} - -func UnsafeNewQByteArrayDataPtr(h unsafe.Pointer) *QByteArrayDataPtr { - return newQByteArrayDataPtr((*C.QByteArrayDataPtr)(h)) -} - -// NewQByteArrayDataPtr constructs a new QByteArrayDataPtr object. -func NewQByteArrayDataPtr() *QByteArrayDataPtr { - ret := C.QByteArrayDataPtr_new() - return newQByteArrayDataPtr(ret) -} - -// NewQByteArrayDataPtr2 constructs a new QByteArrayDataPtr object. -func NewQByteArrayDataPtr2(param1 *QByteArrayDataPtr) *QByteArrayDataPtr { - ret := C.QByteArrayDataPtr_new2(param1.cPointer()) - return newQByteArrayDataPtr(ret) -} - -// Delete this object from C++ memory. -func (this *QByteArrayDataPtr) Delete() { - C.QByteArrayDataPtr_Delete(this.h) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QByteArrayDataPtr) GoGC() { - runtime.SetFinalizer(this, func(this *QByteArrayDataPtr) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} - -type QByteArray struct { - h *C.QByteArray -} - -func (this *QByteArray) cPointer() *C.QByteArray { - if this == nil { - return nil - } - return this.h -} - -func (this *QByteArray) UnsafePointer() unsafe.Pointer { - if this == nil { - return nil - } - return unsafe.Pointer(this.h) -} - -func newQByteArray(h *C.QByteArray) *QByteArray { - if h == nil { - return nil - } - return &QByteArray{h: h} -} - -func UnsafeNewQByteArray(h unsafe.Pointer) *QByteArray { - return newQByteArray((*C.QByteArray)(h)) -} - -// NewQByteArray constructs a new QByteArray object. -func NewQByteArray() *QByteArray { - ret := C.QByteArray_new() - return newQByteArray(ret) -} - -// NewQByteArray2 constructs a new QByteArray object. -func NewQByteArray2(param1 string) *QByteArray { - param1_Cstring := C.CString(param1) - defer C.free(unsafe.Pointer(param1_Cstring)) - ret := C.QByteArray_new2(param1_Cstring) - return newQByteArray(ret) -} - -// NewQByteArray3 constructs a new QByteArray object. -func NewQByteArray3(size int, c int8) *QByteArray { - ret := C.QByteArray_new3((C.int)(size), (C.char)(c)) - return newQByteArray(ret) -} - -// NewQByteArray4 constructs a new QByteArray object. -func NewQByteArray4(size int, param2 Initialization) *QByteArray { - ret := C.QByteArray_new4((C.int)(size), (C.int)(param2)) - return newQByteArray(ret) -} - -// NewQByteArray5 constructs a new QByteArray object. -func NewQByteArray5(param1 *QByteArray) *QByteArray { - ret := C.QByteArray_new5(param1.cPointer()) - return newQByteArray(ret) -} - -// NewQByteArray6 constructs a new QByteArray object. -func NewQByteArray6(dd QByteArrayDataPtr) *QByteArray { - ret := C.QByteArray_new6(dd.cPointer()) - return newQByteArray(ret) -} - -// NewQByteArray7 constructs a new QByteArray object. -func NewQByteArray7(param1 string, size int) *QByteArray { - param1_Cstring := C.CString(param1) - defer C.free(unsafe.Pointer(param1_Cstring)) - ret := C.QByteArray_new7(param1_Cstring, (C.int)(size)) - return newQByteArray(ret) -} - -func (this *QByteArray) OperatorAssign(param1 *QByteArray) { - C.QByteArray_OperatorAssign(this.h, param1.cPointer()) -} - -func (this *QByteArray) OperatorAssignWithStr(str string) { - str_Cstring := C.CString(str) - defer C.free(unsafe.Pointer(str_Cstring)) - C.QByteArray_OperatorAssignWithStr(this.h, str_Cstring) -} - -func (this *QByteArray) Swap(other *QByteArray) { - C.QByteArray_Swap(this.h, other.cPointer()) -} - -func (this *QByteArray) Size() int { - return (int)(C.QByteArray_Size(this.h)) -} - -func (this *QByteArray) IsEmpty() bool { - return (bool)(C.QByteArray_IsEmpty(this.h)) -} - -func (this *QByteArray) Resize(size int) { - C.QByteArray_Resize(this.h, (C.int)(size)) -} - -func (this *QByteArray) Fill(c int8) *QByteArray { - return UnsafeNewQByteArray(unsafe.Pointer(C.QByteArray_Fill(this.h, (C.char)(c)))) -} - -func (this *QByteArray) Capacity() int { - return (int)(C.QByteArray_Capacity(this.h)) -} - -func (this *QByteArray) Reserve(size int) { - C.QByteArray_Reserve(this.h, (C.int)(size)) -} - -func (this *QByteArray) Squeeze() { - C.QByteArray_Squeeze(this.h) -} - -func (this *QByteArray) Data() unsafe.Pointer { - _ret := C.QByteArray_Data(this.h) - return (unsafe.Pointer)(_ret) -} - -func (this *QByteArray) Data2() unsafe.Pointer { - _ret := C.QByteArray_Data2(this.h) - return (unsafe.Pointer)(_ret) -} - -func (this *QByteArray) ConstData() unsafe.Pointer { - _ret := C.QByteArray_ConstData(this.h) - return (unsafe.Pointer)(_ret) -} - -func (this *QByteArray) Detach() { - C.QByteArray_Detach(this.h) -} - -func (this *QByteArray) IsDetached() bool { - return (bool)(C.QByteArray_IsDetached(this.h)) -} - -func (this *QByteArray) IsSharedWith(other *QByteArray) bool { - return (bool)(C.QByteArray_IsSharedWith(this.h, other.cPointer())) -} - -func (this *QByteArray) Clear() { - C.QByteArray_Clear(this.h) -} - -func (this *QByteArray) At(i int) int8 { - return (int8)(C.QByteArray_At(this.h, (C.int)(i))) -} - -func (this *QByteArray) OperatorSubscript(i int) int8 { - return (int8)(C.QByteArray_OperatorSubscript(this.h, (C.int)(i))) -} - -func (this *QByteArray) OperatorSubscriptWithUint(i uint) int8 { - return (int8)(C.QByteArray_OperatorSubscriptWithUint(this.h, (C.uint)(i))) -} - -func (this *QByteArray) OperatorSubscriptWithInt(i int) *QByteRef { - _ret := C.QByteArray_OperatorSubscriptWithInt(this.h, (C.int)(i)) - _goptr := newQByteRef(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QByteArray) OperatorSubscript2(i uint) *QByteRef { - _ret := C.QByteArray_OperatorSubscript2(this.h, (C.uint)(i)) - _goptr := newQByteRef(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QByteArray) Front() int8 { - return (int8)(C.QByteArray_Front(this.h)) -} - -func (this *QByteArray) Front2() *QByteRef { - _ret := C.QByteArray_Front2(this.h) - _goptr := newQByteRef(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QByteArray) Back() int8 { - return (int8)(C.QByteArray_Back(this.h)) -} - -func (this *QByteArray) Back2() *QByteRef { - _ret := C.QByteArray_Back2(this.h) - _goptr := newQByteRef(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QByteArray) IndexOf(c int8) int { - return (int)(C.QByteArray_IndexOf(this.h, (C.char)(c))) -} - -func (this *QByteArray) IndexOfWithChar(c string) int { - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - return (int)(C.QByteArray_IndexOfWithChar(this.h, c_Cstring)) -} - -func (this *QByteArray) IndexOfWithQByteArray(a *QByteArray) int { - return (int)(C.QByteArray_IndexOfWithQByteArray(this.h, a.cPointer())) -} - -func (this *QByteArray) LastIndexOf(c int8) int { - return (int)(C.QByteArray_LastIndexOf(this.h, (C.char)(c))) -} - -func (this *QByteArray) LastIndexOfWithChar(c string) int { - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - return (int)(C.QByteArray_LastIndexOfWithChar(this.h, c_Cstring)) -} - -func (this *QByteArray) LastIndexOfWithQByteArray(a *QByteArray) int { - return (int)(C.QByteArray_LastIndexOfWithQByteArray(this.h, a.cPointer())) -} - -func (this *QByteArray) Contains(c int8) bool { - return (bool)(C.QByteArray_Contains(this.h, (C.char)(c))) -} - -func (this *QByteArray) ContainsWithChar(a string) bool { - a_Cstring := C.CString(a) - defer C.free(unsafe.Pointer(a_Cstring)) - return (bool)(C.QByteArray_ContainsWithChar(this.h, a_Cstring)) -} - -func (this *QByteArray) ContainsWithQByteArray(a *QByteArray) bool { - return (bool)(C.QByteArray_ContainsWithQByteArray(this.h, a.cPointer())) -} - -func (this *QByteArray) Count(c int8) int { - return (int)(C.QByteArray_Count(this.h, (C.char)(c))) -} - -func (this *QByteArray) CountWithChar(a string) int { - a_Cstring := C.CString(a) - defer C.free(unsafe.Pointer(a_Cstring)) - return (int)(C.QByteArray_CountWithChar(this.h, a_Cstring)) -} - -func (this *QByteArray) CountWithQByteArray(a *QByteArray) int { - return (int)(C.QByteArray_CountWithQByteArray(this.h, a.cPointer())) -} - -func (this *QByteArray) Compare(c string) int { - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - return (int)(C.QByteArray_Compare(this.h, c_Cstring)) -} - -func (this *QByteArray) CompareWithQByteArray(a *QByteArray) int { - return (int)(C.QByteArray_CompareWithQByteArray(this.h, a.cPointer())) -} - -func (this *QByteArray) Left(lenVal int) *QByteArray { - _ret := C.QByteArray_Left(this.h, (C.int)(lenVal)) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QByteArray) Right(lenVal int) *QByteArray { - _ret := C.QByteArray_Right(this.h, (C.int)(lenVal)) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QByteArray) Mid(index int) *QByteArray { - _ret := C.QByteArray_Mid(this.h, (C.int)(index)) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QByteArray) Chopped(lenVal int) *QByteArray { - _ret := C.QByteArray_Chopped(this.h, (C.int)(lenVal)) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QByteArray) StartsWith(a *QByteArray) bool { - return (bool)(C.QByteArray_StartsWith(this.h, a.cPointer())) -} - -func (this *QByteArray) StartsWithWithChar(c int8) bool { - return (bool)(C.QByteArray_StartsWithWithChar(this.h, (C.char)(c))) -} - -func (this *QByteArray) StartsWith2(c string) bool { - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - return (bool)(C.QByteArray_StartsWith2(this.h, c_Cstring)) -} - -func (this *QByteArray) EndsWith(a *QByteArray) bool { - return (bool)(C.QByteArray_EndsWith(this.h, a.cPointer())) -} - -func (this *QByteArray) EndsWithWithChar(c int8) bool { - return (bool)(C.QByteArray_EndsWithWithChar(this.h, (C.char)(c))) -} - -func (this *QByteArray) EndsWith2(c string) bool { - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - return (bool)(C.QByteArray_EndsWith2(this.h, c_Cstring)) -} - -func (this *QByteArray) IsUpper() bool { - return (bool)(C.QByteArray_IsUpper(this.h)) -} - -func (this *QByteArray) IsLower() bool { - return (bool)(C.QByteArray_IsLower(this.h)) -} - -func (this *QByteArray) Truncate(pos int) { - C.QByteArray_Truncate(this.h, (C.int)(pos)) -} - -func (this *QByteArray) Chop(n int) { - C.QByteArray_Chop(this.h, (C.int)(n)) -} - -func (this *QByteArray) ToLower() *QByteArray { - _ret := C.QByteArray_ToLower(this.h) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QByteArray) ToUpper() *QByteArray { - _ret := C.QByteArray_ToUpper(this.h) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QByteArray) Trimmed() *QByteArray { - _ret := C.QByteArray_Trimmed(this.h) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QByteArray) Simplified() *QByteArray { - _ret := C.QByteArray_Simplified(this.h) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QByteArray) LeftJustified(width int) *QByteArray { - _ret := C.QByteArray_LeftJustified(this.h, (C.int)(width)) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QByteArray) RightJustified(width int) *QByteArray { - _ret := C.QByteArray_RightJustified(this.h, (C.int)(width)) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QByteArray) Prepend(c int8) *QByteArray { - return UnsafeNewQByteArray(unsafe.Pointer(C.QByteArray_Prepend(this.h, (C.char)(c)))) -} - -func (this *QByteArray) Prepend2(count int, c int8) *QByteArray { - return UnsafeNewQByteArray(unsafe.Pointer(C.QByteArray_Prepend2(this.h, (C.int)(count), (C.char)(c)))) -} - -func (this *QByteArray) PrependWithChar(s string) *QByteArray { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - return UnsafeNewQByteArray(unsafe.Pointer(C.QByteArray_PrependWithChar(this.h, s_Cstring))) -} - -func (this *QByteArray) Prepend3(s string, lenVal int) *QByteArray { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - return UnsafeNewQByteArray(unsafe.Pointer(C.QByteArray_Prepend3(this.h, s_Cstring, (C.int)(lenVal)))) -} - -func (this *QByteArray) PrependWithQByteArray(a *QByteArray) *QByteArray { - return UnsafeNewQByteArray(unsafe.Pointer(C.QByteArray_PrependWithQByteArray(this.h, a.cPointer()))) -} - -func (this *QByteArray) Append(c int8) *QByteArray { - return UnsafeNewQByteArray(unsafe.Pointer(C.QByteArray_Append(this.h, (C.char)(c)))) -} - -func (this *QByteArray) Append2(count int, c int8) *QByteArray { - return UnsafeNewQByteArray(unsafe.Pointer(C.QByteArray_Append2(this.h, (C.int)(count), (C.char)(c)))) -} - -func (this *QByteArray) AppendWithChar(s string) *QByteArray { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - return UnsafeNewQByteArray(unsafe.Pointer(C.QByteArray_AppendWithChar(this.h, s_Cstring))) -} - -func (this *QByteArray) Append3(s string, lenVal int) *QByteArray { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - return UnsafeNewQByteArray(unsafe.Pointer(C.QByteArray_Append3(this.h, s_Cstring, (C.int)(lenVal)))) -} - -func (this *QByteArray) AppendWithQByteArray(a *QByteArray) *QByteArray { - return UnsafeNewQByteArray(unsafe.Pointer(C.QByteArray_AppendWithQByteArray(this.h, a.cPointer()))) -} - -func (this *QByteArray) Insert(i int, c int8) *QByteArray { - return UnsafeNewQByteArray(unsafe.Pointer(C.QByteArray_Insert(this.h, (C.int)(i), (C.char)(c)))) -} - -func (this *QByteArray) Insert2(i int, count int, c int8) *QByteArray { - return UnsafeNewQByteArray(unsafe.Pointer(C.QByteArray_Insert2(this.h, (C.int)(i), (C.int)(count), (C.char)(c)))) -} - -func (this *QByteArray) Insert3(i int, s string) *QByteArray { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - return UnsafeNewQByteArray(unsafe.Pointer(C.QByteArray_Insert3(this.h, (C.int)(i), s_Cstring))) -} - -func (this *QByteArray) Insert4(i int, s string, lenVal int) *QByteArray { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - return UnsafeNewQByteArray(unsafe.Pointer(C.QByteArray_Insert4(this.h, (C.int)(i), s_Cstring, (C.int)(lenVal)))) -} - -func (this *QByteArray) Insert5(i int, a *QByteArray) *QByteArray { - return UnsafeNewQByteArray(unsafe.Pointer(C.QByteArray_Insert5(this.h, (C.int)(i), a.cPointer()))) -} - -func (this *QByteArray) Remove(index int, lenVal int) *QByteArray { - return UnsafeNewQByteArray(unsafe.Pointer(C.QByteArray_Remove(this.h, (C.int)(index), (C.int)(lenVal)))) -} - -func (this *QByteArray) Replace(index int, lenVal int, s string) *QByteArray { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - return UnsafeNewQByteArray(unsafe.Pointer(C.QByteArray_Replace(this.h, (C.int)(index), (C.int)(lenVal), s_Cstring))) -} - -func (this *QByteArray) Replace2(index int, lenVal int, s string, alen int) *QByteArray { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - return UnsafeNewQByteArray(unsafe.Pointer(C.QByteArray_Replace2(this.h, (C.int)(index), (C.int)(lenVal), s_Cstring, (C.int)(alen)))) -} - -func (this *QByteArray) Replace3(index int, lenVal int, s *QByteArray) *QByteArray { - return UnsafeNewQByteArray(unsafe.Pointer(C.QByteArray_Replace3(this.h, (C.int)(index), (C.int)(lenVal), s.cPointer()))) -} - -func (this *QByteArray) Replace4(before int8, after string) *QByteArray { - after_Cstring := C.CString(after) - defer C.free(unsafe.Pointer(after_Cstring)) - return UnsafeNewQByteArray(unsafe.Pointer(C.QByteArray_Replace4(this.h, (C.char)(before), after_Cstring))) -} - -func (this *QByteArray) Replace5(before int8, after *QByteArray) *QByteArray { - return UnsafeNewQByteArray(unsafe.Pointer(C.QByteArray_Replace5(this.h, (C.char)(before), after.cPointer()))) -} - -func (this *QByteArray) Replace6(before string, after string) *QByteArray { - before_Cstring := C.CString(before) - defer C.free(unsafe.Pointer(before_Cstring)) - after_Cstring := C.CString(after) - defer C.free(unsafe.Pointer(after_Cstring)) - return UnsafeNewQByteArray(unsafe.Pointer(C.QByteArray_Replace6(this.h, before_Cstring, after_Cstring))) -} - -func (this *QByteArray) Replace7(before string, bsize int, after string, asize int) *QByteArray { - before_Cstring := C.CString(before) - defer C.free(unsafe.Pointer(before_Cstring)) - after_Cstring := C.CString(after) - defer C.free(unsafe.Pointer(after_Cstring)) - return UnsafeNewQByteArray(unsafe.Pointer(C.QByteArray_Replace7(this.h, before_Cstring, (C.int)(bsize), after_Cstring, (C.int)(asize)))) -} - -func (this *QByteArray) Replace8(before *QByteArray, after *QByteArray) *QByteArray { - return UnsafeNewQByteArray(unsafe.Pointer(C.QByteArray_Replace8(this.h, before.cPointer(), after.cPointer()))) -} - -func (this *QByteArray) Replace9(before *QByteArray, after string) *QByteArray { - after_Cstring := C.CString(after) - defer C.free(unsafe.Pointer(after_Cstring)) - return UnsafeNewQByteArray(unsafe.Pointer(C.QByteArray_Replace9(this.h, before.cPointer(), after_Cstring))) -} - -func (this *QByteArray) Replace10(before string, after *QByteArray) *QByteArray { - before_Cstring := C.CString(before) - defer C.free(unsafe.Pointer(before_Cstring)) - return UnsafeNewQByteArray(unsafe.Pointer(C.QByteArray_Replace10(this.h, before_Cstring, after.cPointer()))) -} - -func (this *QByteArray) Replace11(before int8, after int8) *QByteArray { - return UnsafeNewQByteArray(unsafe.Pointer(C.QByteArray_Replace11(this.h, (C.char)(before), (C.char)(after)))) -} - -func (this *QByteArray) OperatorPlusAssign(c int8) *QByteArray { - return UnsafeNewQByteArray(unsafe.Pointer(C.QByteArray_OperatorPlusAssign(this.h, (C.char)(c)))) -} - -func (this *QByteArray) OperatorPlusAssignWithChar(s string) *QByteArray { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - return UnsafeNewQByteArray(unsafe.Pointer(C.QByteArray_OperatorPlusAssignWithChar(this.h, s_Cstring))) -} - -func (this *QByteArray) OperatorPlusAssignWithQByteArray(a *QByteArray) *QByteArray { - return UnsafeNewQByteArray(unsafe.Pointer(C.QByteArray_OperatorPlusAssignWithQByteArray(this.h, a.cPointer()))) -} - -func (this *QByteArray) Split(sep int8) []QByteArray { - var _ma *C.struct_miqt_array = C.QByteArray_Split(this.h, (C.char)(sep)) - _ret := make([]QByteArray, int(_ma.len)) - _outCast := (*[0xffff]*C.QByteArray)(unsafe.Pointer(_ma.data)) // hey ya - for i := 0; i < int(_ma.len); i++ { - _lv_ret := _outCast[i] - _lv_goptr := newQByteArray(_lv_ret) - _lv_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - _ret[i] = *_lv_goptr - } - C.free(unsafe.Pointer(_ma)) - return _ret -} - -func (this *QByteArray) Repeated(times int) *QByteArray { - _ret := C.QByteArray_Repeated(this.h, (C.int)(times)) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QByteArray) AppendWithQString(s string) *QByteArray { - s_ms := libmiqt.Strdupg(s) - defer C.free(s_ms) - return UnsafeNewQByteArray(unsafe.Pointer(C.QByteArray_AppendWithQString(this.h, (*C.struct_miqt_string)(s_ms)))) -} - -func (this *QByteArray) Insert6(i int, s string) *QByteArray { - s_ms := libmiqt.Strdupg(s) - defer C.free(s_ms) - return UnsafeNewQByteArray(unsafe.Pointer(C.QByteArray_Insert6(this.h, (C.int)(i), (*C.struct_miqt_string)(s_ms)))) -} - -func (this *QByteArray) Replace12(before string, after string) *QByteArray { - before_ms := libmiqt.Strdupg(before) - defer C.free(before_ms) - after_Cstring := C.CString(after) - defer C.free(unsafe.Pointer(after_Cstring)) - return UnsafeNewQByteArray(unsafe.Pointer(C.QByteArray_Replace12(this.h, (*C.struct_miqt_string)(before_ms), after_Cstring))) -} - -func (this *QByteArray) Replace13(c int8, after string) *QByteArray { - after_ms := libmiqt.Strdupg(after) - defer C.free(after_ms) - return UnsafeNewQByteArray(unsafe.Pointer(C.QByteArray_Replace13(this.h, (C.char)(c), (*C.struct_miqt_string)(after_ms)))) -} - -func (this *QByteArray) Replace14(before string, after *QByteArray) *QByteArray { - before_ms := libmiqt.Strdupg(before) - defer C.free(before_ms) - return UnsafeNewQByteArray(unsafe.Pointer(C.QByteArray_Replace14(this.h, (*C.struct_miqt_string)(before_ms), after.cPointer()))) -} - -func (this *QByteArray) OperatorPlusAssignWithQString(s string) *QByteArray { - s_ms := libmiqt.Strdupg(s) - defer C.free(s_ms) - return UnsafeNewQByteArray(unsafe.Pointer(C.QByteArray_OperatorPlusAssignWithQString(this.h, (*C.struct_miqt_string)(s_ms)))) -} - -func (this *QByteArray) IndexOfWithQString(s string) int { - s_ms := libmiqt.Strdupg(s) - defer C.free(s_ms) - return (int)(C.QByteArray_IndexOfWithQString(this.h, (*C.struct_miqt_string)(s_ms))) -} - -func (this *QByteArray) LastIndexOfWithQString(s string) int { - s_ms := libmiqt.Strdupg(s) - defer C.free(s_ms) - return (int)(C.QByteArray_LastIndexOfWithQString(this.h, (*C.struct_miqt_string)(s_ms))) -} - -func (this *QByteArray) OperatorEqual(s2 string) bool { - s2_ms := libmiqt.Strdupg(s2) - defer C.free(s2_ms) - return (bool)(C.QByteArray_OperatorEqual(this.h, (*C.struct_miqt_string)(s2_ms))) -} - -func (this *QByteArray) OperatorNotEqual(s2 string) bool { - s2_ms := libmiqt.Strdupg(s2) - defer C.free(s2_ms) - return (bool)(C.QByteArray_OperatorNotEqual(this.h, (*C.struct_miqt_string)(s2_ms))) -} - -func (this *QByteArray) OperatorLesser(s2 string) bool { - s2_ms := libmiqt.Strdupg(s2) - defer C.free(s2_ms) - return (bool)(C.QByteArray_OperatorLesser(this.h, (*C.struct_miqt_string)(s2_ms))) -} - -func (this *QByteArray) OperatorGreater(s2 string) bool { - s2_ms := libmiqt.Strdupg(s2) - defer C.free(s2_ms) - return (bool)(C.QByteArray_OperatorGreater(this.h, (*C.struct_miqt_string)(s2_ms))) -} - -func (this *QByteArray) OperatorLesserOrEqual(s2 string) bool { - s2_ms := libmiqt.Strdupg(s2) - defer C.free(s2_ms) - return (bool)(C.QByteArray_OperatorLesserOrEqual(this.h, (*C.struct_miqt_string)(s2_ms))) -} - -func (this *QByteArray) OperatorGreaterOrEqual(s2 string) bool { - s2_ms := libmiqt.Strdupg(s2) - defer C.free(s2_ms) - return (bool)(C.QByteArray_OperatorGreaterOrEqual(this.h, (*C.struct_miqt_string)(s2_ms))) -} - -func (this *QByteArray) ToShort() int16 { - return (int16)(C.QByteArray_ToShort(this.h)) -} - -func (this *QByteArray) ToUShort() uint16 { - return (uint16)(C.QByteArray_ToUShort(this.h)) -} - -func (this *QByteArray) ToInt() int { - return (int)(C.QByteArray_ToInt(this.h)) -} - -func (this *QByteArray) ToUInt() uint { - return (uint)(C.QByteArray_ToUInt(this.h)) -} - -func (this *QByteArray) ToLong() int64 { - return (int64)(C.QByteArray_ToLong(this.h)) -} - -func (this *QByteArray) ToULong() uint64 { - return (uint64)(C.QByteArray_ToULong(this.h)) -} - -func (this *QByteArray) ToLongLong() int64 { - return (int64)(C.QByteArray_ToLongLong(this.h)) -} - -func (this *QByteArray) ToULongLong() uint64 { - return (uint64)(C.QByteArray_ToULongLong(this.h)) -} - -func (this *QByteArray) ToFloat() float32 { - return (float32)(C.QByteArray_ToFloat(this.h)) -} - -func (this *QByteArray) ToDouble() float64 { - return (float64)(C.QByteArray_ToDouble(this.h)) -} - -func (this *QByteArray) ToBase64(options QByteArray__Base64Option) *QByteArray { - _ret := C.QByteArray_ToBase64(this.h, (C.int)(options)) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QByteArray) ToBase642() *QByteArray { - _ret := C.QByteArray_ToBase642(this.h) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QByteArray) ToHex() *QByteArray { - _ret := C.QByteArray_ToHex(this.h) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QByteArray) ToHexWithSeparator(separator int8) *QByteArray { - _ret := C.QByteArray_ToHexWithSeparator(this.h, (C.char)(separator)) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QByteArray) ToPercentEncoding() *QByteArray { - _ret := C.QByteArray_ToPercentEncoding(this.h) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QByteArray) SetNum(param1 int16) *QByteArray { - return UnsafeNewQByteArray(unsafe.Pointer(C.QByteArray_SetNum(this.h, (C.int16_t)(param1)))) -} - -func (this *QByteArray) SetNumWithUshort(param1 uint16) *QByteArray { - return UnsafeNewQByteArray(unsafe.Pointer(C.QByteArray_SetNumWithUshort(this.h, (C.uint16_t)(param1)))) -} - -func (this *QByteArray) SetNumWithInt(param1 int) *QByteArray { - return UnsafeNewQByteArray(unsafe.Pointer(C.QByteArray_SetNumWithInt(this.h, (C.int)(param1)))) -} - -func (this *QByteArray) SetNumWithUint(param1 uint) *QByteArray { - return UnsafeNewQByteArray(unsafe.Pointer(C.QByteArray_SetNumWithUint(this.h, (C.uint)(param1)))) -} - -func (this *QByteArray) SetNumWithQlonglong(param1 int64) *QByteArray { - return UnsafeNewQByteArray(unsafe.Pointer(C.QByteArray_SetNumWithQlonglong(this.h, (C.longlong)(param1)))) -} - -func (this *QByteArray) SetNumWithQulonglong(param1 uint64) *QByteArray { - return UnsafeNewQByteArray(unsafe.Pointer(C.QByteArray_SetNumWithQulonglong(this.h, (C.ulonglong)(param1)))) -} - -func (this *QByteArray) SetNumWithFloat(param1 float32) *QByteArray { - return UnsafeNewQByteArray(unsafe.Pointer(C.QByteArray_SetNumWithFloat(this.h, (C.float)(param1)))) -} - -func (this *QByteArray) SetNumWithDouble(param1 float64) *QByteArray { - return UnsafeNewQByteArray(unsafe.Pointer(C.QByteArray_SetNumWithDouble(this.h, (C.double)(param1)))) -} - -func (this *QByteArray) SetRawData(a string, n uint) *QByteArray { - a_Cstring := C.CString(a) - defer C.free(unsafe.Pointer(a_Cstring)) - return UnsafeNewQByteArray(unsafe.Pointer(C.QByteArray_SetRawData(this.h, a_Cstring, (C.uint)(n)))) -} - -func QByteArray_Number(param1 int) *QByteArray { - _ret := C.QByteArray_Number((C.int)(param1)) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func QByteArray_NumberWithUint(param1 uint) *QByteArray { - _ret := C.QByteArray_NumberWithUint((C.uint)(param1)) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func QByteArray_NumberWithQlonglong(param1 int64) *QByteArray { - _ret := C.QByteArray_NumberWithQlonglong((C.longlong)(param1)) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func QByteArray_NumberWithQulonglong(param1 uint64) *QByteArray { - _ret := C.QByteArray_NumberWithQulonglong((C.ulonglong)(param1)) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func QByteArray_NumberWithDouble(param1 float64) *QByteArray { - _ret := C.QByteArray_NumberWithDouble((C.double)(param1)) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func QByteArray_FromRawData(param1 string, size int) *QByteArray { - param1_Cstring := C.CString(param1) - defer C.free(unsafe.Pointer(param1_Cstring)) - _ret := C.QByteArray_FromRawData(param1_Cstring, (C.int)(size)) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func QByteArray_FromBase64Encoding(base64 *QByteArray) *QByteArray__FromBase64Result { - _ret := C.QByteArray_FromBase64Encoding(base64.cPointer()) - _goptr := newQByteArray__FromBase64Result(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func QByteArray_FromBase64(base64 *QByteArray, options QByteArray__Base64Option) *QByteArray { - _ret := C.QByteArray_FromBase64(base64.cPointer(), (C.int)(options)) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func QByteArray_FromBase64WithBase64(base64 *QByteArray) *QByteArray { - _ret := C.QByteArray_FromBase64WithBase64(base64.cPointer()) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func QByteArray_FromHex(hexEncoded *QByteArray) *QByteArray { - _ret := C.QByteArray_FromHex(hexEncoded.cPointer()) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func QByteArray_FromPercentEncoding(pctEncoded *QByteArray) *QByteArray { - _ret := C.QByteArray_FromPercentEncoding(pctEncoded.cPointer()) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QByteArray) Begin() unsafe.Pointer { - _ret := C.QByteArray_Begin(this.h) - return (unsafe.Pointer)(_ret) -} - -func (this *QByteArray) Begin2() unsafe.Pointer { - _ret := C.QByteArray_Begin2(this.h) - return (unsafe.Pointer)(_ret) -} - -func (this *QByteArray) Cbegin() unsafe.Pointer { - _ret := C.QByteArray_Cbegin(this.h) - return (unsafe.Pointer)(_ret) -} - -func (this *QByteArray) ConstBegin() unsafe.Pointer { - _ret := C.QByteArray_ConstBegin(this.h) - return (unsafe.Pointer)(_ret) -} - -func (this *QByteArray) End() unsafe.Pointer { - _ret := C.QByteArray_End(this.h) - return (unsafe.Pointer)(_ret) -} - -func (this *QByteArray) End2() unsafe.Pointer { - _ret := C.QByteArray_End2(this.h) - return (unsafe.Pointer)(_ret) -} - -func (this *QByteArray) Cend() unsafe.Pointer { - _ret := C.QByteArray_Cend(this.h) - return (unsafe.Pointer)(_ret) -} - -func (this *QByteArray) ConstEnd() unsafe.Pointer { - _ret := C.QByteArray_ConstEnd(this.h) - return (unsafe.Pointer)(_ret) -} - -func (this *QByteArray) PushBack(c int8) { - C.QByteArray_PushBack(this.h, (C.char)(c)) -} - -func (this *QByteArray) PushBackWithChar(c string) { - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - C.QByteArray_PushBackWithChar(this.h, c_Cstring) -} - -func (this *QByteArray) PushBackWithQByteArray(a *QByteArray) { - C.QByteArray_PushBackWithQByteArray(this.h, a.cPointer()) -} - -func (this *QByteArray) PushFront(c int8) { - C.QByteArray_PushFront(this.h, (C.char)(c)) -} - -func (this *QByteArray) PushFrontWithChar(c string) { - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - C.QByteArray_PushFrontWithChar(this.h, c_Cstring) -} - -func (this *QByteArray) PushFrontWithQByteArray(a *QByteArray) { - C.QByteArray_PushFrontWithQByteArray(this.h, a.cPointer()) -} - -func (this *QByteArray) ShrinkToFit() { - C.QByteArray_ShrinkToFit(this.h) -} - -func (this *QByteArray) Count2() int { - return (int)(C.QByteArray_Count2(this.h)) -} - -func (this *QByteArray) Length() int { - return (int)(C.QByteArray_Length(this.h)) -} - -func (this *QByteArray) IsNull() bool { - return (bool)(C.QByteArray_IsNull(this.h)) -} - -func (this *QByteArray) Fill2(c int8, size int) *QByteArray { - return UnsafeNewQByteArray(unsafe.Pointer(C.QByteArray_Fill2(this.h, (C.char)(c), (C.int)(size)))) -} - -func (this *QByteArray) IndexOf2(c int8, from int) int { - return (int)(C.QByteArray_IndexOf2(this.h, (C.char)(c), (C.int)(from))) -} - -func (this *QByteArray) IndexOf22(c string, from int) int { - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - return (int)(C.QByteArray_IndexOf22(this.h, c_Cstring, (C.int)(from))) -} - -func (this *QByteArray) IndexOf23(a *QByteArray, from int) int { - return (int)(C.QByteArray_IndexOf23(this.h, a.cPointer(), (C.int)(from))) -} - -func (this *QByteArray) LastIndexOf2(c int8, from int) int { - return (int)(C.QByteArray_LastIndexOf2(this.h, (C.char)(c), (C.int)(from))) -} - -func (this *QByteArray) LastIndexOf22(c string, from int) int { - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - return (int)(C.QByteArray_LastIndexOf22(this.h, c_Cstring, (C.int)(from))) -} - -func (this *QByteArray) LastIndexOf23(a *QByteArray, from int) int { - return (int)(C.QByteArray_LastIndexOf23(this.h, a.cPointer(), (C.int)(from))) -} - -func (this *QByteArray) Compare2(c string, cs CaseSensitivity) int { - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - return (int)(C.QByteArray_Compare2(this.h, c_Cstring, (C.int)(cs))) -} - -func (this *QByteArray) Compare22(a *QByteArray, cs CaseSensitivity) int { - return (int)(C.QByteArray_Compare22(this.h, a.cPointer(), (C.int)(cs))) -} - -func (this *QByteArray) Mid2(index int, lenVal int) *QByteArray { - _ret := C.QByteArray_Mid2(this.h, (C.int)(index), (C.int)(lenVal)) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QByteArray) LeftJustified2(width int, fill int8) *QByteArray { - _ret := C.QByteArray_LeftJustified2(this.h, (C.int)(width), (C.char)(fill)) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QByteArray) LeftJustified3(width int, fill int8, truncate bool) *QByteArray { - _ret := C.QByteArray_LeftJustified3(this.h, (C.int)(width), (C.char)(fill), (C.bool)(truncate)) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QByteArray) RightJustified2(width int, fill int8) *QByteArray { - _ret := C.QByteArray_RightJustified2(this.h, (C.int)(width), (C.char)(fill)) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QByteArray) RightJustified3(width int, fill int8, truncate bool) *QByteArray { - _ret := C.QByteArray_RightJustified3(this.h, (C.int)(width), (C.char)(fill), (C.bool)(truncate)) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QByteArray) IndexOf24(s string, from int) int { - s_ms := libmiqt.Strdupg(s) - defer C.free(s_ms) - return (int)(C.QByteArray_IndexOf24(this.h, (*C.struct_miqt_string)(s_ms), (C.int)(from))) -} - -func (this *QByteArray) LastIndexOf24(s string, from int) int { - s_ms := libmiqt.Strdupg(s) - defer C.free(s_ms) - return (int)(C.QByteArray_LastIndexOf24(this.h, (*C.struct_miqt_string)(s_ms), (C.int)(from))) -} - -func (this *QByteArray) ToShort1(ok *bool) int16 { - return (int16)(C.QByteArray_ToShort1(this.h, (*C.bool)(unsafe.Pointer(ok)))) -} - -func (this *QByteArray) ToShort2(ok *bool, base int) int16 { - return (int16)(C.QByteArray_ToShort2(this.h, (*C.bool)(unsafe.Pointer(ok)), (C.int)(base))) -} - -func (this *QByteArray) ToUShort1(ok *bool) uint16 { - return (uint16)(C.QByteArray_ToUShort1(this.h, (*C.bool)(unsafe.Pointer(ok)))) -} - -func (this *QByteArray) ToUShort2(ok *bool, base int) uint16 { - return (uint16)(C.QByteArray_ToUShort2(this.h, (*C.bool)(unsafe.Pointer(ok)), (C.int)(base))) -} - -func (this *QByteArray) ToInt1(ok *bool) int { - return (int)(C.QByteArray_ToInt1(this.h, (*C.bool)(unsafe.Pointer(ok)))) -} - -func (this *QByteArray) ToInt2(ok *bool, base int) int { - return (int)(C.QByteArray_ToInt2(this.h, (*C.bool)(unsafe.Pointer(ok)), (C.int)(base))) -} - -func (this *QByteArray) ToUInt1(ok *bool) uint { - return (uint)(C.QByteArray_ToUInt1(this.h, (*C.bool)(unsafe.Pointer(ok)))) -} - -func (this *QByteArray) ToUInt2(ok *bool, base int) uint { - return (uint)(C.QByteArray_ToUInt2(this.h, (*C.bool)(unsafe.Pointer(ok)), (C.int)(base))) -} - -func (this *QByteArray) ToLong1(ok *bool) int64 { - return (int64)(C.QByteArray_ToLong1(this.h, (*C.bool)(unsafe.Pointer(ok)))) -} - -func (this *QByteArray) ToLong2(ok *bool, base int) int64 { - return (int64)(C.QByteArray_ToLong2(this.h, (*C.bool)(unsafe.Pointer(ok)), (C.int)(base))) -} - -func (this *QByteArray) ToULong1(ok *bool) uint64 { - return (uint64)(C.QByteArray_ToULong1(this.h, (*C.bool)(unsafe.Pointer(ok)))) -} - -func (this *QByteArray) ToULong2(ok *bool, base int) uint64 { - return (uint64)(C.QByteArray_ToULong2(this.h, (*C.bool)(unsafe.Pointer(ok)), (C.int)(base))) -} - -func (this *QByteArray) ToLongLong1(ok *bool) int64 { - return (int64)(C.QByteArray_ToLongLong1(this.h, (*C.bool)(unsafe.Pointer(ok)))) -} - -func (this *QByteArray) ToLongLong2(ok *bool, base int) int64 { - return (int64)(C.QByteArray_ToLongLong2(this.h, (*C.bool)(unsafe.Pointer(ok)), (C.int)(base))) -} - -func (this *QByteArray) ToULongLong1(ok *bool) uint64 { - return (uint64)(C.QByteArray_ToULongLong1(this.h, (*C.bool)(unsafe.Pointer(ok)))) -} - -func (this *QByteArray) ToULongLong2(ok *bool, base int) uint64 { - return (uint64)(C.QByteArray_ToULongLong2(this.h, (*C.bool)(unsafe.Pointer(ok)), (C.int)(base))) -} - -func (this *QByteArray) ToFloat1(ok *bool) float32 { - return (float32)(C.QByteArray_ToFloat1(this.h, (*C.bool)(unsafe.Pointer(ok)))) -} - -func (this *QByteArray) ToDouble1(ok *bool) float64 { - return (float64)(C.QByteArray_ToDouble1(this.h, (*C.bool)(unsafe.Pointer(ok)))) -} - -func (this *QByteArray) ToPercentEncoding1(exclude *QByteArray) *QByteArray { - _ret := C.QByteArray_ToPercentEncoding1(this.h, exclude.cPointer()) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QByteArray) ToPercentEncoding2(exclude *QByteArray, include *QByteArray) *QByteArray { - _ret := C.QByteArray_ToPercentEncoding2(this.h, exclude.cPointer(), include.cPointer()) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QByteArray) ToPercentEncoding3(exclude *QByteArray, include *QByteArray, percent int8) *QByteArray { - _ret := C.QByteArray_ToPercentEncoding3(this.h, exclude.cPointer(), include.cPointer(), (C.char)(percent)) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QByteArray) SetNum2(param1 int16, base int) *QByteArray { - return UnsafeNewQByteArray(unsafe.Pointer(C.QByteArray_SetNum2(this.h, (C.int16_t)(param1), (C.int)(base)))) -} - -func (this *QByteArray) SetNum22(param1 uint16, base int) *QByteArray { - return UnsafeNewQByteArray(unsafe.Pointer(C.QByteArray_SetNum22(this.h, (C.uint16_t)(param1), (C.int)(base)))) -} - -func (this *QByteArray) SetNum23(param1 int, base int) *QByteArray { - return UnsafeNewQByteArray(unsafe.Pointer(C.QByteArray_SetNum23(this.h, (C.int)(param1), (C.int)(base)))) -} - -func (this *QByteArray) SetNum24(param1 uint, base int) *QByteArray { - return UnsafeNewQByteArray(unsafe.Pointer(C.QByteArray_SetNum24(this.h, (C.uint)(param1), (C.int)(base)))) -} - -func (this *QByteArray) SetNum25(param1 int64, base int) *QByteArray { - return UnsafeNewQByteArray(unsafe.Pointer(C.QByteArray_SetNum25(this.h, (C.longlong)(param1), (C.int)(base)))) -} - -func (this *QByteArray) SetNum26(param1 uint64, base int) *QByteArray { - return UnsafeNewQByteArray(unsafe.Pointer(C.QByteArray_SetNum26(this.h, (C.ulonglong)(param1), (C.int)(base)))) -} - -func (this *QByteArray) SetNum27(param1 float32, f int8) *QByteArray { - return UnsafeNewQByteArray(unsafe.Pointer(C.QByteArray_SetNum27(this.h, (C.float)(param1), (C.char)(f)))) -} - -func (this *QByteArray) SetNum3(param1 float32, f int8, prec int) *QByteArray { - return UnsafeNewQByteArray(unsafe.Pointer(C.QByteArray_SetNum3(this.h, (C.float)(param1), (C.char)(f), (C.int)(prec)))) -} - -func (this *QByteArray) SetNum28(param1 float64, f int8) *QByteArray { - return UnsafeNewQByteArray(unsafe.Pointer(C.QByteArray_SetNum28(this.h, (C.double)(param1), (C.char)(f)))) -} - -func (this *QByteArray) SetNum32(param1 float64, f int8, prec int) *QByteArray { - return UnsafeNewQByteArray(unsafe.Pointer(C.QByteArray_SetNum32(this.h, (C.double)(param1), (C.char)(f), (C.int)(prec)))) -} - -func QByteArray_Number2(param1 int, base int) *QByteArray { - _ret := C.QByteArray_Number2((C.int)(param1), (C.int)(base)) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func QByteArray_Number22(param1 uint, base int) *QByteArray { - _ret := C.QByteArray_Number22((C.uint)(param1), (C.int)(base)) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func QByteArray_Number23(param1 int64, base int) *QByteArray { - _ret := C.QByteArray_Number23((C.longlong)(param1), (C.int)(base)) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func QByteArray_Number24(param1 uint64, base int) *QByteArray { - _ret := C.QByteArray_Number24((C.ulonglong)(param1), (C.int)(base)) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func QByteArray_Number25(param1 float64, f int8) *QByteArray { - _ret := C.QByteArray_Number25((C.double)(param1), (C.char)(f)) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func QByteArray_Number3(param1 float64, f int8, prec int) *QByteArray { - _ret := C.QByteArray_Number3((C.double)(param1), (C.char)(f), (C.int)(prec)) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func QByteArray_FromBase64Encoding2(base64 *QByteArray, options QByteArray__Base64Option) *QByteArray__FromBase64Result { - _ret := C.QByteArray_FromBase64Encoding2(base64.cPointer(), (C.int)(options)) - _goptr := newQByteArray__FromBase64Result(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func QByteArray_FromPercentEncoding2(pctEncoded *QByteArray, percent int8) *QByteArray { - _ret := C.QByteArray_FromPercentEncoding2(pctEncoded.cPointer(), (C.char)(percent)) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -// Delete this object from C++ memory. -func (this *QByteArray) Delete() { - C.QByteArray_Delete(this.h) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QByteArray) GoGC() { - runtime.SetFinalizer(this, func(this *QByteArray) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} - -type QByteRef struct { - h *C.QByteRef -} - -func (this *QByteRef) cPointer() *C.QByteRef { - if this == nil { - return nil - } - return this.h -} - -func (this *QByteRef) UnsafePointer() unsafe.Pointer { - if this == nil { - return nil - } - return unsafe.Pointer(this.h) -} - -func newQByteRef(h *C.QByteRef) *QByteRef { - if h == nil { - return nil - } - return &QByteRef{h: h} -} - -func UnsafeNewQByteRef(h unsafe.Pointer) *QByteRef { - return newQByteRef((*C.QByteRef)(h)) -} - -// NewQByteRef constructs a new QByteRef object. -func NewQByteRef(param1 *QByteRef) *QByteRef { - ret := C.QByteRef_new(param1.cPointer()) - return newQByteRef(ret) -} - -func (this *QByteRef) OperatorAssign(c int8) { - C.QByteRef_OperatorAssign(this.h, (C.char)(c)) -} - -func (this *QByteRef) OperatorAssignWithQByteRef(c *QByteRef) { - C.QByteRef_OperatorAssignWithQByteRef(this.h, c.cPointer()) -} - -func (this *QByteRef) OperatorEqual(c int8) bool { - return (bool)(C.QByteRef_OperatorEqual(this.h, (C.char)(c))) -} - -func (this *QByteRef) OperatorNotEqual(c int8) bool { - return (bool)(C.QByteRef_OperatorNotEqual(this.h, (C.char)(c))) -} - -func (this *QByteRef) OperatorGreater(c int8) bool { - return (bool)(C.QByteRef_OperatorGreater(this.h, (C.char)(c))) -} - -func (this *QByteRef) OperatorGreaterOrEqual(c int8) bool { - return (bool)(C.QByteRef_OperatorGreaterOrEqual(this.h, (C.char)(c))) -} - -func (this *QByteRef) OperatorLesser(c int8) bool { - return (bool)(C.QByteRef_OperatorLesser(this.h, (C.char)(c))) -} - -func (this *QByteRef) OperatorLesserOrEqual(c int8) bool { - return (bool)(C.QByteRef_OperatorLesserOrEqual(this.h, (C.char)(c))) -} - -// Delete this object from C++ memory. -func (this *QByteRef) Delete() { - C.QByteRef_Delete(this.h) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QByteRef) GoGC() { - runtime.SetFinalizer(this, func(this *QByteRef) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} - -type QByteArray__FromBase64Result struct { - h *C.QByteArray__FromBase64Result -} - -func (this *QByteArray__FromBase64Result) cPointer() *C.QByteArray__FromBase64Result { - if this == nil { - return nil - } - return this.h -} - -func (this *QByteArray__FromBase64Result) UnsafePointer() unsafe.Pointer { - if this == nil { - return nil - } - return unsafe.Pointer(this.h) -} - -func newQByteArray__FromBase64Result(h *C.QByteArray__FromBase64Result) *QByteArray__FromBase64Result { - if h == nil { - return nil - } - return &QByteArray__FromBase64Result{h: h} -} - -func UnsafeNewQByteArray__FromBase64Result(h unsafe.Pointer) *QByteArray__FromBase64Result { - return newQByteArray__FromBase64Result((*C.QByteArray__FromBase64Result)(h)) -} - -// NewQByteArray__FromBase64Result constructs a new QByteArray::FromBase64Result object. -func NewQByteArray__FromBase64Result(param1 *QByteArray__FromBase64Result) *QByteArray__FromBase64Result { - ret := C.QByteArray__FromBase64Result_new(param1.cPointer()) - return newQByteArray__FromBase64Result(ret) -} - -func (this *QByteArray__FromBase64Result) Swap(other *QByteArray__FromBase64Result) { - C.QByteArray__FromBase64Result_Swap(this.h, other.cPointer()) -} - -func (this *QByteArray__FromBase64Result) OperatorMultiply() *QByteArray { - return UnsafeNewQByteArray(unsafe.Pointer(C.QByteArray__FromBase64Result_OperatorMultiply(this.h))) -} - -func (this *QByteArray__FromBase64Result) OperatorMultiply2() *QByteArray { - return UnsafeNewQByteArray(unsafe.Pointer(C.QByteArray__FromBase64Result_OperatorMultiply2(this.h))) -} - -func (this *QByteArray__FromBase64Result) OperatorAssign(param1 *QByteArray__FromBase64Result) { - C.QByteArray__FromBase64Result_OperatorAssign(this.h, param1.cPointer()) -} - -// Delete this object from C++ memory. -func (this *QByteArray__FromBase64Result) Delete() { - C.QByteArray__FromBase64Result_Delete(this.h) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QByteArray__FromBase64Result) GoGC() { - runtime.SetFinalizer(this, func(this *QByteArray__FromBase64Result) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} diff --git a/qt/gen_qbytearray.h b/qt/gen_qbytearray.h deleted file mode 100644 index e5b2e17b..00000000 --- a/qt/gen_qbytearray.h +++ /dev/null @@ -1,281 +0,0 @@ -#ifndef GEN_QBYTEARRAY_H -#define GEN_QBYTEARRAY_H - -#include -#include -#include - -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - -#include "../libmiqt/libmiqt.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#ifdef __cplusplus -class QByteArray; -#if defined(WORKAROUND_INNER_CLASS_DEFINITION_QByteArray__FromBase64Result) -typedef QByteArray::FromBase64Result QByteArray__FromBase64Result; -#else -class QByteArray__FromBase64Result; -#endif -class QByteArrayDataPtr; -class QByteRef; -#else -typedef struct QByteArray QByteArray; -typedef struct QByteArray__FromBase64Result QByteArray__FromBase64Result; -typedef struct QByteArrayDataPtr QByteArrayDataPtr; -typedef struct QByteRef QByteRef; -#endif - -QByteArrayDataPtr* QByteArrayDataPtr_new(); -QByteArrayDataPtr* QByteArrayDataPtr_new2(QByteArrayDataPtr* param1); -void QByteArrayDataPtr_Delete(QByteArrayDataPtr* self); - -QByteArray* QByteArray_new(); -QByteArray* QByteArray_new2(const char* param1); -QByteArray* QByteArray_new3(int size, char c); -QByteArray* QByteArray_new4(int size, int param2); -QByteArray* QByteArray_new5(QByteArray* param1); -QByteArray* QByteArray_new6(QByteArrayDataPtr* dd); -QByteArray* QByteArray_new7(const char* param1, int size); -void QByteArray_OperatorAssign(QByteArray* self, QByteArray* param1); -void QByteArray_OperatorAssignWithStr(QByteArray* self, const char* str); -void QByteArray_Swap(QByteArray* self, QByteArray* other); -int QByteArray_Size(const QByteArray* self); -bool QByteArray_IsEmpty(const QByteArray* self); -void QByteArray_Resize(QByteArray* self, int size); -QByteArray* QByteArray_Fill(QByteArray* self, char c); -int QByteArray_Capacity(const QByteArray* self); -void QByteArray_Reserve(QByteArray* self, int size); -void QByteArray_Squeeze(QByteArray* self); -char* QByteArray_Data(QByteArray* self); -const char* QByteArray_Data2(const QByteArray* self); -const char* QByteArray_ConstData(const QByteArray* self); -void QByteArray_Detach(QByteArray* self); -bool QByteArray_IsDetached(const QByteArray* self); -bool QByteArray_IsSharedWith(const QByteArray* self, QByteArray* other); -void QByteArray_Clear(QByteArray* self); -char QByteArray_At(const QByteArray* self, int i); -char QByteArray_OperatorSubscript(const QByteArray* self, int i); -char QByteArray_OperatorSubscriptWithUint(const QByteArray* self, unsigned int i); -QByteRef* QByteArray_OperatorSubscriptWithInt(QByteArray* self, int i); -QByteRef* QByteArray_OperatorSubscript2(QByteArray* self, unsigned int i); -char QByteArray_Front(const QByteArray* self); -QByteRef* QByteArray_Front2(QByteArray* self); -char QByteArray_Back(const QByteArray* self); -QByteRef* QByteArray_Back2(QByteArray* self); -int QByteArray_IndexOf(const QByteArray* self, char c); -int QByteArray_IndexOfWithChar(const QByteArray* self, const char* c); -int QByteArray_IndexOfWithQByteArray(const QByteArray* self, QByteArray* a); -int QByteArray_LastIndexOf(const QByteArray* self, char c); -int QByteArray_LastIndexOfWithChar(const QByteArray* self, const char* c); -int QByteArray_LastIndexOfWithQByteArray(const QByteArray* self, QByteArray* a); -bool QByteArray_Contains(const QByteArray* self, char c); -bool QByteArray_ContainsWithChar(const QByteArray* self, const char* a); -bool QByteArray_ContainsWithQByteArray(const QByteArray* self, QByteArray* a); -int QByteArray_Count(const QByteArray* self, char c); -int QByteArray_CountWithChar(const QByteArray* self, const char* a); -int QByteArray_CountWithQByteArray(const QByteArray* self, QByteArray* a); -int QByteArray_Compare(const QByteArray* self, const char* c); -int QByteArray_CompareWithQByteArray(const QByteArray* self, QByteArray* a); -QByteArray* QByteArray_Left(const QByteArray* self, int lenVal); -QByteArray* QByteArray_Right(const QByteArray* self, int lenVal); -QByteArray* QByteArray_Mid(const QByteArray* self, int index); -QByteArray* QByteArray_Chopped(const QByteArray* self, int lenVal); -bool QByteArray_StartsWith(const QByteArray* self, QByteArray* a); -bool QByteArray_StartsWithWithChar(const QByteArray* self, char c); -bool QByteArray_StartsWith2(const QByteArray* self, const char* c); -bool QByteArray_EndsWith(const QByteArray* self, QByteArray* a); -bool QByteArray_EndsWithWithChar(const QByteArray* self, char c); -bool QByteArray_EndsWith2(const QByteArray* self, const char* c); -bool QByteArray_IsUpper(const QByteArray* self); -bool QByteArray_IsLower(const QByteArray* self); -void QByteArray_Truncate(QByteArray* self, int pos); -void QByteArray_Chop(QByteArray* self, int n); -QByteArray* QByteArray_ToLower(const QByteArray* self); -QByteArray* QByteArray_ToUpper(const QByteArray* self); -QByteArray* QByteArray_Trimmed(const QByteArray* self); -QByteArray* QByteArray_Simplified(const QByteArray* self); -QByteArray* QByteArray_LeftJustified(const QByteArray* self, int width); -QByteArray* QByteArray_RightJustified(const QByteArray* self, int width); -QByteArray* QByteArray_Prepend(QByteArray* self, char c); -QByteArray* QByteArray_Prepend2(QByteArray* self, int count, char c); -QByteArray* QByteArray_PrependWithChar(QByteArray* self, const char* s); -QByteArray* QByteArray_Prepend3(QByteArray* self, const char* s, int lenVal); -QByteArray* QByteArray_PrependWithQByteArray(QByteArray* self, QByteArray* a); -QByteArray* QByteArray_Append(QByteArray* self, char c); -QByteArray* QByteArray_Append2(QByteArray* self, int count, char c); -QByteArray* QByteArray_AppendWithChar(QByteArray* self, const char* s); -QByteArray* QByteArray_Append3(QByteArray* self, const char* s, int lenVal); -QByteArray* QByteArray_AppendWithQByteArray(QByteArray* self, QByteArray* a); -QByteArray* QByteArray_Insert(QByteArray* self, int i, char c); -QByteArray* QByteArray_Insert2(QByteArray* self, int i, int count, char c); -QByteArray* QByteArray_Insert3(QByteArray* self, int i, const char* s); -QByteArray* QByteArray_Insert4(QByteArray* self, int i, const char* s, int lenVal); -QByteArray* QByteArray_Insert5(QByteArray* self, int i, QByteArray* a); -QByteArray* QByteArray_Remove(QByteArray* self, int index, int lenVal); -QByteArray* QByteArray_Replace(QByteArray* self, int index, int lenVal, const char* s); -QByteArray* QByteArray_Replace2(QByteArray* self, int index, int lenVal, const char* s, int alen); -QByteArray* QByteArray_Replace3(QByteArray* self, int index, int lenVal, QByteArray* s); -QByteArray* QByteArray_Replace4(QByteArray* self, char before, const char* after); -QByteArray* QByteArray_Replace5(QByteArray* self, char before, QByteArray* after); -QByteArray* QByteArray_Replace6(QByteArray* self, const char* before, const char* after); -QByteArray* QByteArray_Replace7(QByteArray* self, const char* before, int bsize, const char* after, int asize); -QByteArray* QByteArray_Replace8(QByteArray* self, QByteArray* before, QByteArray* after); -QByteArray* QByteArray_Replace9(QByteArray* self, QByteArray* before, const char* after); -QByteArray* QByteArray_Replace10(QByteArray* self, const char* before, QByteArray* after); -QByteArray* QByteArray_Replace11(QByteArray* self, char before, char after); -QByteArray* QByteArray_OperatorPlusAssign(QByteArray* self, char c); -QByteArray* QByteArray_OperatorPlusAssignWithChar(QByteArray* self, const char* s); -QByteArray* QByteArray_OperatorPlusAssignWithQByteArray(QByteArray* self, QByteArray* a); -struct miqt_array* QByteArray_Split(const QByteArray* self, char sep); -QByteArray* QByteArray_Repeated(const QByteArray* self, int times); -QByteArray* QByteArray_AppendWithQString(QByteArray* self, struct miqt_string* s); -QByteArray* QByteArray_Insert6(QByteArray* self, int i, struct miqt_string* s); -QByteArray* QByteArray_Replace12(QByteArray* self, struct miqt_string* before, const char* after); -QByteArray* QByteArray_Replace13(QByteArray* self, char c, struct miqt_string* after); -QByteArray* QByteArray_Replace14(QByteArray* self, struct miqt_string* before, QByteArray* after); -QByteArray* QByteArray_OperatorPlusAssignWithQString(QByteArray* self, struct miqt_string* s); -int QByteArray_IndexOfWithQString(const QByteArray* self, struct miqt_string* s); -int QByteArray_LastIndexOfWithQString(const QByteArray* self, struct miqt_string* s); -bool QByteArray_OperatorEqual(const QByteArray* self, struct miqt_string* s2); -bool QByteArray_OperatorNotEqual(const QByteArray* self, struct miqt_string* s2); -bool QByteArray_OperatorLesser(const QByteArray* self, struct miqt_string* s2); -bool QByteArray_OperatorGreater(const QByteArray* self, struct miqt_string* s2); -bool QByteArray_OperatorLesserOrEqual(const QByteArray* self, struct miqt_string* s2); -bool QByteArray_OperatorGreaterOrEqual(const QByteArray* self, struct miqt_string* s2); -int16_t QByteArray_ToShort(const QByteArray* self); -uint16_t QByteArray_ToUShort(const QByteArray* self); -int QByteArray_ToInt(const QByteArray* self); -unsigned int QByteArray_ToUInt(const QByteArray* self); -long QByteArray_ToLong(const QByteArray* self); -unsigned long QByteArray_ToULong(const QByteArray* self); -long long QByteArray_ToLongLong(const QByteArray* self); -unsigned long long QByteArray_ToULongLong(const QByteArray* self); -float QByteArray_ToFloat(const QByteArray* self); -double QByteArray_ToDouble(const QByteArray* self); -QByteArray* QByteArray_ToBase64(const QByteArray* self, int options); -QByteArray* QByteArray_ToBase642(const QByteArray* self); -QByteArray* QByteArray_ToHex(const QByteArray* self); -QByteArray* QByteArray_ToHexWithSeparator(const QByteArray* self, char separator); -QByteArray* QByteArray_ToPercentEncoding(const QByteArray* self); -QByteArray* QByteArray_SetNum(QByteArray* self, int16_t param1); -QByteArray* QByteArray_SetNumWithUshort(QByteArray* self, uint16_t param1); -QByteArray* QByteArray_SetNumWithInt(QByteArray* self, int param1); -QByteArray* QByteArray_SetNumWithUint(QByteArray* self, unsigned int param1); -QByteArray* QByteArray_SetNumWithQlonglong(QByteArray* self, long long param1); -QByteArray* QByteArray_SetNumWithQulonglong(QByteArray* self, unsigned long long param1); -QByteArray* QByteArray_SetNumWithFloat(QByteArray* self, float param1); -QByteArray* QByteArray_SetNumWithDouble(QByteArray* self, double param1); -QByteArray* QByteArray_SetRawData(QByteArray* self, const char* a, unsigned int n); -QByteArray* QByteArray_Number(int param1); -QByteArray* QByteArray_NumberWithUint(unsigned int param1); -QByteArray* QByteArray_NumberWithQlonglong(long long param1); -QByteArray* QByteArray_NumberWithQulonglong(unsigned long long param1); -QByteArray* QByteArray_NumberWithDouble(double param1); -QByteArray* QByteArray_FromRawData(const char* param1, int size); -QByteArray__FromBase64Result* QByteArray_FromBase64Encoding(QByteArray* base64); -QByteArray* QByteArray_FromBase64(QByteArray* base64, int options); -QByteArray* QByteArray_FromBase64WithBase64(QByteArray* base64); -QByteArray* QByteArray_FromHex(QByteArray* hexEncoded); -QByteArray* QByteArray_FromPercentEncoding(QByteArray* pctEncoded); -char* QByteArray_Begin(QByteArray* self); -const char* QByteArray_Begin2(const QByteArray* self); -const char* QByteArray_Cbegin(const QByteArray* self); -const char* QByteArray_ConstBegin(const QByteArray* self); -char* QByteArray_End(QByteArray* self); -const char* QByteArray_End2(const QByteArray* self); -const char* QByteArray_Cend(const QByteArray* self); -const char* QByteArray_ConstEnd(const QByteArray* self); -void QByteArray_PushBack(QByteArray* self, char c); -void QByteArray_PushBackWithChar(QByteArray* self, const char* c); -void QByteArray_PushBackWithQByteArray(QByteArray* self, QByteArray* a); -void QByteArray_PushFront(QByteArray* self, char c); -void QByteArray_PushFrontWithChar(QByteArray* self, const char* c); -void QByteArray_PushFrontWithQByteArray(QByteArray* self, QByteArray* a); -void QByteArray_ShrinkToFit(QByteArray* self); -int QByteArray_Count2(const QByteArray* self); -int QByteArray_Length(const QByteArray* self); -bool QByteArray_IsNull(const QByteArray* self); -QByteArray* QByteArray_Fill2(QByteArray* self, char c, int size); -int QByteArray_IndexOf2(const QByteArray* self, char c, int from); -int QByteArray_IndexOf22(const QByteArray* self, const char* c, int from); -int QByteArray_IndexOf23(const QByteArray* self, QByteArray* a, int from); -int QByteArray_LastIndexOf2(const QByteArray* self, char c, int from); -int QByteArray_LastIndexOf22(const QByteArray* self, const char* c, int from); -int QByteArray_LastIndexOf23(const QByteArray* self, QByteArray* a, int from); -int QByteArray_Compare2(const QByteArray* self, const char* c, int cs); -int QByteArray_Compare22(const QByteArray* self, QByteArray* a, int cs); -QByteArray* QByteArray_Mid2(const QByteArray* self, int index, int lenVal); -QByteArray* QByteArray_LeftJustified2(const QByteArray* self, int width, char fill); -QByteArray* QByteArray_LeftJustified3(const QByteArray* self, int width, char fill, bool truncate); -QByteArray* QByteArray_RightJustified2(const QByteArray* self, int width, char fill); -QByteArray* QByteArray_RightJustified3(const QByteArray* self, int width, char fill, bool truncate); -int QByteArray_IndexOf24(const QByteArray* self, struct miqt_string* s, int from); -int QByteArray_LastIndexOf24(const QByteArray* self, struct miqt_string* s, int from); -int16_t QByteArray_ToShort1(const QByteArray* self, bool* ok); -int16_t QByteArray_ToShort2(const QByteArray* self, bool* ok, int base); -uint16_t QByteArray_ToUShort1(const QByteArray* self, bool* ok); -uint16_t QByteArray_ToUShort2(const QByteArray* self, bool* ok, int base); -int QByteArray_ToInt1(const QByteArray* self, bool* ok); -int QByteArray_ToInt2(const QByteArray* self, bool* ok, int base); -unsigned int QByteArray_ToUInt1(const QByteArray* self, bool* ok); -unsigned int QByteArray_ToUInt2(const QByteArray* self, bool* ok, int base); -long QByteArray_ToLong1(const QByteArray* self, bool* ok); -long QByteArray_ToLong2(const QByteArray* self, bool* ok, int base); -unsigned long QByteArray_ToULong1(const QByteArray* self, bool* ok); -unsigned long QByteArray_ToULong2(const QByteArray* self, bool* ok, int base); -long long QByteArray_ToLongLong1(const QByteArray* self, bool* ok); -long long QByteArray_ToLongLong2(const QByteArray* self, bool* ok, int base); -unsigned long long QByteArray_ToULongLong1(const QByteArray* self, bool* ok); -unsigned long long QByteArray_ToULongLong2(const QByteArray* self, bool* ok, int base); -float QByteArray_ToFloat1(const QByteArray* self, bool* ok); -double QByteArray_ToDouble1(const QByteArray* self, bool* ok); -QByteArray* QByteArray_ToPercentEncoding1(const QByteArray* self, QByteArray* exclude); -QByteArray* QByteArray_ToPercentEncoding2(const QByteArray* self, QByteArray* exclude, QByteArray* include); -QByteArray* QByteArray_ToPercentEncoding3(const QByteArray* self, QByteArray* exclude, QByteArray* include, char percent); -QByteArray* QByteArray_SetNum2(QByteArray* self, int16_t param1, int base); -QByteArray* QByteArray_SetNum22(QByteArray* self, uint16_t param1, int base); -QByteArray* QByteArray_SetNum23(QByteArray* self, int param1, int base); -QByteArray* QByteArray_SetNum24(QByteArray* self, unsigned int param1, int base); -QByteArray* QByteArray_SetNum25(QByteArray* self, long long param1, int base); -QByteArray* QByteArray_SetNum26(QByteArray* self, unsigned long long param1, int base); -QByteArray* QByteArray_SetNum27(QByteArray* self, float param1, char f); -QByteArray* QByteArray_SetNum3(QByteArray* self, float param1, char f, int prec); -QByteArray* QByteArray_SetNum28(QByteArray* self, double param1, char f); -QByteArray* QByteArray_SetNum32(QByteArray* self, double param1, char f, int prec); -QByteArray* QByteArray_Number2(int param1, int base); -QByteArray* QByteArray_Number22(unsigned int param1, int base); -QByteArray* QByteArray_Number23(long long param1, int base); -QByteArray* QByteArray_Number24(unsigned long long param1, int base); -QByteArray* QByteArray_Number25(double param1, char f); -QByteArray* QByteArray_Number3(double param1, char f, int prec); -QByteArray__FromBase64Result* QByteArray_FromBase64Encoding2(QByteArray* base64, int options); -QByteArray* QByteArray_FromPercentEncoding2(QByteArray* pctEncoded, char percent); -void QByteArray_Delete(QByteArray* self); - -QByteRef* QByteRef_new(QByteRef* param1); -void QByteRef_OperatorAssign(QByteRef* self, char c); -void QByteRef_OperatorAssignWithQByteRef(QByteRef* self, QByteRef* c); -bool QByteRef_OperatorEqual(const QByteRef* self, char c); -bool QByteRef_OperatorNotEqual(const QByteRef* self, char c); -bool QByteRef_OperatorGreater(const QByteRef* self, char c); -bool QByteRef_OperatorGreaterOrEqual(const QByteRef* self, char c); -bool QByteRef_OperatorLesser(const QByteRef* self, char c); -bool QByteRef_OperatorLesserOrEqual(const QByteRef* self, char c); -void QByteRef_Delete(QByteRef* self); - -QByteArray__FromBase64Result* QByteArray__FromBase64Result_new(QByteArray__FromBase64Result* param1); -void QByteArray__FromBase64Result_Swap(QByteArray__FromBase64Result* self, QByteArray__FromBase64Result* other); -QByteArray* QByteArray__FromBase64Result_OperatorMultiply(QByteArray__FromBase64Result* self); -QByteArray* QByteArray__FromBase64Result_OperatorMultiply2(const QByteArray__FromBase64Result* self); -void QByteArray__FromBase64Result_OperatorAssign(QByteArray__FromBase64Result* self, QByteArray__FromBase64Result* param1); -void QByteArray__FromBase64Result_Delete(QByteArray__FromBase64Result* self); - -#ifdef __cplusplus -} /* extern C */ -#endif - -#endif diff --git a/qt/gen_qbytearraymatcher.cpp b/qt/gen_qbytearraymatcher.cpp index f5ed3f0c..a7b99110 100644 --- a/qt/gen_qbytearraymatcher.cpp +++ b/qt/gen_qbytearraymatcher.cpp @@ -9,8 +9,9 @@ QByteArrayMatcher* QByteArrayMatcher_new() { return new QByteArrayMatcher(); } -QByteArrayMatcher* QByteArrayMatcher_new2(QByteArray* pattern) { - return new QByteArrayMatcher(*pattern); +QByteArrayMatcher* QByteArrayMatcher_new2(struct miqt_string pattern) { + QByteArray pattern_QByteArray(pattern.data, pattern.len); + return new QByteArrayMatcher(pattern_QByteArray); } QByteArrayMatcher* QByteArrayMatcher_new3(const char* pattern, int length) { @@ -25,24 +26,32 @@ void QByteArrayMatcher_OperatorAssign(QByteArrayMatcher* self, QByteArrayMatcher self->operator=(*other); } -void QByteArrayMatcher_SetPattern(QByteArrayMatcher* self, QByteArray* pattern) { - self->setPattern(*pattern); +void QByteArrayMatcher_SetPattern(QByteArrayMatcher* self, struct miqt_string pattern) { + QByteArray pattern_QByteArray(pattern.data, pattern.len); + self->setPattern(pattern_QByteArray); } -int QByteArrayMatcher_IndexIn(const QByteArrayMatcher* self, QByteArray* ba) { - return self->indexIn(*ba); +int QByteArrayMatcher_IndexIn(const QByteArrayMatcher* self, struct miqt_string ba) { + QByteArray ba_QByteArray(ba.data, ba.len); + return self->indexIn(ba_QByteArray); } int QByteArrayMatcher_IndexIn2(const QByteArrayMatcher* self, const char* str, int lenVal) { return self->indexIn(str, static_cast(lenVal)); } -QByteArray* QByteArrayMatcher_Pattern(const QByteArrayMatcher* self) { - return new QByteArray(self->pattern()); +struct miqt_string QByteArrayMatcher_Pattern(const QByteArrayMatcher* self) { + QByteArray _qb = self->pattern(); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } -int QByteArrayMatcher_IndexIn22(const QByteArrayMatcher* self, QByteArray* ba, int from) { - return self->indexIn(*ba, static_cast(from)); +int QByteArrayMatcher_IndexIn22(const QByteArrayMatcher* self, struct miqt_string ba, int from) { + QByteArray ba_QByteArray(ba.data, ba.len); + return self->indexIn(ba_QByteArray, static_cast(from)); } int QByteArrayMatcher_IndexIn3(const QByteArrayMatcher* self, const char* str, int lenVal, int from) { diff --git a/qt/gen_qbytearraymatcher.go b/qt/gen_qbytearraymatcher.go index 36f7e65e..572b5ece 100644 --- a/qt/gen_qbytearraymatcher.go +++ b/qt/gen_qbytearraymatcher.go @@ -49,8 +49,11 @@ func NewQByteArrayMatcher() *QByteArrayMatcher { } // NewQByteArrayMatcher2 constructs a new QByteArrayMatcher object. -func NewQByteArrayMatcher2(pattern *QByteArray) *QByteArrayMatcher { - ret := C.QByteArrayMatcher_new2(pattern.cPointer()) +func NewQByteArrayMatcher2(pattern []byte) *QByteArrayMatcher { + pattern_alias := C.struct_miqt_string{} + pattern_alias.data = (*C.char)(unsafe.Pointer(&pattern[0])) + pattern_alias.len = C.size_t(len(pattern)) + ret := C.QByteArrayMatcher_new2(pattern_alias) return newQByteArrayMatcher(ret) } @@ -72,12 +75,18 @@ func (this *QByteArrayMatcher) OperatorAssign(other *QByteArrayMatcher) { C.QByteArrayMatcher_OperatorAssign(this.h, other.cPointer()) } -func (this *QByteArrayMatcher) SetPattern(pattern *QByteArray) { - C.QByteArrayMatcher_SetPattern(this.h, pattern.cPointer()) +func (this *QByteArrayMatcher) SetPattern(pattern []byte) { + pattern_alias := C.struct_miqt_string{} + pattern_alias.data = (*C.char)(unsafe.Pointer(&pattern[0])) + pattern_alias.len = C.size_t(len(pattern)) + C.QByteArrayMatcher_SetPattern(this.h, pattern_alias) } -func (this *QByteArrayMatcher) IndexIn(ba *QByteArray) int { - return (int)(C.QByteArrayMatcher_IndexIn(this.h, ba.cPointer())) +func (this *QByteArrayMatcher) IndexIn(ba []byte) int { + ba_alias := C.struct_miqt_string{} + ba_alias.data = (*C.char)(unsafe.Pointer(&ba[0])) + ba_alias.len = C.size_t(len(ba)) + return (int)(C.QByteArrayMatcher_IndexIn(this.h, ba_alias)) } func (this *QByteArrayMatcher) IndexIn2(str string, lenVal int) int { @@ -86,15 +95,18 @@ func (this *QByteArrayMatcher) IndexIn2(str string, lenVal int) int { return (int)(C.QByteArrayMatcher_IndexIn2(this.h, str_Cstring, (C.int)(lenVal))) } -func (this *QByteArrayMatcher) Pattern() *QByteArray { - _ret := C.QByteArrayMatcher_Pattern(this.h) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QByteArrayMatcher) Pattern() []byte { + var _bytearray C.struct_miqt_string = C.QByteArrayMatcher_Pattern(this.h) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } -func (this *QByteArrayMatcher) IndexIn22(ba *QByteArray, from int) int { - return (int)(C.QByteArrayMatcher_IndexIn22(this.h, ba.cPointer(), (C.int)(from))) +func (this *QByteArrayMatcher) IndexIn22(ba []byte, from int) int { + ba_alias := C.struct_miqt_string{} + ba_alias.data = (*C.char)(unsafe.Pointer(&ba[0])) + ba_alias.len = C.size_t(len(ba)) + return (int)(C.QByteArrayMatcher_IndexIn22(this.h, ba_alias, (C.int)(from))) } func (this *QByteArrayMatcher) IndexIn3(str string, lenVal int, from int) int { diff --git a/qt/gen_qbytearraymatcher.h b/qt/gen_qbytearraymatcher.h index 8f52971b..b66b16c7 100644 --- a/qt/gen_qbytearraymatcher.h +++ b/qt/gen_qbytearraymatcher.h @@ -24,15 +24,15 @@ typedef struct QStaticByteArrayMatcherBase QStaticByteArrayMatcherBase; #endif QByteArrayMatcher* QByteArrayMatcher_new(); -QByteArrayMatcher* QByteArrayMatcher_new2(QByteArray* pattern); +QByteArrayMatcher* QByteArrayMatcher_new2(struct miqt_string pattern); QByteArrayMatcher* QByteArrayMatcher_new3(const char* pattern, int length); QByteArrayMatcher* QByteArrayMatcher_new4(QByteArrayMatcher* other); void QByteArrayMatcher_OperatorAssign(QByteArrayMatcher* self, QByteArrayMatcher* other); -void QByteArrayMatcher_SetPattern(QByteArrayMatcher* self, QByteArray* pattern); -int QByteArrayMatcher_IndexIn(const QByteArrayMatcher* self, QByteArray* ba); +void QByteArrayMatcher_SetPattern(QByteArrayMatcher* self, struct miqt_string pattern); +int QByteArrayMatcher_IndexIn(const QByteArrayMatcher* self, struct miqt_string ba); int QByteArrayMatcher_IndexIn2(const QByteArrayMatcher* self, const char* str, int lenVal); -QByteArray* QByteArrayMatcher_Pattern(const QByteArrayMatcher* self); -int QByteArrayMatcher_IndexIn22(const QByteArrayMatcher* self, QByteArray* ba, int from); +struct miqt_string QByteArrayMatcher_Pattern(const QByteArrayMatcher* self); +int QByteArrayMatcher_IndexIn22(const QByteArrayMatcher* self, struct miqt_string ba, int from); int QByteArrayMatcher_IndexIn3(const QByteArrayMatcher* self, const char* str, int lenVal, int from); void QByteArrayMatcher_Delete(QByteArrayMatcher* self); diff --git a/qt/gen_qcalendar.cpp b/qt/gen_qcalendar.cpp index e07a926c..c662a6f2 100644 --- a/qt/gen_qcalendar.cpp +++ b/qt/gen_qcalendar.cpp @@ -78,11 +78,15 @@ int QCalendar_MaximumMonthsInYear(const QCalendar* self) { return self->maximumMonthsInYear(); } -struct miqt_string* QCalendar_Name(const QCalendar* self) { +struct miqt_string QCalendar_Name(const QCalendar* self) { QString _ret = self->name(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QDate* QCalendar_DateFromParts(const QCalendar* self, int year, int month, int day) { @@ -101,43 +105,63 @@ int QCalendar_DayOfWeek(const QCalendar* self, QDate* date) { return self->dayOfWeek(*date); } -struct miqt_string* QCalendar_MonthName(const QCalendar* self, QLocale* locale, int month) { +struct miqt_string QCalendar_MonthName(const QCalendar* self, QLocale* locale, int month) { QString _ret = self->monthName(*locale, static_cast(month)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QCalendar_StandaloneMonthName(const QCalendar* self, QLocale* locale, int month) { +struct miqt_string QCalendar_StandaloneMonthName(const QCalendar* self, QLocale* locale, int month) { QString _ret = self->standaloneMonthName(*locale, static_cast(month)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QCalendar_WeekDayName(const QCalendar* self, QLocale* locale, int day) { +struct miqt_string QCalendar_WeekDayName(const QCalendar* self, QLocale* locale, int day) { QString _ret = self->weekDayName(*locale, static_cast(day)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QCalendar_StandaloneWeekDayName(const QCalendar* self, QLocale* locale, int day) { +struct miqt_string QCalendar_StandaloneWeekDayName(const QCalendar* self, QLocale* locale, int day) { QString _ret = self->standaloneWeekDayName(*locale, static_cast(day)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } struct miqt_array* QCalendar_AvailableCalendars() { QStringList _ret = QCalendar::availableCalendars(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -149,46 +173,70 @@ int QCalendar_DaysInMonth2(const QCalendar* self, int month, int year) { return self->daysInMonth(static_cast(month), static_cast(year)); } -struct miqt_string* QCalendar_MonthName3(const QCalendar* self, QLocale* locale, int month, int year) { +struct miqt_string QCalendar_MonthName3(const QCalendar* self, QLocale* locale, int month, int year) { QString _ret = self->monthName(*locale, static_cast(month), static_cast(year)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QCalendar_MonthName4(const QCalendar* self, QLocale* locale, int month, int year, int format) { +struct miqt_string QCalendar_MonthName4(const QCalendar* self, QLocale* locale, int month, int year, int format) { QString _ret = self->monthName(*locale, static_cast(month), static_cast(year), static_cast(format)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QCalendar_StandaloneMonthName3(const QCalendar* self, QLocale* locale, int month, int year) { +struct miqt_string QCalendar_StandaloneMonthName3(const QCalendar* self, QLocale* locale, int month, int year) { QString _ret = self->standaloneMonthName(*locale, static_cast(month), static_cast(year)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QCalendar_StandaloneMonthName4(const QCalendar* self, QLocale* locale, int month, int year, int format) { +struct miqt_string QCalendar_StandaloneMonthName4(const QCalendar* self, QLocale* locale, int month, int year, int format) { QString _ret = self->standaloneMonthName(*locale, static_cast(month), static_cast(year), static_cast(format)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QCalendar_WeekDayName3(const QCalendar* self, QLocale* locale, int day, int format) { +struct miqt_string QCalendar_WeekDayName3(const QCalendar* self, QLocale* locale, int day, int format) { QString _ret = self->weekDayName(*locale, static_cast(day), static_cast(format)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QCalendar_StandaloneWeekDayName3(const QCalendar* self, QLocale* locale, int day, int format) { +struct miqt_string QCalendar_StandaloneWeekDayName3(const QCalendar* self, QLocale* locale, int day, int format) { QString _ret = self->standaloneWeekDayName(*locale, static_cast(day), static_cast(format)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QCalendar_Delete(QCalendar* self) { diff --git a/qt/gen_qcalendar.go b/qt/gen_qcalendar.go index 0eab775c..05810be5 100644 --- a/qt/gen_qcalendar.go +++ b/qt/gen_qcalendar.go @@ -133,9 +133,9 @@ func (this *QCalendar) MaximumMonthsInYear() int { } func (this *QCalendar) Name() string { - var _ms *C.struct_miqt_string = C.QCalendar_Name(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCalendar_Name(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -165,41 +165,41 @@ func (this *QCalendar) DayOfWeek(date QDate) int { } func (this *QCalendar) MonthName(locale *QLocale, month int) string { - var _ms *C.struct_miqt_string = C.QCalendar_MonthName(this.h, locale.cPointer(), (C.int)(month)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCalendar_MonthName(this.h, locale.cPointer(), (C.int)(month)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QCalendar) StandaloneMonthName(locale *QLocale, month int) string { - var _ms *C.struct_miqt_string = C.QCalendar_StandaloneMonthName(this.h, locale.cPointer(), (C.int)(month)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCalendar_StandaloneMonthName(this.h, locale.cPointer(), (C.int)(month)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QCalendar) WeekDayName(locale *QLocale, day int) string { - var _ms *C.struct_miqt_string = C.QCalendar_WeekDayName(this.h, locale.cPointer(), (C.int)(day)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCalendar_WeekDayName(this.h, locale.cPointer(), (C.int)(day)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QCalendar) StandaloneWeekDayName(locale *QLocale, day int) string { - var _ms *C.struct_miqt_string = C.QCalendar_StandaloneWeekDayName(this.h, locale.cPointer(), (C.int)(day)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCalendar_StandaloneWeekDayName(this.h, locale.cPointer(), (C.int)(day)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QCalendar_AvailableCalendars() []string { var _ma *C.struct_miqt_array = C.QCalendar_AvailableCalendars() _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -211,44 +211,44 @@ func (this *QCalendar) DaysInMonth2(month int, year int) int { } func (this *QCalendar) MonthName3(locale *QLocale, month int, year int) string { - var _ms *C.struct_miqt_string = C.QCalendar_MonthName3(this.h, locale.cPointer(), (C.int)(month), (C.int)(year)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCalendar_MonthName3(this.h, locale.cPointer(), (C.int)(month), (C.int)(year)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QCalendar) MonthName4(locale *QLocale, month int, year int, format QLocale__FormatType) string { - var _ms *C.struct_miqt_string = C.QCalendar_MonthName4(this.h, locale.cPointer(), (C.int)(month), (C.int)(year), (C.int)(format)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCalendar_MonthName4(this.h, locale.cPointer(), (C.int)(month), (C.int)(year), (C.int)(format)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QCalendar) StandaloneMonthName3(locale *QLocale, month int, year int) string { - var _ms *C.struct_miqt_string = C.QCalendar_StandaloneMonthName3(this.h, locale.cPointer(), (C.int)(month), (C.int)(year)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCalendar_StandaloneMonthName3(this.h, locale.cPointer(), (C.int)(month), (C.int)(year)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QCalendar) StandaloneMonthName4(locale *QLocale, month int, year int, format QLocale__FormatType) string { - var _ms *C.struct_miqt_string = C.QCalendar_StandaloneMonthName4(this.h, locale.cPointer(), (C.int)(month), (C.int)(year), (C.int)(format)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCalendar_StandaloneMonthName4(this.h, locale.cPointer(), (C.int)(month), (C.int)(year), (C.int)(format)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QCalendar) WeekDayName3(locale *QLocale, day int, format QLocale__FormatType) string { - var _ms *C.struct_miqt_string = C.QCalendar_WeekDayName3(this.h, locale.cPointer(), (C.int)(day), (C.int)(format)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCalendar_WeekDayName3(this.h, locale.cPointer(), (C.int)(day), (C.int)(format)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QCalendar) StandaloneWeekDayName3(locale *QLocale, day int, format QLocale__FormatType) string { - var _ms *C.struct_miqt_string = C.QCalendar_StandaloneWeekDayName3(this.h, locale.cPointer(), (C.int)(day), (C.int)(format)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCalendar_StandaloneWeekDayName3(this.h, locale.cPointer(), (C.int)(day), (C.int)(format)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qcalendar.h b/qt/gen_qcalendar.h index 4291a1a1..98ab313f 100644 --- a/qt/gen_qcalendar.h +++ b/qt/gen_qcalendar.h @@ -46,23 +46,23 @@ bool QCalendar_HasYearZero(const QCalendar* self); int QCalendar_MaximumDaysInMonth(const QCalendar* self); int QCalendar_MinimumDaysInMonth(const QCalendar* self); int QCalendar_MaximumMonthsInYear(const QCalendar* self); -struct miqt_string* QCalendar_Name(const QCalendar* self); +struct miqt_string QCalendar_Name(const QCalendar* self); QDate* QCalendar_DateFromParts(const QCalendar* self, int year, int month, int day); QDate* QCalendar_DateFromPartsWithParts(const QCalendar* self, QCalendar__YearMonthDay* parts); QCalendar__YearMonthDay* QCalendar_PartsFromDate(const QCalendar* self, QDate* date); int QCalendar_DayOfWeek(const QCalendar* self, QDate* date); -struct miqt_string* QCalendar_MonthName(const QCalendar* self, QLocale* locale, int month); -struct miqt_string* QCalendar_StandaloneMonthName(const QCalendar* self, QLocale* locale, int month); -struct miqt_string* QCalendar_WeekDayName(const QCalendar* self, QLocale* locale, int day); -struct miqt_string* QCalendar_StandaloneWeekDayName(const QCalendar* self, QLocale* locale, int day); +struct miqt_string QCalendar_MonthName(const QCalendar* self, QLocale* locale, int month); +struct miqt_string QCalendar_StandaloneMonthName(const QCalendar* self, QLocale* locale, int month); +struct miqt_string QCalendar_WeekDayName(const QCalendar* self, QLocale* locale, int day); +struct miqt_string QCalendar_StandaloneWeekDayName(const QCalendar* self, QLocale* locale, int day); struct miqt_array* QCalendar_AvailableCalendars(); int QCalendar_DaysInMonth2(const QCalendar* self, int month, int year); -struct miqt_string* QCalendar_MonthName3(const QCalendar* self, QLocale* locale, int month, int year); -struct miqt_string* QCalendar_MonthName4(const QCalendar* self, QLocale* locale, int month, int year, int format); -struct miqt_string* QCalendar_StandaloneMonthName3(const QCalendar* self, QLocale* locale, int month, int year); -struct miqt_string* QCalendar_StandaloneMonthName4(const QCalendar* self, QLocale* locale, int month, int year, int format); -struct miqt_string* QCalendar_WeekDayName3(const QCalendar* self, QLocale* locale, int day, int format); -struct miqt_string* QCalendar_StandaloneWeekDayName3(const QCalendar* self, QLocale* locale, int day, int format); +struct miqt_string QCalendar_MonthName3(const QCalendar* self, QLocale* locale, int month, int year); +struct miqt_string QCalendar_MonthName4(const QCalendar* self, QLocale* locale, int month, int year, int format); +struct miqt_string QCalendar_StandaloneMonthName3(const QCalendar* self, QLocale* locale, int month, int year); +struct miqt_string QCalendar_StandaloneMonthName4(const QCalendar* self, QLocale* locale, int month, int year, int format); +struct miqt_string QCalendar_WeekDayName3(const QCalendar* self, QLocale* locale, int day, int format); +struct miqt_string QCalendar_StandaloneWeekDayName3(const QCalendar* self, QLocale* locale, int day, int format); void QCalendar_Delete(QCalendar* self); QCalendar__YearMonthDay* QCalendar__YearMonthDay_new(); diff --git a/qt/gen_qcalendarwidget.cpp b/qt/gen_qcalendarwidget.cpp index 02d60022..b696481d 100644 --- a/qt/gen_qcalendarwidget.cpp +++ b/qt/gen_qcalendarwidget.cpp @@ -28,18 +28,26 @@ void* QCalendarWidget_Metacast(QCalendarWidget* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QCalendarWidget_Tr(const char* s) { +struct miqt_string QCalendarWidget_Tr(const char* s) { QString _ret = QCalendarWidget::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QCalendarWidget_TrUtf8(const char* s) { +struct miqt_string QCalendarWidget_TrUtf8(const char* s) { QString _ret = QCalendarWidget::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QSize* QCalendarWidget_SizeHint(const QCalendarWidget* self) { @@ -262,32 +270,48 @@ void QCalendarWidget_connect_CurrentPageChanged(QCalendarWidget* self, intptr_t }); } -struct miqt_string* QCalendarWidget_Tr2(const char* s, const char* c) { +struct miqt_string QCalendarWidget_Tr2(const char* s, const char* c) { QString _ret = QCalendarWidget::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QCalendarWidget_Tr3(const char* s, const char* c, int n) { +struct miqt_string QCalendarWidget_Tr3(const char* s, const char* c, int n) { QString _ret = QCalendarWidget::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QCalendarWidget_TrUtf82(const char* s, const char* c) { +struct miqt_string QCalendarWidget_TrUtf82(const char* s, const char* c) { QString _ret = QCalendarWidget::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QCalendarWidget_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QCalendarWidget_TrUtf83(const char* s, const char* c, int n) { QString _ret = QCalendarWidget::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QCalendarWidget_Delete(QCalendarWidget* self) { diff --git a/qt/gen_qcalendarwidget.go b/qt/gen_qcalendarwidget.go index 78910452..16046380 100644 --- a/qt/gen_qcalendarwidget.go +++ b/qt/gen_qcalendarwidget.go @@ -86,24 +86,24 @@ func (this *QCalendarWidget) MetaObject() *QMetaObject { func (this *QCalendarWidget) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QCalendarWidget_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QCalendarWidget_Metacast(this.h, param1_Cstring)) } func QCalendarWidget_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QCalendarWidget_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCalendarWidget_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QCalendarWidget_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QCalendarWidget_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCalendarWidget_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -386,9 +386,9 @@ func QCalendarWidget_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QCalendarWidget_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCalendarWidget_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -397,9 +397,9 @@ func QCalendarWidget_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QCalendarWidget_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCalendarWidget_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -408,9 +408,9 @@ func QCalendarWidget_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QCalendarWidget_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCalendarWidget_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -419,9 +419,9 @@ func QCalendarWidget_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QCalendarWidget_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCalendarWidget_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qcalendarwidget.h b/qt/gen_qcalendarwidget.h index d58fbdbc..296b2bf7 100644 --- a/qt/gen_qcalendarwidget.h +++ b/qt/gen_qcalendarwidget.h @@ -35,8 +35,8 @@ QCalendarWidget* QCalendarWidget_new(); QCalendarWidget* QCalendarWidget_new2(QWidget* parent); QMetaObject* QCalendarWidget_MetaObject(const QCalendarWidget* self); void* QCalendarWidget_Metacast(QCalendarWidget* self, const char* param1); -struct miqt_string* QCalendarWidget_Tr(const char* s); -struct miqt_string* QCalendarWidget_TrUtf8(const char* s); +struct miqt_string QCalendarWidget_Tr(const char* s); +struct miqt_string QCalendarWidget_TrUtf8(const char* s); QSize* QCalendarWidget_SizeHint(const QCalendarWidget* self); QSize* QCalendarWidget_MinimumSizeHint(const QCalendarWidget* self); QDate* QCalendarWidget_SelectedDate(const QCalendarWidget* self); @@ -87,10 +87,10 @@ void QCalendarWidget_Activated(QCalendarWidget* self, QDate* date); void QCalendarWidget_connect_Activated(QCalendarWidget* self, intptr_t slot); void QCalendarWidget_CurrentPageChanged(QCalendarWidget* self, int year, int month); void QCalendarWidget_connect_CurrentPageChanged(QCalendarWidget* self, intptr_t slot); -struct miqt_string* QCalendarWidget_Tr2(const char* s, const char* c); -struct miqt_string* QCalendarWidget_Tr3(const char* s, const char* c, int n); -struct miqt_string* QCalendarWidget_TrUtf82(const char* s, const char* c); -struct miqt_string* QCalendarWidget_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QCalendarWidget_Tr2(const char* s, const char* c); +struct miqt_string QCalendarWidget_Tr3(const char* s, const char* c, int n); +struct miqt_string QCalendarWidget_TrUtf82(const char* s, const char* c); +struct miqt_string QCalendarWidget_TrUtf83(const char* s, const char* c, int n); void QCalendarWidget_Delete(QCalendarWidget* self); #ifdef __cplusplus diff --git a/qt/gen_qcborarray.cpp b/qt/gen_qcborarray.cpp index 47cc6591..bd859857 100644 --- a/qt/gen_qcborarray.cpp +++ b/qt/gen_qcborarray.cpp @@ -221,12 +221,12 @@ QCborArray* QCborArray_OperatorShiftLeft(QCborArray* self, QCborValue* v) { return &_ret; } -QCborArray* QCborArray_FromStringList(struct miqt_array* /* of struct miqt_string* */ list) { +QCborArray* QCborArray_FromStringList(struct miqt_array* /* of struct miqt_string */ list) { QStringList list_QList; list_QList.reserve(list->len); - struct miqt_string** list_arr = static_cast(list->data); + struct miqt_string* list_arr = static_cast(list->data); for(size_t i = 0; i < list->len; ++i) { - QString list_arr_i_QString = QString::fromUtf8(&list_arr[i]->data, list_arr[i]->len); + QString list_arr_i_QString = QString::fromUtf8(list_arr[i].data, list_arr[i].len); list_QList.push_back(list_arr_i_QString); } return new QCborArray(QCborArray::fromStringList(list_QList)); diff --git a/qt/gen_qcborarray.go b/qt/gen_qcborarray.go index 353ece6e..7c374b97 100644 --- a/qt/gen_qcborarray.go +++ b/qt/gen_qcborarray.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -331,12 +330,14 @@ func (this *QCborArray) OperatorShiftLeft(v *QCborValue) *QCborArray { func QCborArray_FromStringList(list []string) *QCborArray { // For the C ABI, malloc a C array of raw pointers - list_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(list)))) + list_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(list)))) defer C.free(unsafe.Pointer(list_CArray)) for i := range list { - list_i_ms := libmiqt.Strdupg(list[i]) - defer C.free(list_i_ms) - list_CArray[i] = (*C.struct_miqt_string)(list_i_ms) + list_i_ms := C.struct_miqt_string{} + list_i_ms.data = C.CString(list[i]) + list_i_ms.len = C.size_t(len(list[i])) + defer C.free(unsafe.Pointer(list_i_ms.data)) + list_CArray[i] = list_i_ms } list_ma := &C.struct_miqt_array{len: C.size_t(len(list)), data: unsafe.Pointer(list_CArray)} defer runtime.KeepAlive(unsafe.Pointer(list_ma)) diff --git a/qt/gen_qcborarray.h b/qt/gen_qcborarray.h index 431a4493..8307b0a6 100644 --- a/qt/gen_qcborarray.h +++ b/qt/gen_qcborarray.h @@ -88,7 +88,7 @@ bool QCborArray_Empty(const QCborArray* self); QCborArray* QCborArray_OperatorPlus(const QCborArray* self, QCborValue* v); QCborArray* QCborArray_OperatorPlusAssign(QCborArray* self, QCborValue* v); QCborArray* QCborArray_OperatorShiftLeft(QCborArray* self, QCborValue* v); -QCborArray* QCborArray_FromStringList(struct miqt_array* /* of struct miqt_string* */ list); +QCborArray* QCborArray_FromStringList(struct miqt_array* /* of struct miqt_string */ list); QCborArray* QCborArray_FromJsonArray(QJsonArray* array); QJsonArray* QCborArray_ToJsonArray(const QCborArray* self); void QCborArray_Delete(QCborArray* self); diff --git a/qt/gen_qcborcommon.cpp b/qt/gen_qcborcommon.cpp index e34a1cd8..8224dc8e 100644 --- a/qt/gen_qcborcommon.cpp +++ b/qt/gen_qcborcommon.cpp @@ -6,11 +6,15 @@ #include "gen_qcborcommon.h" #include "_cgo_export.h" -struct miqt_string* QCborError_ToString(const QCborError* self) { +struct miqt_string QCborError_ToString(const QCborError* self) { QString _ret = self->toString(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QCborError_Delete(QCborError* self) { diff --git a/qt/gen_qcborcommon.go b/qt/gen_qcborcommon.go index 90c15545..af24a823 100644 --- a/qt/gen_qcborcommon.go +++ b/qt/gen_qcborcommon.go @@ -104,9 +104,9 @@ func UnsafeNewQCborError(h unsafe.Pointer) *QCborError { } func (this *QCborError) ToString() string { - var _ms *C.struct_miqt_string = C.QCborError_ToString(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCborError_ToString(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qcborcommon.h b/qt/gen_qcborcommon.h index 56692e2e..e35b942f 100644 --- a/qt/gen_qcborcommon.h +++ b/qt/gen_qcborcommon.h @@ -19,7 +19,7 @@ class QCborError; typedef struct QCborError QCborError; #endif -struct miqt_string* QCborError_ToString(const QCborError* self); +struct miqt_string QCborError_ToString(const QCborError* self); void QCborError_Delete(QCborError* self); #ifdef __cplusplus diff --git a/qt/gen_qcbormap.cpp b/qt/gen_qcbormap.cpp index 748d3bc3..b278e9e6 100644 --- a/qt/gen_qcbormap.cpp +++ b/qt/gen_qcbormap.cpp @@ -62,8 +62,8 @@ QCborValue* QCborMap_Value(const QCborMap* self, long long key) { return new QCborValue(self->value(static_cast(key))); } -QCborValue* QCborMap_Value2(const QCborMap* self, struct miqt_string* key) { - QString key_QString = QString::fromUtf8(&key->data, key->len); +QCborValue* QCborMap_Value2(const QCborMap* self, struct miqt_string key) { + QString key_QString = QString::fromUtf8(key.data, key.len); return new QCborValue(self->value(key_QString)); } @@ -75,8 +75,8 @@ QCborValue* QCborMap_OperatorSubscript(const QCborMap* self, long long key) { return new QCborValue(self->operator[](static_cast(key))); } -QCborValue* QCborMap_OperatorSubscript2(const QCborMap* self, struct miqt_string* key) { - QString key_QString = QString::fromUtf8(&key->data, key->len); +QCborValue* QCborMap_OperatorSubscript2(const QCborMap* self, struct miqt_string key) { + QString key_QString = QString::fromUtf8(key.data, key.len); return new QCborValue(self->operator[](key_QString)); } @@ -88,8 +88,8 @@ QCborValueRef* QCborMap_OperatorSubscript4(QCborMap* self, long long key) { return new QCborValueRef(self->operator[](static_cast(key))); } -QCborValueRef* QCborMap_OperatorSubscript6(QCborMap* self, struct miqt_string* key) { - QString key_QString = QString::fromUtf8(&key->data, key->len); +QCborValueRef* QCborMap_OperatorSubscript6(QCborMap* self, struct miqt_string key) { + QString key_QString = QString::fromUtf8(key.data, key.len); return new QCborValueRef(self->operator[](key_QString)); } @@ -101,8 +101,8 @@ QCborValue* QCborMap_Take(QCborMap* self, long long key) { return new QCborValue(self->take(static_cast(key))); } -QCborValue* QCborMap_Take2(QCborMap* self, struct miqt_string* key) { - QString key_QString = QString::fromUtf8(&key->data, key->len); +QCborValue* QCborMap_Take2(QCborMap* self, struct miqt_string key) { + QString key_QString = QString::fromUtf8(key.data, key.len); return new QCborValue(self->take(key_QString)); } @@ -114,8 +114,8 @@ void QCborMap_Remove(QCborMap* self, long long key) { self->remove(static_cast(key)); } -void QCborMap_Remove2(QCborMap* self, struct miqt_string* key) { - QString key_QString = QString::fromUtf8(&key->data, key->len); +void QCborMap_Remove2(QCborMap* self, struct miqt_string key) { + QString key_QString = QString::fromUtf8(key.data, key.len); self->remove(key_QString); } @@ -127,8 +127,8 @@ bool QCborMap_Contains(const QCborMap* self, long long key) { return self->contains(static_cast(key)); } -bool QCborMap_Contains2(const QCborMap* self, struct miqt_string* key) { - QString key_QString = QString::fromUtf8(&key->data, key->len); +bool QCborMap_Contains2(const QCborMap* self, struct miqt_string key) { + QString key_QString = QString::fromUtf8(key.data, key.len); return self->contains(key_QString); } @@ -208,8 +208,8 @@ QCborMap__Iterator* QCborMap_Find(QCborMap* self, long long key) { return new QCborMap::Iterator(self->find(static_cast(key))); } -QCborMap__Iterator* QCborMap_Find2(QCborMap* self, struct miqt_string* key) { - QString key_QString = QString::fromUtf8(&key->data, key->len); +QCborMap__Iterator* QCborMap_Find2(QCborMap* self, struct miqt_string key) { + QString key_QString = QString::fromUtf8(key.data, key.len); return new QCborMap::Iterator(self->find(key_QString)); } @@ -221,8 +221,8 @@ QCborMap__ConstIterator* QCborMap_ConstFind(const QCborMap* self, long long key) return new QCborMap::ConstIterator(self->constFind(static_cast(key))); } -QCborMap__ConstIterator* QCborMap_ConstFind2(const QCborMap* self, struct miqt_string* key) { - QString key_QString = QString::fromUtf8(&key->data, key->len); +QCborMap__ConstIterator* QCborMap_ConstFind2(const QCborMap* self, struct miqt_string key) { + QString key_QString = QString::fromUtf8(key.data, key.len); return new QCborMap::ConstIterator(self->constFind(key_QString)); } @@ -234,8 +234,8 @@ QCborMap__ConstIterator* QCborMap_Find4(const QCborMap* self, long long key) { return new QCborMap::ConstIterator(self->find(static_cast(key))); } -QCborMap__ConstIterator* QCborMap_Find6(const QCborMap* self, struct miqt_string* key) { - QString key_QString = QString::fromUtf8(&key->data, key->len); +QCborMap__ConstIterator* QCborMap_Find6(const QCborMap* self, struct miqt_string key) { + QString key_QString = QString::fromUtf8(key.data, key.len); return new QCborMap::ConstIterator(self->find(key_QString)); } @@ -247,8 +247,8 @@ QCborMap__Iterator* QCborMap_Insert(QCborMap* self, long long key, QCborValue* v return new QCborMap::Iterator(self->insert(static_cast(key), *value_)); } -QCborMap__Iterator* QCborMap_Insert3(QCborMap* self, struct miqt_string* key, QCborValue* value_) { - QString key_QString = QString::fromUtf8(&key->data, key->len); +QCborMap__Iterator* QCborMap_Insert3(QCborMap* self, struct miqt_string key, QCborValue* value_) { + QString key_QString = QString::fromUtf8(key.data, key.len); return new QCborMap::Iterator(self->insert(key_QString, *value_)); } diff --git a/qt/gen_qcbormap.go b/qt/gen_qcbormap.go index d6d06c3d..aa80227e 100644 --- a/qt/gen_qcbormap.go +++ b/qt/gen_qcbormap.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -104,9 +103,11 @@ func (this *QCborMap) Value(key int64) *QCborValue { } func (this *QCborMap) Value2(key string) *QCborValue { - key_ms := libmiqt.Strdupg(key) - defer C.free(key_ms) - _ret := C.QCborMap_Value2(this.h, (*C.struct_miqt_string)(key_ms)) + key_ms := C.struct_miqt_string{} + key_ms.data = C.CString(key) + key_ms.len = C.size_t(len(key)) + defer C.free(unsafe.Pointer(key_ms.data)) + _ret := C.QCborMap_Value2(this.h, key_ms) _goptr := newQCborValue(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -127,9 +128,11 @@ func (this *QCborMap) OperatorSubscript(key int64) *QCborValue { } func (this *QCborMap) OperatorSubscript2(key string) *QCborValue { - key_ms := libmiqt.Strdupg(key) - defer C.free(key_ms) - _ret := C.QCborMap_OperatorSubscript2(this.h, (*C.struct_miqt_string)(key_ms)) + key_ms := C.struct_miqt_string{} + key_ms.data = C.CString(key) + key_ms.len = C.size_t(len(key)) + defer C.free(unsafe.Pointer(key_ms.data)) + _ret := C.QCborMap_OperatorSubscript2(this.h, key_ms) _goptr := newQCborValue(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -150,9 +153,11 @@ func (this *QCborMap) OperatorSubscript4(key int64) *QCborValueRef { } func (this *QCborMap) OperatorSubscript6(key string) *QCborValueRef { - key_ms := libmiqt.Strdupg(key) - defer C.free(key_ms) - _ret := C.QCborMap_OperatorSubscript6(this.h, (*C.struct_miqt_string)(key_ms)) + key_ms := C.struct_miqt_string{} + key_ms.data = C.CString(key) + key_ms.len = C.size_t(len(key)) + defer C.free(unsafe.Pointer(key_ms.data)) + _ret := C.QCborMap_OperatorSubscript6(this.h, key_ms) _goptr := newQCborValueRef(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -173,9 +178,11 @@ func (this *QCborMap) Take(key int64) *QCborValue { } func (this *QCborMap) Take2(key string) *QCborValue { - key_ms := libmiqt.Strdupg(key) - defer C.free(key_ms) - _ret := C.QCborMap_Take2(this.h, (*C.struct_miqt_string)(key_ms)) + key_ms := C.struct_miqt_string{} + key_ms.data = C.CString(key) + key_ms.len = C.size_t(len(key)) + defer C.free(unsafe.Pointer(key_ms.data)) + _ret := C.QCborMap_Take2(this.h, key_ms) _goptr := newQCborValue(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -193,9 +200,11 @@ func (this *QCborMap) Remove(key int64) { } func (this *QCborMap) Remove2(key string) { - key_ms := libmiqt.Strdupg(key) - defer C.free(key_ms) - C.QCborMap_Remove2(this.h, (*C.struct_miqt_string)(key_ms)) + key_ms := C.struct_miqt_string{} + key_ms.data = C.CString(key) + key_ms.len = C.size_t(len(key)) + defer C.free(unsafe.Pointer(key_ms.data)) + C.QCborMap_Remove2(this.h, key_ms) } func (this *QCborMap) Remove3(key *QCborValue) { @@ -207,9 +216,11 @@ func (this *QCborMap) Contains(key int64) bool { } func (this *QCborMap) Contains2(key string) bool { - key_ms := libmiqt.Strdupg(key) - defer C.free(key_ms) - return (bool)(C.QCborMap_Contains2(this.h, (*C.struct_miqt_string)(key_ms))) + key_ms := C.struct_miqt_string{} + key_ms.data = C.CString(key) + key_ms.len = C.size_t(len(key)) + defer C.free(unsafe.Pointer(key_ms.data)) + return (bool)(C.QCborMap_Contains2(this.h, key_ms)) } func (this *QCborMap) Contains3(key *QCborValue) bool { @@ -328,9 +339,11 @@ func (this *QCborMap) Find(key int64) *QCborMap__Iterator { } func (this *QCborMap) Find2(key string) *QCborMap__Iterator { - key_ms := libmiqt.Strdupg(key) - defer C.free(key_ms) - _ret := C.QCborMap_Find2(this.h, (*C.struct_miqt_string)(key_ms)) + key_ms := C.struct_miqt_string{} + key_ms.data = C.CString(key) + key_ms.len = C.size_t(len(key)) + defer C.free(unsafe.Pointer(key_ms.data)) + _ret := C.QCborMap_Find2(this.h, key_ms) _goptr := newQCborMap__Iterator(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -351,9 +364,11 @@ func (this *QCborMap) ConstFind(key int64) *QCborMap__ConstIterator { } func (this *QCborMap) ConstFind2(key string) *QCborMap__ConstIterator { - key_ms := libmiqt.Strdupg(key) - defer C.free(key_ms) - _ret := C.QCborMap_ConstFind2(this.h, (*C.struct_miqt_string)(key_ms)) + key_ms := C.struct_miqt_string{} + key_ms.data = C.CString(key) + key_ms.len = C.size_t(len(key)) + defer C.free(unsafe.Pointer(key_ms.data)) + _ret := C.QCborMap_ConstFind2(this.h, key_ms) _goptr := newQCborMap__ConstIterator(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -374,9 +389,11 @@ func (this *QCborMap) Find4(key int64) *QCborMap__ConstIterator { } func (this *QCborMap) Find6(key string) *QCborMap__ConstIterator { - key_ms := libmiqt.Strdupg(key) - defer C.free(key_ms) - _ret := C.QCborMap_Find6(this.h, (*C.struct_miqt_string)(key_ms)) + key_ms := C.struct_miqt_string{} + key_ms.data = C.CString(key) + key_ms.len = C.size_t(len(key)) + defer C.free(unsafe.Pointer(key_ms.data)) + _ret := C.QCborMap_Find6(this.h, key_ms) _goptr := newQCborMap__ConstIterator(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -397,9 +414,11 @@ func (this *QCborMap) Insert(key int64, value_ *QCborValue) *QCborMap__Iterator } func (this *QCborMap) Insert3(key string, value_ *QCborValue) *QCborMap__Iterator { - key_ms := libmiqt.Strdupg(key) - defer C.free(key_ms) - _ret := C.QCborMap_Insert3(this.h, (*C.struct_miqt_string)(key_ms), value_.cPointer()) + key_ms := C.struct_miqt_string{} + key_ms.data = C.CString(key) + key_ms.len = C.size_t(len(key)) + defer C.free(unsafe.Pointer(key_ms.data)) + _ret := C.QCborMap_Insert3(this.h, key_ms, value_.cPointer()) _goptr := newQCborMap__Iterator(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr diff --git a/qt/gen_qcbormap.h b/qt/gen_qcbormap.h index 3037ae02..88a84d67 100644 --- a/qt/gen_qcbormap.h +++ b/qt/gen_qcbormap.h @@ -47,22 +47,22 @@ bool QCborMap_IsEmpty(const QCborMap* self); void QCborMap_Clear(QCborMap* self); struct miqt_array* QCborMap_Keys(const QCborMap* self); QCborValue* QCborMap_Value(const QCborMap* self, long long key); -QCborValue* QCborMap_Value2(const QCborMap* self, struct miqt_string* key); +QCborValue* QCborMap_Value2(const QCborMap* self, struct miqt_string key); QCborValue* QCborMap_Value3(const QCborMap* self, QCborValue* key); QCborValue* QCborMap_OperatorSubscript(const QCborMap* self, long long key); -QCborValue* QCborMap_OperatorSubscript2(const QCborMap* self, struct miqt_string* key); +QCborValue* QCborMap_OperatorSubscript2(const QCborMap* self, struct miqt_string key); QCborValue* QCborMap_OperatorSubscript3(const QCborMap* self, QCborValue* key); QCborValueRef* QCborMap_OperatorSubscript4(QCborMap* self, long long key); -QCborValueRef* QCborMap_OperatorSubscript6(QCborMap* self, struct miqt_string* key); +QCborValueRef* QCborMap_OperatorSubscript6(QCborMap* self, struct miqt_string key); QCborValueRef* QCborMap_OperatorSubscript7(QCborMap* self, QCborValue* key); QCborValue* QCborMap_Take(QCborMap* self, long long key); -QCborValue* QCborMap_Take2(QCborMap* self, struct miqt_string* key); +QCborValue* QCborMap_Take2(QCborMap* self, struct miqt_string key); QCborValue* QCborMap_Take3(QCborMap* self, QCborValue* key); void QCborMap_Remove(QCborMap* self, long long key); -void QCborMap_Remove2(QCborMap* self, struct miqt_string* key); +void QCborMap_Remove2(QCborMap* self, struct miqt_string key); void QCborMap_Remove3(QCborMap* self, QCborValue* key); bool QCborMap_Contains(const QCborMap* self, long long key); -bool QCborMap_Contains2(const QCborMap* self, struct miqt_string* key); +bool QCborMap_Contains2(const QCborMap* self, struct miqt_string key); bool QCborMap_Contains3(const QCborMap* self, QCborValue* key); int QCborMap_Compare(const QCborMap* self, QCborMap* other); bool QCborMap_OperatorEqual(const QCborMap* self, QCborMap* other); @@ -82,16 +82,16 @@ QCborValue* QCborMap_Extract(QCborMap* self, QCborMap__Iterator* it); QCborValue* QCborMap_ExtractWithIt(QCborMap* self, QCborMap__ConstIterator* it); bool QCborMap_Empty(const QCborMap* self); QCborMap__Iterator* QCborMap_Find(QCborMap* self, long long key); -QCborMap__Iterator* QCborMap_Find2(QCborMap* self, struct miqt_string* key); +QCborMap__Iterator* QCborMap_Find2(QCborMap* self, struct miqt_string key); QCborMap__Iterator* QCborMap_Find3(QCborMap* self, QCborValue* key); QCborMap__ConstIterator* QCborMap_ConstFind(const QCborMap* self, long long key); -QCborMap__ConstIterator* QCborMap_ConstFind2(const QCborMap* self, struct miqt_string* key); +QCborMap__ConstIterator* QCborMap_ConstFind2(const QCborMap* self, struct miqt_string key); QCborMap__ConstIterator* QCborMap_ConstFind3(const QCborMap* self, QCborValue* key); QCborMap__ConstIterator* QCborMap_Find4(const QCborMap* self, long long key); -QCborMap__ConstIterator* QCborMap_Find6(const QCborMap* self, struct miqt_string* key); +QCborMap__ConstIterator* QCborMap_Find6(const QCborMap* self, struct miqt_string key); QCborMap__ConstIterator* QCborMap_Find7(const QCborMap* self, QCborValue* key); QCborMap__Iterator* QCborMap_Insert(QCborMap* self, long long key, QCborValue* value_); -QCborMap__Iterator* QCborMap_Insert3(QCborMap* self, struct miqt_string* key, QCborValue* value_); +QCborMap__Iterator* QCborMap_Insert3(QCborMap* self, struct miqt_string key, QCborValue* value_); QCborMap__Iterator* QCborMap_Insert4(QCborMap* self, QCborValue* key, QCborValue* value_); QCborMap* QCborMap_FromJsonObject(QJsonObject* o); QJsonObject* QCborMap_ToJsonObject(const QCborMap* self); diff --git a/qt/gen_qcborstreamreader.cpp b/qt/gen_qcborstreamreader.cpp index 9a1bc277..c42bf290 100644 --- a/qt/gen_qcborstreamreader.cpp +++ b/qt/gen_qcborstreamreader.cpp @@ -18,8 +18,9 @@ QCborStreamReader* QCborStreamReader_new3(const unsigned char* data, ptrdiff_t l return new QCborStreamReader(static_cast(data), (qsizetype)(lenVal)); } -QCborStreamReader* QCborStreamReader_new4(QByteArray* data) { - return new QCborStreamReader(*data); +QCborStreamReader* QCborStreamReader_new4(struct miqt_string data) { + QByteArray data_QByteArray(data.data, data.len); + return new QCborStreamReader(data_QByteArray); } QCborStreamReader* QCborStreamReader_new5(QIODevice* device) { @@ -34,8 +35,9 @@ QIODevice* QCborStreamReader_Device(const QCborStreamReader* self) { return self->device(); } -void QCborStreamReader_AddData(QCborStreamReader* self, QByteArray* data) { - self->addData(*data); +void QCborStreamReader_AddData(QCborStreamReader* self, struct miqt_string data) { + QByteArray data_QByteArray(data.data, data.len); + self->addData(data_QByteArray); } void QCborStreamReader_AddData2(QCborStreamReader* self, const char* data, ptrdiff_t lenVal) { diff --git a/qt/gen_qcborstreamreader.go b/qt/gen_qcborstreamreader.go index 1db7a1a8..e3dd61da 100644 --- a/qt/gen_qcborstreamreader.go +++ b/qt/gen_qcborstreamreader.go @@ -91,8 +91,11 @@ func NewQCborStreamReader3(data *byte, lenVal int64) *QCborStreamReader { } // NewQCborStreamReader4 constructs a new QCborStreamReader object. -func NewQCborStreamReader4(data *QByteArray) *QCborStreamReader { - ret := C.QCborStreamReader_new4(data.cPointer()) +func NewQCborStreamReader4(data []byte) *QCborStreamReader { + data_alias := C.struct_miqt_string{} + data_alias.data = (*C.char)(unsafe.Pointer(&data[0])) + data_alias.len = C.size_t(len(data)) + ret := C.QCborStreamReader_new4(data_alias) return newQCborStreamReader(ret) } @@ -110,8 +113,11 @@ func (this *QCborStreamReader) Device() *QIODevice { return UnsafeNewQIODevice(unsafe.Pointer(C.QCborStreamReader_Device(this.h))) } -func (this *QCborStreamReader) AddData(data *QByteArray) { - C.QCborStreamReader_AddData(this.h, data.cPointer()) +func (this *QCborStreamReader) AddData(data []byte) { + data_alias := C.struct_miqt_string{} + data_alias.data = (*C.char)(unsafe.Pointer(&data[0])) + data_alias.len = C.size_t(len(data)) + C.QCborStreamReader_AddData(this.h, data_alias) } func (this *QCborStreamReader) AddData2(data string, lenVal int64) { diff --git a/qt/gen_qcborstreamreader.h b/qt/gen_qcborstreamreader.h index 9c2ff37c..4de66206 100644 --- a/qt/gen_qcborstreamreader.h +++ b/qt/gen_qcborstreamreader.h @@ -28,11 +28,11 @@ typedef struct QIODevice QIODevice; QCborStreamReader* QCborStreamReader_new(); QCborStreamReader* QCborStreamReader_new2(const char* data, ptrdiff_t lenVal); QCborStreamReader* QCborStreamReader_new3(const unsigned char* data, ptrdiff_t lenVal); -QCborStreamReader* QCborStreamReader_new4(QByteArray* data); +QCborStreamReader* QCborStreamReader_new4(struct miqt_string data); QCborStreamReader* QCborStreamReader_new5(QIODevice* device); void QCborStreamReader_SetDevice(QCborStreamReader* self, QIODevice* device); QIODevice* QCborStreamReader_Device(const QCborStreamReader* self); -void QCborStreamReader_AddData(QCborStreamReader* self, QByteArray* data); +void QCborStreamReader_AddData(QCborStreamReader* self, struct miqt_string data); void QCborStreamReader_AddData2(QCborStreamReader* self, const char* data, ptrdiff_t lenVal); void QCborStreamReader_AddData3(QCborStreamReader* self, const unsigned char* data, ptrdiff_t lenVal); void QCborStreamReader_Reparse(QCborStreamReader* self); diff --git a/qt/gen_qcborstreamwriter.cpp b/qt/gen_qcborstreamwriter.cpp index b7bf6aea..cabb533b 100644 --- a/qt/gen_qcborstreamwriter.cpp +++ b/qt/gen_qcborstreamwriter.cpp @@ -9,10 +9,6 @@ QCborStreamWriter* QCborStreamWriter_new(QIODevice* device) { return new QCborStreamWriter(device); } -QCborStreamWriter* QCborStreamWriter_new2(QByteArray* data) { - return new QCborStreamWriter(data); -} - void QCborStreamWriter_SetDevice(QCborStreamWriter* self, QIODevice* device) { self->setDevice(device); } @@ -33,8 +29,9 @@ void QCborStreamWriter_AppendWithQCborNegativeInteger(QCborStreamWriter* self, u self->append(static_cast(n)); } -void QCborStreamWriter_AppendWithBa(QCborStreamWriter* self, QByteArray* ba) { - self->append(*ba); +void QCborStreamWriter_AppendWithBa(QCborStreamWriter* self, struct miqt_string ba) { + QByteArray ba_QByteArray(ba.data, ba.len); + self->append(ba_QByteArray); } void QCborStreamWriter_AppendWithTag(QCborStreamWriter* self, uint64_t tag) { diff --git a/qt/gen_qcborstreamwriter.go b/qt/gen_qcborstreamwriter.go index 43a0b22a..13eeb2b3 100644 --- a/qt/gen_qcborstreamwriter.go +++ b/qt/gen_qcborstreamwriter.go @@ -48,12 +48,6 @@ func NewQCborStreamWriter(device *QIODevice) *QCborStreamWriter { return newQCborStreamWriter(ret) } -// NewQCborStreamWriter2 constructs a new QCborStreamWriter object. -func NewQCborStreamWriter2(data *QByteArray) *QCborStreamWriter { - ret := C.QCborStreamWriter_new2(data.cPointer()) - return newQCborStreamWriter(ret) -} - func (this *QCborStreamWriter) SetDevice(device *QIODevice) { C.QCborStreamWriter_SetDevice(this.h, device.cPointer()) } @@ -74,8 +68,11 @@ func (this *QCborStreamWriter) AppendWithQCborNegativeInteger(n QCborNegativeInt C.QCborStreamWriter_AppendWithQCborNegativeInteger(this.h, (C.uint64_t)(n)) } -func (this *QCborStreamWriter) AppendWithBa(ba *QByteArray) { - C.QCborStreamWriter_AppendWithBa(this.h, ba.cPointer()) +func (this *QCborStreamWriter) AppendWithBa(ba []byte) { + ba_alias := C.struct_miqt_string{} + ba_alias.data = (*C.char)(unsafe.Pointer(&ba[0])) + ba_alias.len = C.size_t(len(ba)) + C.QCborStreamWriter_AppendWithBa(this.h, ba_alias) } func (this *QCborStreamWriter) AppendWithTag(tag QCborTag) { diff --git a/qt/gen_qcborstreamwriter.h b/qt/gen_qcborstreamwriter.h index 5cc1fcfb..3d3d1234 100644 --- a/qt/gen_qcborstreamwriter.h +++ b/qt/gen_qcborstreamwriter.h @@ -24,13 +24,12 @@ typedef struct QIODevice QIODevice; #endif QCborStreamWriter* QCborStreamWriter_new(QIODevice* device); -QCborStreamWriter* QCborStreamWriter_new2(QByteArray* data); void QCborStreamWriter_SetDevice(QCborStreamWriter* self, QIODevice* device); QIODevice* QCborStreamWriter_Device(const QCborStreamWriter* self); void QCborStreamWriter_Append(QCborStreamWriter* self, unsigned long long u); void QCborStreamWriter_AppendWithQint64(QCborStreamWriter* self, long long i); void QCborStreamWriter_AppendWithQCborNegativeInteger(QCborStreamWriter* self, uint64_t n); -void QCborStreamWriter_AppendWithBa(QCborStreamWriter* self, QByteArray* ba); +void QCborStreamWriter_AppendWithBa(QCborStreamWriter* self, struct miqt_string ba); void QCborStreamWriter_AppendWithTag(QCborStreamWriter* self, uint64_t tag); void QCborStreamWriter_Append3(QCborStreamWriter* self, int tag); void QCborStreamWriter_AppendWithSt(QCborStreamWriter* self, uint8_t st); diff --git a/qt/gen_qcborvalue.cpp b/qt/gen_qcborvalue.cpp index 1d752cd4..bf20637b 100644 --- a/qt/gen_qcborvalue.cpp +++ b/qt/gen_qcborvalue.cpp @@ -19,11 +19,15 @@ #include "gen_qcborvalue.h" #include "_cgo_export.h" -struct miqt_string* QCborParserError_ErrorString(const QCborParserError* self) { +struct miqt_string QCborParserError_ErrorString(const QCborParserError* self) { QString _ret = self->errorString(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QCborParserError_Delete(QCborParserError* self) { @@ -62,12 +66,13 @@ QCborValue* QCborValue_new8(uint8_t st) { return new QCborValue(static_cast(st)); } -QCborValue* QCborValue_new9(QByteArray* ba) { - return new QCborValue(*ba); +QCborValue* QCborValue_new9(struct miqt_string ba) { + QByteArray ba_QByteArray(ba.data, ba.len); + return new QCborValue(ba_QByteArray); } -QCborValue* QCborValue_new10(struct miqt_string* s) { - QString s_QString = QString::fromUtf8(&s->data, s->len); +QCborValue* QCborValue_new10(struct miqt_string s) { + QString s_QString = QString::fromUtf8(s.data, s.len); return new QCborValue(s_QString); } @@ -239,15 +244,24 @@ QCborValue* QCborValue_TaggedValue(const QCborValue* self) { return new QCborValue(self->taggedValue()); } -QByteArray* QCborValue_ToByteArray(const QCborValue* self) { - return new QByteArray(self->toByteArray()); +struct miqt_string QCborValue_ToByteArray(const QCborValue* self) { + QByteArray _qb = self->toByteArray(); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } -struct miqt_string* QCborValue_ToString(const QCborValue* self) { +struct miqt_string QCborValue_ToString(const QCborValue* self) { QString _ret = self->toString(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QDateTime* QCborValue_ToDateTime(const QCborValue* self) { @@ -282,8 +296,8 @@ QCborMap* QCborValue_ToMapWithDefaultValue(const QCborValue* self, QCborMap* def return new QCborMap(self->toMap(*defaultValue)); } -QCborValue* QCborValue_OperatorSubscript(const QCborValue* self, struct miqt_string* key) { - QString key_QString = QString::fromUtf8(&key->data, key->len); +QCborValue* QCborValue_OperatorSubscript(const QCborValue* self, struct miqt_string key) { + QString key_QString = QString::fromUtf8(key.data, key.len); return new QCborValue(self->operator[](key_QString)); } @@ -295,8 +309,8 @@ QCborValueRef* QCborValue_OperatorSubscript3(QCborValue* self, long long key) { return new QCborValueRef(self->operator[](static_cast(key))); } -QCborValueRef* QCborValue_OperatorSubscript5(QCborValue* self, struct miqt_string* key) { - QString key_QString = QString::fromUtf8(&key->data, key->len); +QCborValueRef* QCborValue_OperatorSubscript5(QCborValue* self, struct miqt_string key) { + QString key_QString = QString::fromUtf8(key.data, key.len); return new QCborValueRef(self->operator[](key_QString)); } @@ -336,8 +350,9 @@ QCborValue* QCborValue_FromCbor(QCborStreamReader* reader) { return new QCborValue(QCborValue::fromCbor(*reader)); } -QCborValue* QCborValue_FromCborWithBa(QByteArray* ba) { - return new QCborValue(QCborValue::fromCbor(*ba)); +QCborValue* QCborValue_FromCborWithBa(struct miqt_string ba) { + QByteArray ba_QByteArray(ba.data, ba.len); + return new QCborValue(QCborValue::fromCbor(ba_QByteArray)); } QCborValue* QCborValue_FromCbor2(const char* data, ptrdiff_t lenVal) { @@ -348,19 +363,28 @@ QCborValue* QCborValue_FromCbor3(const unsigned char* data, ptrdiff_t lenVal) { return new QCborValue(QCborValue::fromCbor(static_cast(data), (qsizetype)(lenVal))); } -QByteArray* QCborValue_ToCbor(QCborValue* self) { - return new QByteArray(self->toCbor()); +struct miqt_string QCborValue_ToCbor(QCborValue* self) { + QByteArray _qb = self->toCbor(); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } void QCborValue_ToCborWithWriter(QCborValue* self, QCborStreamWriter* writer) { self->toCbor(*writer); } -struct miqt_string* QCborValue_ToDiagnosticNotation(const QCborValue* self) { +struct miqt_string QCborValue_ToDiagnosticNotation(const QCborValue* self) { QString _ret = self->toDiagnosticNotation(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } uint8_t QCborValue_ToSimpleType1(const QCborValue* self, uint8_t defaultValue) { @@ -390,16 +414,26 @@ QCborValue* QCborValue_TaggedValue1(const QCborValue* self, QCborValue* defaultV return new QCborValue(self->taggedValue(*defaultValue)); } -QByteArray* QCborValue_ToByteArray1(const QCborValue* self, QByteArray* defaultValue) { - return new QByteArray(self->toByteArray(*defaultValue)); +struct miqt_string QCborValue_ToByteArray1(const QCborValue* self, struct miqt_string defaultValue) { + QByteArray defaultValue_QByteArray(defaultValue.data, defaultValue.len); + QByteArray _qb = self->toByteArray(defaultValue_QByteArray); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } -struct miqt_string* QCborValue_ToString1(const QCborValue* self, struct miqt_string* defaultValue) { - QString defaultValue_QString = QString::fromUtf8(&defaultValue->data, defaultValue->len); +struct miqt_string QCborValue_ToString1(const QCborValue* self, struct miqt_string defaultValue) { + QString defaultValue_QString = QString::fromUtf8(defaultValue.data, defaultValue.len); QString _ret = self->toString(defaultValue_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QDateTime* QCborValue_ToDateTime1(const QCborValue* self, QDateTime* defaultValue) { @@ -418,8 +452,9 @@ QUuid* QCborValue_ToUuid1(const QCborValue* self, QUuid* defaultValue) { return new QUuid(self->toUuid(*defaultValue)); } -QCborValue* QCborValue_FromCbor22(QByteArray* ba, QCborParserError* error) { - return new QCborValue(QCborValue::fromCbor(*ba, error)); +QCborValue* QCborValue_FromCbor22(struct miqt_string ba, QCborParserError* error) { + QByteArray ba_QByteArray(ba.data, ba.len); + return new QCborValue(QCborValue::fromCbor(ba_QByteArray, error)); } QCborValue* QCborValue_FromCbor32(const char* data, ptrdiff_t lenVal, QCborParserError* error) { @@ -430,19 +465,28 @@ QCborValue* QCborValue_FromCbor33(const unsigned char* data, ptrdiff_t lenVal, Q return new QCborValue(QCborValue::fromCbor(static_cast(data), (qsizetype)(lenVal), error)); } -QByteArray* QCborValue_ToCbor1(QCborValue* self, int opt) { - return new QByteArray(self->toCbor(static_cast(opt))); +struct miqt_string QCborValue_ToCbor1(QCborValue* self, int opt) { + QByteArray _qb = self->toCbor(static_cast(opt)); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } void QCborValue_ToCbor2(QCborValue* self, QCborStreamWriter* writer, int opt) { self->toCbor(*writer, static_cast(opt)); } -struct miqt_string* QCborValue_ToDiagnosticNotation1(const QCborValue* self, int opts) { +struct miqt_string QCborValue_ToDiagnosticNotation1(const QCborValue* self, int opts) { QString _ret = self->toDiagnosticNotation(static_cast(opts)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QCborValue_Delete(QCborValue* self) { @@ -568,15 +612,24 @@ double QCborValueRef_ToDouble(const QCborValueRef* self) { return self->toDouble(); } -QByteArray* QCborValueRef_ToByteArray(const QCborValueRef* self) { - return new QByteArray(self->toByteArray()); +struct miqt_string QCborValueRef_ToByteArray(const QCborValueRef* self) { + QByteArray _qb = self->toByteArray(); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } -struct miqt_string* QCborValueRef_ToString(const QCborValueRef* self) { +struct miqt_string QCborValueRef_ToString(const QCborValueRef* self) { QString _ret = self->toString(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QDateTime* QCborValueRef_ToDateTime(const QCborValueRef* self) { @@ -611,8 +664,8 @@ QCborMap* QCborValueRef_ToMapWithQCborMap(const QCborValueRef* self, QCborMap* m return new QCborMap(self->toMap(*m)); } -QCborValue* QCborValueRef_OperatorSubscript(const QCborValueRef* self, struct miqt_string* key) { - QString key_QString = QString::fromUtf8(&key->data, key->len); +QCborValue* QCborValueRef_OperatorSubscript(const QCborValueRef* self, struct miqt_string key) { + QString key_QString = QString::fromUtf8(key.data, key.len); return new QCborValue(self->operator[](key_QString)); } @@ -624,8 +677,8 @@ QCborValueRef* QCborValueRef_OperatorSubscript3(QCborValueRef* self, long long k return new QCborValueRef(self->operator[](static_cast(key))); } -QCborValueRef* QCborValueRef_OperatorSubscript5(QCborValueRef* self, struct miqt_string* key) { - QString key_QString = QString::fromUtf8(&key->data, key->len); +QCborValueRef* QCborValueRef_OperatorSubscript5(QCborValueRef* self, struct miqt_string key) { + QString key_QString = QString::fromUtf8(key.data, key.len); return new QCborValueRef(self->operator[](key_QString)); } @@ -653,19 +706,28 @@ QJsonValue* QCborValueRef_ToJsonValue(const QCborValueRef* self) { return new QJsonValue(self->toJsonValue()); } -QByteArray* QCborValueRef_ToCbor(QCborValueRef* self) { - return new QByteArray(self->toCbor()); +struct miqt_string QCborValueRef_ToCbor(QCborValueRef* self) { + QByteArray _qb = self->toCbor(); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } void QCborValueRef_ToCborWithWriter(QCborValueRef* self, QCborStreamWriter* writer) { self->toCbor(*writer); } -struct miqt_string* QCborValueRef_ToDiagnosticNotation(QCborValueRef* self) { +struct miqt_string QCborValueRef_ToDiagnosticNotation(QCborValueRef* self) { QString _ret = self->toDiagnosticNotation(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } uint64_t QCborValueRef_Tag1(const QCborValueRef* self, uint64_t defaultValue) { @@ -690,16 +752,26 @@ double QCborValueRef_ToDouble1(const QCborValueRef* self, double defaultValue) { return self->toDouble(static_cast(defaultValue)); } -QByteArray* QCborValueRef_ToByteArray1(const QCborValueRef* self, QByteArray* defaultValue) { - return new QByteArray(self->toByteArray(*defaultValue)); +struct miqt_string QCborValueRef_ToByteArray1(const QCborValueRef* self, struct miqt_string defaultValue) { + QByteArray defaultValue_QByteArray(defaultValue.data, defaultValue.len); + QByteArray _qb = self->toByteArray(defaultValue_QByteArray); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } -struct miqt_string* QCborValueRef_ToString1(const QCborValueRef* self, struct miqt_string* defaultValue) { - QString defaultValue_QString = QString::fromUtf8(&defaultValue->data, defaultValue->len); +struct miqt_string QCborValueRef_ToString1(const QCborValueRef* self, struct miqt_string defaultValue) { + QString defaultValue_QString = QString::fromUtf8(defaultValue.data, defaultValue.len); QString _ret = self->toString(defaultValue_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QDateTime* QCborValueRef_ToDateTime1(const QCborValueRef* self, QDateTime* defaultValue) { @@ -718,19 +790,28 @@ QUuid* QCborValueRef_ToUuid1(const QCborValueRef* self, QUuid* defaultValue) { return new QUuid(self->toUuid(*defaultValue)); } -QByteArray* QCborValueRef_ToCbor1(QCborValueRef* self, int opt) { - return new QByteArray(self->toCbor(static_cast(opt))); +struct miqt_string QCborValueRef_ToCbor1(QCborValueRef* self, int opt) { + QByteArray _qb = self->toCbor(static_cast(opt)); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } void QCborValueRef_ToCbor2(QCborValueRef* self, QCborStreamWriter* writer, int opt) { self->toCbor(*writer, static_cast(opt)); } -struct miqt_string* QCborValueRef_ToDiagnosticNotation1(QCborValueRef* self, int opt) { +struct miqt_string QCborValueRef_ToDiagnosticNotation1(QCborValueRef* self, int opt) { QString _ret = self->toDiagnosticNotation(static_cast(opt)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QCborValueRef_Delete(QCborValueRef* self) { diff --git a/qt/gen_qcborvalue.go b/qt/gen_qcborvalue.go index 48b70039..59307408 100644 --- a/qt/gen_qcborvalue.go +++ b/qt/gen_qcborvalue.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -84,9 +83,9 @@ func UnsafeNewQCborParserError(h unsafe.Pointer) *QCborParserError { } func (this *QCborParserError) ErrorString() string { - var _ms *C.struct_miqt_string = C.QCborParserError_ErrorString(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCborParserError_ErrorString(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -182,16 +181,21 @@ func NewQCborValue8(st QCborSimpleType) *QCborValue { } // NewQCborValue9 constructs a new QCborValue object. -func NewQCborValue9(ba *QByteArray) *QCborValue { - ret := C.QCborValue_new9(ba.cPointer()) +func NewQCborValue9(ba []byte) *QCborValue { + ba_alias := C.struct_miqt_string{} + ba_alias.data = (*C.char)(unsafe.Pointer(&ba[0])) + ba_alias.len = C.size_t(len(ba)) + ret := C.QCborValue_new9(ba_alias) return newQCborValue(ret) } // NewQCborValue10 constructs a new QCborValue object. func NewQCborValue10(s string) *QCborValue { - s_ms := libmiqt.Strdupg(s) - defer C.free(s_ms) - ret := C.QCborValue_new10((*C.struct_miqt_string)(s_ms)) + s_ms := C.struct_miqt_string{} + s_ms.data = C.CString(s) + s_ms.len = C.size_t(len(s)) + defer C.free(unsafe.Pointer(s_ms.data)) + ret := C.QCborValue_new10(s_ms) return newQCborValue(ret) } @@ -388,17 +392,17 @@ func (this *QCborValue) TaggedValue() *QCborValue { return _goptr } -func (this *QCborValue) ToByteArray() *QByteArray { - _ret := C.QCborValue_ToByteArray(this.h) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QCborValue) ToByteArray() []byte { + var _bytearray C.struct_miqt_string = C.QCborValue_ToByteArray(this.h) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } func (this *QCborValue) ToString() string { - var _ms *C.struct_miqt_string = C.QCborValue_ToString(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCborValue_ToString(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -459,9 +463,11 @@ func (this *QCborValue) ToMapWithDefaultValue(defaultValue *QCborMap) *QCborMap } func (this *QCborValue) OperatorSubscript(key string) *QCborValue { - key_ms := libmiqt.Strdupg(key) - defer C.free(key_ms) - _ret := C.QCborValue_OperatorSubscript(this.h, (*C.struct_miqt_string)(key_ms)) + key_ms := C.struct_miqt_string{} + key_ms.data = C.CString(key) + key_ms.len = C.size_t(len(key)) + defer C.free(unsafe.Pointer(key_ms.data)) + _ret := C.QCborValue_OperatorSubscript(this.h, key_ms) _goptr := newQCborValue(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -482,9 +488,11 @@ func (this *QCborValue) OperatorSubscript3(key int64) *QCborValueRef { } func (this *QCborValue) OperatorSubscript5(key string) *QCborValueRef { - key_ms := libmiqt.Strdupg(key) - defer C.free(key_ms) - _ret := C.QCborValue_OperatorSubscript5(this.h, (*C.struct_miqt_string)(key_ms)) + key_ms := C.struct_miqt_string{} + key_ms.data = C.CString(key) + key_ms.len = C.size_t(len(key)) + defer C.free(unsafe.Pointer(key_ms.data)) + _ret := C.QCborValue_OperatorSubscript5(this.h, key_ms) _goptr := newQCborValueRef(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -541,8 +549,11 @@ func QCborValue_FromCbor(reader *QCborStreamReader) *QCborValue { return _goptr } -func QCborValue_FromCborWithBa(ba *QByteArray) *QCborValue { - _ret := C.QCborValue_FromCborWithBa(ba.cPointer()) +func QCborValue_FromCborWithBa(ba []byte) *QCborValue { + ba_alias := C.struct_miqt_string{} + ba_alias.data = (*C.char)(unsafe.Pointer(&ba[0])) + ba_alias.len = C.size_t(len(ba)) + _ret := C.QCborValue_FromCborWithBa(ba_alias) _goptr := newQCborValue(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -564,11 +575,11 @@ func QCborValue_FromCbor3(data *byte, lenVal int64) *QCborValue { return _goptr } -func (this *QCborValue) ToCbor() *QByteArray { - _ret := C.QCborValue_ToCbor(this.h) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QCborValue) ToCbor() []byte { + var _bytearray C.struct_miqt_string = C.QCborValue_ToCbor(this.h) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } func (this *QCborValue) ToCborWithWriter(writer *QCborStreamWriter) { @@ -576,9 +587,9 @@ func (this *QCborValue) ToCborWithWriter(writer *QCborStreamWriter) { } func (this *QCborValue) ToDiagnosticNotation() string { - var _ms *C.struct_miqt_string = C.QCborValue_ToDiagnosticNotation(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCborValue_ToDiagnosticNotation(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -609,19 +620,24 @@ func (this *QCborValue) TaggedValue1(defaultValue *QCborValue) *QCborValue { return _goptr } -func (this *QCborValue) ToByteArray1(defaultValue *QByteArray) *QByteArray { - _ret := C.QCborValue_ToByteArray1(this.h, defaultValue.cPointer()) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QCborValue) ToByteArray1(defaultValue []byte) []byte { + defaultValue_alias := C.struct_miqt_string{} + defaultValue_alias.data = (*C.char)(unsafe.Pointer(&defaultValue[0])) + defaultValue_alias.len = C.size_t(len(defaultValue)) + var _bytearray C.struct_miqt_string = C.QCborValue_ToByteArray1(this.h, defaultValue_alias) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } func (this *QCborValue) ToString1(defaultValue string) string { - defaultValue_ms := libmiqt.Strdupg(defaultValue) - defer C.free(defaultValue_ms) - var _ms *C.struct_miqt_string = C.QCborValue_ToString1(this.h, (*C.struct_miqt_string)(defaultValue_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + defaultValue_ms := C.struct_miqt_string{} + defaultValue_ms.data = C.CString(defaultValue) + defaultValue_ms.len = C.size_t(len(defaultValue)) + defer C.free(unsafe.Pointer(defaultValue_ms.data)) + var _ms C.struct_miqt_string = C.QCborValue_ToString1(this.h, defaultValue_ms) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -653,8 +669,11 @@ func (this *QCborValue) ToUuid1(defaultValue *QUuid) *QUuid { return _goptr } -func QCborValue_FromCbor22(ba *QByteArray, error *QCborParserError) *QCborValue { - _ret := C.QCborValue_FromCbor22(ba.cPointer(), error.cPointer()) +func QCborValue_FromCbor22(ba []byte, error *QCborParserError) *QCborValue { + ba_alias := C.struct_miqt_string{} + ba_alias.data = (*C.char)(unsafe.Pointer(&ba[0])) + ba_alias.len = C.size_t(len(ba)) + _ret := C.QCborValue_FromCbor22(ba_alias, error.cPointer()) _goptr := newQCborValue(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -676,11 +695,11 @@ func QCborValue_FromCbor33(data *byte, lenVal int64, error *QCborParserError) *Q return _goptr } -func (this *QCborValue) ToCbor1(opt QCborValue__EncodingOption) *QByteArray { - _ret := C.QCborValue_ToCbor1(this.h, (C.int)(opt)) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QCborValue) ToCbor1(opt QCborValue__EncodingOption) []byte { + var _bytearray C.struct_miqt_string = C.QCborValue_ToCbor1(this.h, (C.int)(opt)) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } func (this *QCborValue) ToCbor2(writer *QCborStreamWriter, opt QCborValue__EncodingOption) { @@ -688,9 +707,9 @@ func (this *QCborValue) ToCbor2(writer *QCborStreamWriter, opt QCborValue__Encod } func (this *QCborValue) ToDiagnosticNotation1(opts QCborValue__DiagnosticNotationOption) string { - var _ms *C.struct_miqt_string = C.QCborValue_ToDiagnosticNotation1(this.h, (C.int)(opts)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCborValue_ToDiagnosticNotation1(this.h, (C.int)(opts)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -858,17 +877,17 @@ func (this *QCborValueRef) ToDouble() float64 { return (float64)(C.QCborValueRef_ToDouble(this.h)) } -func (this *QCborValueRef) ToByteArray() *QByteArray { - _ret := C.QCborValueRef_ToByteArray(this.h) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QCborValueRef) ToByteArray() []byte { + var _bytearray C.struct_miqt_string = C.QCborValueRef_ToByteArray(this.h) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } func (this *QCborValueRef) ToString() string { - var _ms *C.struct_miqt_string = C.QCborValueRef_ToString(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCborValueRef_ToString(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -929,9 +948,11 @@ func (this *QCborValueRef) ToMapWithQCborMap(m *QCborMap) *QCborMap { } func (this *QCborValueRef) OperatorSubscript(key string) *QCborValue { - key_ms := libmiqt.Strdupg(key) - defer C.free(key_ms) - _ret := C.QCborValueRef_OperatorSubscript(this.h, (*C.struct_miqt_string)(key_ms)) + key_ms := C.struct_miqt_string{} + key_ms.data = C.CString(key) + key_ms.len = C.size_t(len(key)) + defer C.free(unsafe.Pointer(key_ms.data)) + _ret := C.QCborValueRef_OperatorSubscript(this.h, key_ms) _goptr := newQCborValue(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -952,9 +973,11 @@ func (this *QCborValueRef) OperatorSubscript3(key int64) *QCborValueRef { } func (this *QCborValueRef) OperatorSubscript5(key string) *QCborValueRef { - key_ms := libmiqt.Strdupg(key) - defer C.free(key_ms) - _ret := C.QCborValueRef_OperatorSubscript5(this.h, (*C.struct_miqt_string)(key_ms)) + key_ms := C.struct_miqt_string{} + key_ms.data = C.CString(key) + key_ms.len = C.size_t(len(key)) + defer C.free(unsafe.Pointer(key_ms.data)) + _ret := C.QCborValueRef_OperatorSubscript5(this.h, key_ms) _goptr := newQCborValueRef(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -990,11 +1013,11 @@ func (this *QCborValueRef) ToJsonValue() *QJsonValue { return _goptr } -func (this *QCborValueRef) ToCbor() *QByteArray { - _ret := C.QCborValueRef_ToCbor(this.h) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QCborValueRef) ToCbor() []byte { + var _bytearray C.struct_miqt_string = C.QCborValueRef_ToCbor(this.h) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } func (this *QCborValueRef) ToCborWithWriter(writer *QCborStreamWriter) { @@ -1002,9 +1025,9 @@ func (this *QCborValueRef) ToCborWithWriter(writer *QCborStreamWriter) { } func (this *QCborValueRef) ToDiagnosticNotation() string { - var _ms *C.struct_miqt_string = C.QCborValueRef_ToDiagnosticNotation(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCborValueRef_ToDiagnosticNotation(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -1031,19 +1054,24 @@ func (this *QCborValueRef) ToDouble1(defaultValue float64) float64 { return (float64)(C.QCborValueRef_ToDouble1(this.h, (C.double)(defaultValue))) } -func (this *QCborValueRef) ToByteArray1(defaultValue *QByteArray) *QByteArray { - _ret := C.QCborValueRef_ToByteArray1(this.h, defaultValue.cPointer()) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QCborValueRef) ToByteArray1(defaultValue []byte) []byte { + defaultValue_alias := C.struct_miqt_string{} + defaultValue_alias.data = (*C.char)(unsafe.Pointer(&defaultValue[0])) + defaultValue_alias.len = C.size_t(len(defaultValue)) + var _bytearray C.struct_miqt_string = C.QCborValueRef_ToByteArray1(this.h, defaultValue_alias) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } func (this *QCborValueRef) ToString1(defaultValue string) string { - defaultValue_ms := libmiqt.Strdupg(defaultValue) - defer C.free(defaultValue_ms) - var _ms *C.struct_miqt_string = C.QCborValueRef_ToString1(this.h, (*C.struct_miqt_string)(defaultValue_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + defaultValue_ms := C.struct_miqt_string{} + defaultValue_ms.data = C.CString(defaultValue) + defaultValue_ms.len = C.size_t(len(defaultValue)) + defer C.free(unsafe.Pointer(defaultValue_ms.data)) + var _ms C.struct_miqt_string = C.QCborValueRef_ToString1(this.h, defaultValue_ms) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -1075,11 +1103,11 @@ func (this *QCborValueRef) ToUuid1(defaultValue *QUuid) *QUuid { return _goptr } -func (this *QCborValueRef) ToCbor1(opt QCborValue__EncodingOption) *QByteArray { - _ret := C.QCborValueRef_ToCbor1(this.h, (C.int)(opt)) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QCborValueRef) ToCbor1(opt QCborValue__EncodingOption) []byte { + var _bytearray C.struct_miqt_string = C.QCborValueRef_ToCbor1(this.h, (C.int)(opt)) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } func (this *QCborValueRef) ToCbor2(writer *QCborStreamWriter, opt QCborValue__EncodingOption) { @@ -1087,9 +1115,9 @@ func (this *QCborValueRef) ToCbor2(writer *QCborStreamWriter, opt QCborValue__En } func (this *QCborValueRef) ToDiagnosticNotation1(opt QCborValue__DiagnosticNotationOption) string { - var _ms *C.struct_miqt_string = C.QCborValueRef_ToDiagnosticNotation1(this.h, (C.int)(opt)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCborValueRef_ToDiagnosticNotation1(this.h, (C.int)(opt)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qcborvalue.h b/qt/gen_qcborvalue.h index e8ddebe5..83467424 100644 --- a/qt/gen_qcborvalue.h +++ b/qt/gen_qcborvalue.h @@ -45,7 +45,7 @@ typedef struct QUuid QUuid; typedef struct QVariant QVariant; #endif -struct miqt_string* QCborParserError_ErrorString(const QCborParserError* self); +struct miqt_string QCborParserError_ErrorString(const QCborParserError* self); void QCborParserError_Delete(QCborParserError* self); QCborValue* QCborValue_new(); @@ -56,8 +56,8 @@ QCborValue* QCborValue_new5(unsigned int u); QCborValue* QCborValue_new6(long long i); QCborValue* QCborValue_new7(double v); QCborValue* QCborValue_new8(uint8_t st); -QCborValue* QCborValue_new9(QByteArray* ba); -QCborValue* QCborValue_new10(struct miqt_string* s); +QCborValue* QCborValue_new9(struct miqt_string ba); +QCborValue* QCborValue_new10(struct miqt_string s); QCborValue* QCborValue_new11(const char* s); QCborValue* QCborValue_new12(QCborArray* a); QCborValue* QCborValue_new13(QCborMap* m); @@ -99,8 +99,8 @@ bool QCborValue_ToBool(const QCborValue* self); double QCborValue_ToDouble(const QCborValue* self); uint64_t QCborValue_Tag(const QCborValue* self); QCborValue* QCborValue_TaggedValue(const QCborValue* self); -QByteArray* QCborValue_ToByteArray(const QCborValue* self); -struct miqt_string* QCborValue_ToString(const QCborValue* self); +struct miqt_string QCborValue_ToByteArray(const QCborValue* self); +struct miqt_string QCborValue_ToString(const QCborValue* self); QDateTime* QCborValue_ToDateTime(const QCborValue* self); QUrl* QCborValue_ToUrl(const QCborValue* self); QRegularExpression* QCborValue_ToRegularExpression(const QCborValue* self); @@ -109,10 +109,10 @@ QCborArray* QCborValue_ToArray(const QCborValue* self); QCborArray* QCborValue_ToArrayWithDefaultValue(const QCborValue* self, QCborArray* defaultValue); QCborMap* QCborValue_ToMap(const QCborValue* self); QCborMap* QCborValue_ToMapWithDefaultValue(const QCborValue* self, QCborMap* defaultValue); -QCborValue* QCborValue_OperatorSubscript(const QCborValue* self, struct miqt_string* key); +QCborValue* QCborValue_OperatorSubscript(const QCborValue* self, struct miqt_string key); QCborValue* QCborValue_OperatorSubscript2(const QCborValue* self, long long key); QCborValueRef* QCborValue_OperatorSubscript3(QCborValue* self, long long key); -QCborValueRef* QCborValue_OperatorSubscript5(QCborValue* self, struct miqt_string* key); +QCborValueRef* QCborValue_OperatorSubscript5(QCborValue* self, struct miqt_string key); int QCborValue_Compare(const QCborValue* self, QCborValue* other); bool QCborValue_OperatorEqual(const QCborValue* self, QCborValue* other); bool QCborValue_OperatorNotEqual(const QCborValue* self, QCborValue* other); @@ -122,30 +122,30 @@ QVariant* QCborValue_ToVariant(const QCborValue* self); QCborValue* QCborValue_FromJsonValue(QJsonValue* v); QJsonValue* QCborValue_ToJsonValue(const QCborValue* self); QCborValue* QCborValue_FromCbor(QCborStreamReader* reader); -QCborValue* QCborValue_FromCborWithBa(QByteArray* ba); +QCborValue* QCborValue_FromCborWithBa(struct miqt_string ba); QCborValue* QCborValue_FromCbor2(const char* data, ptrdiff_t lenVal); QCborValue* QCborValue_FromCbor3(const unsigned char* data, ptrdiff_t lenVal); -QByteArray* QCborValue_ToCbor(QCborValue* self); +struct miqt_string QCborValue_ToCbor(QCborValue* self); void QCborValue_ToCborWithWriter(QCborValue* self, QCborStreamWriter* writer); -struct miqt_string* QCborValue_ToDiagnosticNotation(const QCborValue* self); +struct miqt_string QCborValue_ToDiagnosticNotation(const QCborValue* self); uint8_t QCborValue_ToSimpleType1(const QCborValue* self, uint8_t defaultValue); long long QCborValue_ToInteger1(const QCborValue* self, long long defaultValue); bool QCborValue_ToBool1(const QCborValue* self, bool defaultValue); double QCborValue_ToDouble1(const QCborValue* self, double defaultValue); uint64_t QCborValue_Tag1(const QCborValue* self, uint64_t defaultValue); QCborValue* QCborValue_TaggedValue1(const QCborValue* self, QCborValue* defaultValue); -QByteArray* QCborValue_ToByteArray1(const QCborValue* self, QByteArray* defaultValue); -struct miqt_string* QCborValue_ToString1(const QCborValue* self, struct miqt_string* defaultValue); +struct miqt_string QCborValue_ToByteArray1(const QCborValue* self, struct miqt_string defaultValue); +struct miqt_string QCborValue_ToString1(const QCborValue* self, struct miqt_string defaultValue); QDateTime* QCborValue_ToDateTime1(const QCborValue* self, QDateTime* defaultValue); QUrl* QCborValue_ToUrl1(const QCborValue* self, QUrl* defaultValue); QRegularExpression* QCborValue_ToRegularExpression1(const QCborValue* self, QRegularExpression* defaultValue); QUuid* QCborValue_ToUuid1(const QCborValue* self, QUuid* defaultValue); -QCborValue* QCborValue_FromCbor22(QByteArray* ba, QCborParserError* error); +QCborValue* QCborValue_FromCbor22(struct miqt_string ba, QCborParserError* error); QCborValue* QCborValue_FromCbor32(const char* data, ptrdiff_t lenVal, QCborParserError* error); QCborValue* QCborValue_FromCbor33(const unsigned char* data, ptrdiff_t lenVal, QCborParserError* error); -QByteArray* QCborValue_ToCbor1(QCborValue* self, int opt); +struct miqt_string QCborValue_ToCbor1(QCborValue* self, int opt); void QCborValue_ToCbor2(QCborValue* self, QCborStreamWriter* writer, int opt); -struct miqt_string* QCborValue_ToDiagnosticNotation1(const QCborValue* self, int opts); +struct miqt_string QCborValue_ToDiagnosticNotation1(const QCborValue* self, int opts); void QCborValue_Delete(QCborValue* self); QCborValueRef* QCborValueRef_new(QCborValueRef* param1); @@ -177,8 +177,8 @@ QCborValue* QCborValueRef_TaggedValue(const QCborValueRef* self); long long QCborValueRef_ToInteger(const QCborValueRef* self); bool QCborValueRef_ToBool(const QCborValueRef* self); double QCborValueRef_ToDouble(const QCborValueRef* self); -QByteArray* QCborValueRef_ToByteArray(const QCborValueRef* self); -struct miqt_string* QCborValueRef_ToString(const QCborValueRef* self); +struct miqt_string QCborValueRef_ToByteArray(const QCborValueRef* self); +struct miqt_string QCborValueRef_ToString(const QCborValueRef* self); QDateTime* QCborValueRef_ToDateTime(const QCborValueRef* self); QUrl* QCborValueRef_ToUrl(const QCborValueRef* self); QRegularExpression* QCborValueRef_ToRegularExpression(const QCborValueRef* self); @@ -187,33 +187,33 @@ QCborArray* QCborValueRef_ToArray(const QCborValueRef* self); QCborArray* QCborValueRef_ToArrayWithQCborArray(const QCborValueRef* self, QCborArray* a); QCborMap* QCborValueRef_ToMap(const QCborValueRef* self); QCborMap* QCborValueRef_ToMapWithQCborMap(const QCborValueRef* self, QCborMap* m); -QCborValue* QCborValueRef_OperatorSubscript(const QCborValueRef* self, struct miqt_string* key); +QCborValue* QCborValueRef_OperatorSubscript(const QCborValueRef* self, struct miqt_string key); QCborValue* QCborValueRef_OperatorSubscript2(const QCborValueRef* self, long long key); QCborValueRef* QCborValueRef_OperatorSubscript3(QCborValueRef* self, long long key); -QCborValueRef* QCborValueRef_OperatorSubscript5(QCborValueRef* self, struct miqt_string* key); +QCborValueRef* QCborValueRef_OperatorSubscript5(QCborValueRef* self, struct miqt_string key); int QCborValueRef_Compare(const QCborValueRef* self, QCborValue* other); bool QCborValueRef_OperatorEqual(const QCborValueRef* self, QCborValue* other); bool QCborValueRef_OperatorNotEqual(const QCborValueRef* self, QCborValue* other); bool QCborValueRef_OperatorLesser(const QCborValueRef* self, QCborValue* other); QVariant* QCborValueRef_ToVariant(const QCborValueRef* self); QJsonValue* QCborValueRef_ToJsonValue(const QCborValueRef* self); -QByteArray* QCborValueRef_ToCbor(QCborValueRef* self); +struct miqt_string QCborValueRef_ToCbor(QCborValueRef* self); void QCborValueRef_ToCborWithWriter(QCborValueRef* self, QCborStreamWriter* writer); -struct miqt_string* QCborValueRef_ToDiagnosticNotation(QCborValueRef* self); +struct miqt_string QCborValueRef_ToDiagnosticNotation(QCborValueRef* self); uint64_t QCborValueRef_Tag1(const QCborValueRef* self, uint64_t defaultValue); QCborValue* QCborValueRef_TaggedValue1(const QCborValueRef* self, QCborValue* defaultValue); long long QCborValueRef_ToInteger1(const QCborValueRef* self, long long defaultValue); bool QCborValueRef_ToBool1(const QCborValueRef* self, bool defaultValue); double QCborValueRef_ToDouble1(const QCborValueRef* self, double defaultValue); -QByteArray* QCborValueRef_ToByteArray1(const QCborValueRef* self, QByteArray* defaultValue); -struct miqt_string* QCborValueRef_ToString1(const QCborValueRef* self, struct miqt_string* defaultValue); +struct miqt_string QCborValueRef_ToByteArray1(const QCborValueRef* self, struct miqt_string defaultValue); +struct miqt_string QCborValueRef_ToString1(const QCborValueRef* self, struct miqt_string defaultValue); QDateTime* QCborValueRef_ToDateTime1(const QCborValueRef* self, QDateTime* defaultValue); QUrl* QCborValueRef_ToUrl1(const QCborValueRef* self, QUrl* defaultValue); QRegularExpression* QCborValueRef_ToRegularExpression1(const QCborValueRef* self, QRegularExpression* defaultValue); QUuid* QCborValueRef_ToUuid1(const QCborValueRef* self, QUuid* defaultValue); -QByteArray* QCborValueRef_ToCbor1(QCborValueRef* self, int opt); +struct miqt_string QCborValueRef_ToCbor1(QCborValueRef* self, int opt); void QCborValueRef_ToCbor2(QCborValueRef* self, QCborStreamWriter* writer, int opt); -struct miqt_string* QCborValueRef_ToDiagnosticNotation1(QCborValueRef* self, int opt); +struct miqt_string QCborValueRef_ToDiagnosticNotation1(QCborValueRef* self, int opt); void QCborValueRef_Delete(QCborValueRef* self); #ifdef __cplusplus diff --git a/qt/gen_qchar.cpp b/qt/gen_qchar.cpp index c9178487..b4140ff8 100644 --- a/qt/gen_qchar.cpp +++ b/qt/gen_qchar.cpp @@ -104,11 +104,15 @@ bool QChar_HasMirrored(const QChar* self) { return self->hasMirrored(); } -struct miqt_string* QChar_Decomposition(const QChar* self) { +struct miqt_string QChar_Decomposition(const QChar* self) { QString _ret = self->decomposition(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QChar_DecompositionTag(const QChar* self) { @@ -318,11 +322,15 @@ bool QChar_HasMirroredWithUcs4(unsigned int ucs4) { return QChar::hasMirrored(static_cast(ucs4)); } -struct miqt_string* QChar_DecompositionWithUcs4(unsigned int ucs4) { +struct miqt_string QChar_DecompositionWithUcs4(unsigned int ucs4) { QString _ret = QChar::decomposition(static_cast(ucs4)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QChar_DecompositionTagWithUcs4(unsigned int ucs4) { diff --git a/qt/gen_qchar.go b/qt/gen_qchar.go index 211f459c..82806bd0 100644 --- a/qt/gen_qchar.go +++ b/qt/gen_qchar.go @@ -545,9 +545,9 @@ func (this *QChar) HasMirrored() bool { } func (this *QChar) Decomposition() string { - var _ms *C.struct_miqt_string = C.QChar_Decomposition(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QChar_Decomposition(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -759,9 +759,9 @@ func QChar_HasMirroredWithUcs4(ucs4 uint) bool { } func QChar_DecompositionWithUcs4(ucs4 uint) string { - var _ms *C.struct_miqt_string = C.QChar_DecompositionWithUcs4((C.uint)(ucs4)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QChar_DecompositionWithUcs4((C.uint)(ucs4)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qchar.h b/qt/gen_qchar.h index ad2f5c31..14e05477 100644 --- a/qt/gen_qchar.h +++ b/qt/gen_qchar.h @@ -45,7 +45,7 @@ int QChar_Joining(const QChar* self); unsigned char QChar_CombiningClass(const QChar* self); QChar* QChar_MirroredChar(const QChar* self); bool QChar_HasMirrored(const QChar* self); -struct miqt_string* QChar_Decomposition(const QChar* self); +struct miqt_string QChar_Decomposition(const QChar* self); int QChar_DecompositionTag(const QChar* self); int QChar_DigitValue(const QChar* self); QChar* QChar_ToLower(const QChar* self); @@ -94,7 +94,7 @@ int QChar_JoiningWithUcs4(unsigned int ucs4); unsigned char QChar_CombiningClassWithUcs4(unsigned int ucs4); unsigned int QChar_MirroredCharWithUcs4(unsigned int ucs4); bool QChar_HasMirroredWithUcs4(unsigned int ucs4); -struct miqt_string* QChar_DecompositionWithUcs4(unsigned int ucs4); +struct miqt_string QChar_DecompositionWithUcs4(unsigned int ucs4); int QChar_DecompositionTagWithUcs4(unsigned int ucs4); int QChar_DigitValueWithUcs4(unsigned int ucs4); unsigned int QChar_ToLowerWithUcs4(unsigned int ucs4); diff --git a/qt/gen_qcheckbox.cpp b/qt/gen_qcheckbox.cpp index f91acfa7..7bf7ec43 100644 --- a/qt/gen_qcheckbox.cpp +++ b/qt/gen_qcheckbox.cpp @@ -13,8 +13,8 @@ QCheckBox* QCheckBox_new() { return new QCheckBox(); } -QCheckBox* QCheckBox_new2(struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QCheckBox* QCheckBox_new2(struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QCheckBox(text_QString); } @@ -22,8 +22,8 @@ QCheckBox* QCheckBox_new3(QWidget* parent) { return new QCheckBox(parent); } -QCheckBox* QCheckBox_new4(struct miqt_string* text, QWidget* parent) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QCheckBox* QCheckBox_new4(struct miqt_string text, QWidget* parent) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QCheckBox(text_QString, parent); } @@ -35,18 +35,26 @@ void* QCheckBox_Metacast(QCheckBox* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QCheckBox_Tr(const char* s) { +struct miqt_string QCheckBox_Tr(const char* s) { QString _ret = QCheckBox::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QCheckBox_TrUtf8(const char* s) { +struct miqt_string QCheckBox_TrUtf8(const char* s) { QString _ret = QCheckBox::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QSize* QCheckBox_SizeHint(const QCheckBox* self) { @@ -85,32 +93,48 @@ void QCheckBox_connect_StateChanged(QCheckBox* self, intptr_t slot) { }); } -struct miqt_string* QCheckBox_Tr2(const char* s, const char* c) { +struct miqt_string QCheckBox_Tr2(const char* s, const char* c) { QString _ret = QCheckBox::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QCheckBox_Tr3(const char* s, const char* c, int n) { +struct miqt_string QCheckBox_Tr3(const char* s, const char* c, int n) { QString _ret = QCheckBox::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QCheckBox_TrUtf82(const char* s, const char* c) { +struct miqt_string QCheckBox_TrUtf82(const char* s, const char* c) { QString _ret = QCheckBox::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QCheckBox_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QCheckBox_TrUtf83(const char* s, const char* c, int n) { QString _ret = QCheckBox::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QCheckBox_SetTristate1(QCheckBox* self, bool y) { diff --git a/qt/gen_qcheckbox.go b/qt/gen_qcheckbox.go index 1a2d1647..ffc2a41e 100644 --- a/qt/gen_qcheckbox.go +++ b/qt/gen_qcheckbox.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "runtime/cgo" "unsafe" @@ -53,9 +52,11 @@ func NewQCheckBox() *QCheckBox { // NewQCheckBox2 constructs a new QCheckBox object. func NewQCheckBox2(text string) *QCheckBox { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - ret := C.QCheckBox_new2((*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + ret := C.QCheckBox_new2(text_ms) return newQCheckBox(ret) } @@ -67,9 +68,11 @@ func NewQCheckBox3(parent *QWidget) *QCheckBox { // NewQCheckBox4 constructs a new QCheckBox object. func NewQCheckBox4(text string, parent *QWidget) *QCheckBox { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - ret := C.QCheckBox_new4((*C.struct_miqt_string)(text_ms), parent.cPointer()) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + ret := C.QCheckBox_new4(text_ms, parent.cPointer()) return newQCheckBox(ret) } @@ -80,24 +83,24 @@ func (this *QCheckBox) MetaObject() *QMetaObject { func (this *QCheckBox) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QCheckBox_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QCheckBox_Metacast(this.h, param1_Cstring)) } func QCheckBox_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QCheckBox_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCheckBox_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QCheckBox_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QCheckBox_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCheckBox_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -156,9 +159,9 @@ func QCheckBox_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QCheckBox_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCheckBox_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -167,9 +170,9 @@ func QCheckBox_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QCheckBox_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCheckBox_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -178,9 +181,9 @@ func QCheckBox_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QCheckBox_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCheckBox_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -189,9 +192,9 @@ func QCheckBox_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QCheckBox_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCheckBox_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qcheckbox.h b/qt/gen_qcheckbox.h index 336747dd..f898584e 100644 --- a/qt/gen_qcheckbox.h +++ b/qt/gen_qcheckbox.h @@ -26,13 +26,13 @@ typedef struct QWidget QWidget; #endif QCheckBox* QCheckBox_new(); -QCheckBox* QCheckBox_new2(struct miqt_string* text); +QCheckBox* QCheckBox_new2(struct miqt_string text); QCheckBox* QCheckBox_new3(QWidget* parent); -QCheckBox* QCheckBox_new4(struct miqt_string* text, QWidget* parent); +QCheckBox* QCheckBox_new4(struct miqt_string text, QWidget* parent); QMetaObject* QCheckBox_MetaObject(const QCheckBox* self); void* QCheckBox_Metacast(QCheckBox* self, const char* param1); -struct miqt_string* QCheckBox_Tr(const char* s); -struct miqt_string* QCheckBox_TrUtf8(const char* s); +struct miqt_string QCheckBox_Tr(const char* s); +struct miqt_string QCheckBox_TrUtf8(const char* s); QSize* QCheckBox_SizeHint(const QCheckBox* self); QSize* QCheckBox_MinimumSizeHint(const QCheckBox* self); void QCheckBox_SetTristate(QCheckBox* self); @@ -41,10 +41,10 @@ int QCheckBox_CheckState(const QCheckBox* self); void QCheckBox_SetCheckState(QCheckBox* self, int state); void QCheckBox_StateChanged(QCheckBox* self, int param1); void QCheckBox_connect_StateChanged(QCheckBox* self, intptr_t slot); -struct miqt_string* QCheckBox_Tr2(const char* s, const char* c); -struct miqt_string* QCheckBox_Tr3(const char* s, const char* c, int n); -struct miqt_string* QCheckBox_TrUtf82(const char* s, const char* c); -struct miqt_string* QCheckBox_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QCheckBox_Tr2(const char* s, const char* c); +struct miqt_string QCheckBox_Tr3(const char* s, const char* c, int n); +struct miqt_string QCheckBox_TrUtf82(const char* s, const char* c); +struct miqt_string QCheckBox_TrUtf83(const char* s, const char* c, int n); void QCheckBox_SetTristate1(QCheckBox* self, bool y); void QCheckBox_Delete(QCheckBox* self); diff --git a/qt/gen_qclipboard.cpp b/qt/gen_qclipboard.cpp index fb8e843e..cfe28043 100644 --- a/qt/gen_qclipboard.cpp +++ b/qt/gen_qclipboard.cpp @@ -18,18 +18,26 @@ void* QClipboard_Metacast(QClipboard* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QClipboard_Tr(const char* s) { +struct miqt_string QClipboard_Tr(const char* s) { QString _ret = QClipboard::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QClipboard_TrUtf8(const char* s) { +struct miqt_string QClipboard_TrUtf8(const char* s) { QString _ret = QClipboard::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QClipboard_Clear(QClipboard* self) { @@ -56,23 +64,31 @@ bool QClipboard_OwnsFindBuffer(const QClipboard* self) { return self->ownsFindBuffer(); } -struct miqt_string* QClipboard_Text(const QClipboard* self) { +struct miqt_string QClipboard_Text(const QClipboard* self) { QString _ret = self->text(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QClipboard_TextWithSubtype(const QClipboard* self, struct miqt_string* subtype) { - QString subtype_QString = QString::fromUtf8(&subtype->data, subtype->len); +struct miqt_string QClipboard_TextWithSubtype(const QClipboard* self, struct miqt_string subtype) { + QString subtype_QString = QString::fromUtf8(subtype.data, subtype.len); QString _ret = self->text(subtype_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QClipboard_SetText(QClipboard* self, struct miqt_string* param1) { - QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); +void QClipboard_SetText(QClipboard* self, struct miqt_string param1) { + QString param1_QString = QString::fromUtf8(param1.data, param1.len); self->setText(param1_QString); } @@ -142,55 +158,79 @@ void QClipboard_connect_DataChanged(QClipboard* self, intptr_t slot) { }); } -struct miqt_string* QClipboard_Tr2(const char* s, const char* c) { +struct miqt_string QClipboard_Tr2(const char* s, const char* c) { QString _ret = QClipboard::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QClipboard_Tr3(const char* s, const char* c, int n) { +struct miqt_string QClipboard_Tr3(const char* s, const char* c, int n) { QString _ret = QClipboard::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QClipboard_TrUtf82(const char* s, const char* c) { +struct miqt_string QClipboard_TrUtf82(const char* s, const char* c) { QString _ret = QClipboard::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QClipboard_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QClipboard_TrUtf83(const char* s, const char* c, int n) { QString _ret = QClipboard::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QClipboard_Clear1(QClipboard* self, int mode) { self->clear(static_cast(mode)); } -struct miqt_string* QClipboard_Text1(const QClipboard* self, int mode) { +struct miqt_string QClipboard_Text1(const QClipboard* self, int mode) { QString _ret = self->text(static_cast(mode)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QClipboard_Text2(const QClipboard* self, struct miqt_string* subtype, int mode) { - QString subtype_QString = QString::fromUtf8(&subtype->data, subtype->len); +struct miqt_string QClipboard_Text2(const QClipboard* self, struct miqt_string subtype, int mode) { + QString subtype_QString = QString::fromUtf8(subtype.data, subtype.len); QString _ret = self->text(subtype_QString, static_cast(mode)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QClipboard_SetText2(QClipboard* self, struct miqt_string* param1, int mode) { - QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); +void QClipboard_SetText2(QClipboard* self, struct miqt_string param1, int mode) { + QString param1_QString = QString::fromUtf8(param1.data, param1.len); self->setText(param1_QString, static_cast(mode)); } diff --git a/qt/gen_qclipboard.go b/qt/gen_qclipboard.go index 5fb33954..62b21cb3 100644 --- a/qt/gen_qclipboard.go +++ b/qt/gen_qclipboard.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime/cgo" "unsafe" ) @@ -60,24 +59,24 @@ func (this *QClipboard) MetaObject() *QMetaObject { func (this *QClipboard) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QClipboard_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QClipboard_Metacast(this.h, param1_Cstring)) } func QClipboard_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QClipboard_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QClipboard_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QClipboard_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QClipboard_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QClipboard_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -106,25 +105,29 @@ func (this *QClipboard) OwnsFindBuffer() bool { } func (this *QClipboard) Text() string { - var _ms *C.struct_miqt_string = C.QClipboard_Text(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QClipboard_Text(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QClipboard) TextWithSubtype(subtype string) string { - subtype_ms := libmiqt.Strdupg(subtype) - defer C.free(subtype_ms) - var _ms *C.struct_miqt_string = C.QClipboard_TextWithSubtype(this.h, (*C.struct_miqt_string)(subtype_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + subtype_ms := C.struct_miqt_string{} + subtype_ms.data = C.CString(subtype) + subtype_ms.len = C.size_t(len(subtype)) + defer C.free(unsafe.Pointer(subtype_ms.data)) + var _ms C.struct_miqt_string = C.QClipboard_TextWithSubtype(this.h, subtype_ms) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QClipboard) SetText(param1 string) { - param1_ms := libmiqt.Strdupg(param1) - defer C.free(param1_ms) - C.QClipboard_SetText(this.h, (*C.struct_miqt_string)(param1_ms)) + param1_ms := C.struct_miqt_string{} + param1_ms.data = C.CString(param1) + param1_ms.len = C.size_t(len(param1)) + defer C.free(unsafe.Pointer(param1_ms.data)) + C.QClipboard_SetText(this.h, param1_ms) } func (this *QClipboard) MimeData() *QMimeData { @@ -233,9 +236,9 @@ func QClipboard_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QClipboard_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QClipboard_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -244,9 +247,9 @@ func QClipboard_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QClipboard_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QClipboard_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -255,9 +258,9 @@ func QClipboard_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QClipboard_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QClipboard_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -266,9 +269,9 @@ func QClipboard_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QClipboard_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QClipboard_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -277,25 +280,29 @@ func (this *QClipboard) Clear1(mode QClipboard__Mode) { } func (this *QClipboard) Text1(mode QClipboard__Mode) string { - var _ms *C.struct_miqt_string = C.QClipboard_Text1(this.h, (C.int)(mode)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QClipboard_Text1(this.h, (C.int)(mode)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QClipboard) Text2(subtype string, mode QClipboard__Mode) string { - subtype_ms := libmiqt.Strdupg(subtype) - defer C.free(subtype_ms) - var _ms *C.struct_miqt_string = C.QClipboard_Text2(this.h, (*C.struct_miqt_string)(subtype_ms), (C.int)(mode)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + subtype_ms := C.struct_miqt_string{} + subtype_ms.data = C.CString(subtype) + subtype_ms.len = C.size_t(len(subtype)) + defer C.free(unsafe.Pointer(subtype_ms.data)) + var _ms C.struct_miqt_string = C.QClipboard_Text2(this.h, subtype_ms, (C.int)(mode)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QClipboard) SetText2(param1 string, mode QClipboard__Mode) { - param1_ms := libmiqt.Strdupg(param1) - defer C.free(param1_ms) - C.QClipboard_SetText2(this.h, (*C.struct_miqt_string)(param1_ms), (C.int)(mode)) + param1_ms := C.struct_miqt_string{} + param1_ms.data = C.CString(param1) + param1_ms.len = C.size_t(len(param1)) + defer C.free(unsafe.Pointer(param1_ms.data)) + C.QClipboard_SetText2(this.h, param1_ms, (C.int)(mode)) } func (this *QClipboard) MimeData1(mode QClipboard__Mode) *QMimeData { diff --git a/qt/gen_qclipboard.h b/qt/gen_qclipboard.h index 2851fed9..cfe70e21 100644 --- a/qt/gen_qclipboard.h +++ b/qt/gen_qclipboard.h @@ -29,17 +29,17 @@ typedef struct QPixmap QPixmap; QMetaObject* QClipboard_MetaObject(const QClipboard* self); void* QClipboard_Metacast(QClipboard* self, const char* param1); -struct miqt_string* QClipboard_Tr(const char* s); -struct miqt_string* QClipboard_TrUtf8(const char* s); +struct miqt_string QClipboard_Tr(const char* s); +struct miqt_string QClipboard_TrUtf8(const char* s); void QClipboard_Clear(QClipboard* self); bool QClipboard_SupportsSelection(const QClipboard* self); bool QClipboard_SupportsFindBuffer(const QClipboard* self); bool QClipboard_OwnsSelection(const QClipboard* self); bool QClipboard_OwnsClipboard(const QClipboard* self); bool QClipboard_OwnsFindBuffer(const QClipboard* self); -struct miqt_string* QClipboard_Text(const QClipboard* self); -struct miqt_string* QClipboard_TextWithSubtype(const QClipboard* self, struct miqt_string* subtype); -void QClipboard_SetText(QClipboard* self, struct miqt_string* param1); +struct miqt_string QClipboard_Text(const QClipboard* self); +struct miqt_string QClipboard_TextWithSubtype(const QClipboard* self, struct miqt_string subtype); +void QClipboard_SetText(QClipboard* self, struct miqt_string param1); QMimeData* QClipboard_MimeData(const QClipboard* self); void QClipboard_SetMimeData(QClipboard* self, QMimeData* data); QImage* QClipboard_Image(const QClipboard* self); @@ -54,14 +54,14 @@ void QClipboard_FindBufferChanged(QClipboard* self); void QClipboard_connect_FindBufferChanged(QClipboard* self, intptr_t slot); void QClipboard_DataChanged(QClipboard* self); void QClipboard_connect_DataChanged(QClipboard* self, intptr_t slot); -struct miqt_string* QClipboard_Tr2(const char* s, const char* c); -struct miqt_string* QClipboard_Tr3(const char* s, const char* c, int n); -struct miqt_string* QClipboard_TrUtf82(const char* s, const char* c); -struct miqt_string* QClipboard_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QClipboard_Tr2(const char* s, const char* c); +struct miqt_string QClipboard_Tr3(const char* s, const char* c, int n); +struct miqt_string QClipboard_TrUtf82(const char* s, const char* c); +struct miqt_string QClipboard_TrUtf83(const char* s, const char* c, int n); void QClipboard_Clear1(QClipboard* self, int mode); -struct miqt_string* QClipboard_Text1(const QClipboard* self, int mode); -struct miqt_string* QClipboard_Text2(const QClipboard* self, struct miqt_string* subtype, int mode); -void QClipboard_SetText2(QClipboard* self, struct miqt_string* param1, int mode); +struct miqt_string QClipboard_Text1(const QClipboard* self, int mode); +struct miqt_string QClipboard_Text2(const QClipboard* self, struct miqt_string subtype, int mode); +void QClipboard_SetText2(QClipboard* self, struct miqt_string param1, int mode); QMimeData* QClipboard_MimeData1(const QClipboard* self, int mode); void QClipboard_SetMimeData2(QClipboard* self, QMimeData* data, int mode); QImage* QClipboard_Image1(const QClipboard* self, int mode); diff --git a/qt/gen_qcollator.cpp b/qt/gen_qcollator.cpp index d2d9df16..1956100c 100644 --- a/qt/gen_qcollator.cpp +++ b/qt/gen_qcollator.cpp @@ -82,9 +82,9 @@ bool QCollator_IgnorePunctuation(const QCollator* self) { return self->ignorePunctuation(); } -int QCollator_Compare(const QCollator* self, struct miqt_string* s1, struct miqt_string* s2) { - QString s1_QString = QString::fromUtf8(&s1->data, s1->len); - QString s2_QString = QString::fromUtf8(&s2->data, s2->len); +int QCollator_Compare(const QCollator* self, struct miqt_string s1, struct miqt_string s2) { + QString s1_QString = QString::fromUtf8(s1.data, s1.len); + QString s2_QString = QString::fromUtf8(s2.data, s2.len); return self->compare(s1_QString, s2_QString); } @@ -92,14 +92,14 @@ int QCollator_Compare3(const QCollator* self, QChar* s1, int len1, QChar* s2, in return self->compare(s1, static_cast(len1), s2, static_cast(len2)); } -bool QCollator_OperatorCall(const QCollator* self, struct miqt_string* s1, struct miqt_string* s2) { - QString s1_QString = QString::fromUtf8(&s1->data, s1->len); - QString s2_QString = QString::fromUtf8(&s2->data, s2->len); +bool QCollator_OperatorCall(const QCollator* self, struct miqt_string s1, struct miqt_string s2) { + QString s1_QString = QString::fromUtf8(s1.data, s1.len); + QString s2_QString = QString::fromUtf8(s2.data, s2.len); return self->operator()(s1_QString, s2_QString); } -QCollatorSortKey* QCollator_SortKey(const QCollator* self, struct miqt_string* stringVal) { - QString stringVal_QString = QString::fromUtf8(&stringVal->data, stringVal->len); +QCollatorSortKey* QCollator_SortKey(const QCollator* self, struct miqt_string stringVal) { + QString stringVal_QString = QString::fromUtf8(stringVal.data, stringVal.len); return new QCollatorSortKey(self->sortKey(stringVal_QString)); } diff --git a/qt/gen_qcollator.go b/qt/gen_qcollator.go index f2cd05cf..91deb824 100644 --- a/qt/gen_qcollator.go +++ b/qt/gen_qcollator.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -166,11 +165,15 @@ func (this *QCollator) IgnorePunctuation() bool { } func (this *QCollator) Compare(s1 string, s2 string) int { - s1_ms := libmiqt.Strdupg(s1) - defer C.free(s1_ms) - s2_ms := libmiqt.Strdupg(s2) - defer C.free(s2_ms) - return (int)(C.QCollator_Compare(this.h, (*C.struct_miqt_string)(s1_ms), (*C.struct_miqt_string)(s2_ms))) + s1_ms := C.struct_miqt_string{} + s1_ms.data = C.CString(s1) + s1_ms.len = C.size_t(len(s1)) + defer C.free(unsafe.Pointer(s1_ms.data)) + s2_ms := C.struct_miqt_string{} + s2_ms.data = C.CString(s2) + s2_ms.len = C.size_t(len(s2)) + defer C.free(unsafe.Pointer(s2_ms.data)) + return (int)(C.QCollator_Compare(this.h, s1_ms, s2_ms)) } func (this *QCollator) Compare3(s1 *QChar, len1 int, s2 *QChar, len2 int) int { @@ -178,17 +181,23 @@ func (this *QCollator) Compare3(s1 *QChar, len1 int, s2 *QChar, len2 int) int { } func (this *QCollator) OperatorCall(s1 string, s2 string) bool { - s1_ms := libmiqt.Strdupg(s1) - defer C.free(s1_ms) - s2_ms := libmiqt.Strdupg(s2) - defer C.free(s2_ms) - return (bool)(C.QCollator_OperatorCall(this.h, (*C.struct_miqt_string)(s1_ms), (*C.struct_miqt_string)(s2_ms))) + s1_ms := C.struct_miqt_string{} + s1_ms.data = C.CString(s1) + s1_ms.len = C.size_t(len(s1)) + defer C.free(unsafe.Pointer(s1_ms.data)) + s2_ms := C.struct_miqt_string{} + s2_ms.data = C.CString(s2) + s2_ms.len = C.size_t(len(s2)) + defer C.free(unsafe.Pointer(s2_ms.data)) + return (bool)(C.QCollator_OperatorCall(this.h, s1_ms, s2_ms)) } func (this *QCollator) SortKey(stringVal string) *QCollatorSortKey { - stringVal_ms := libmiqt.Strdupg(stringVal) - defer C.free(stringVal_ms) - _ret := C.QCollator_SortKey(this.h, (*C.struct_miqt_string)(stringVal_ms)) + stringVal_ms := C.struct_miqt_string{} + stringVal_ms.data = C.CString(stringVal) + stringVal_ms.len = C.size_t(len(stringVal)) + defer C.free(unsafe.Pointer(stringVal_ms.data)) + _ret := C.QCollator_SortKey(this.h, stringVal_ms) _goptr := newQCollatorSortKey(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr diff --git a/qt/gen_qcollator.h b/qt/gen_qcollator.h index 480f4f72..6d9f845a 100644 --- a/qt/gen_qcollator.h +++ b/qt/gen_qcollator.h @@ -44,10 +44,10 @@ void QCollator_SetNumericMode(QCollator* self, bool on); bool QCollator_NumericMode(const QCollator* self); void QCollator_SetIgnorePunctuation(QCollator* self, bool on); bool QCollator_IgnorePunctuation(const QCollator* self); -int QCollator_Compare(const QCollator* self, struct miqt_string* s1, struct miqt_string* s2); +int QCollator_Compare(const QCollator* self, struct miqt_string s1, struct miqt_string s2); int QCollator_Compare3(const QCollator* self, QChar* s1, int len1, QChar* s2, int len2); -bool QCollator_OperatorCall(const QCollator* self, struct miqt_string* s1, struct miqt_string* s2); -QCollatorSortKey* QCollator_SortKey(const QCollator* self, struct miqt_string* stringVal); +bool QCollator_OperatorCall(const QCollator* self, struct miqt_string s1, struct miqt_string s2); +QCollatorSortKey* QCollator_SortKey(const QCollator* self, struct miqt_string stringVal); void QCollator_Delete(QCollator* self); #ifdef __cplusplus diff --git a/qt/gen_qcolor.cpp b/qt/gen_qcolor.cpp index 44578a92..f2183f5f 100644 --- a/qt/gen_qcolor.cpp +++ b/qt/gen_qcolor.cpp @@ -28,8 +28,8 @@ QColor* QColor_new5(QRgba64* rgba64) { return new QColor(*rgba64); } -QColor* QColor_new6(struct miqt_string* name) { - QString name_QString = QString::fromUtf8(&name->data, name->len); +QColor* QColor_new6(struct miqt_string name) { + QString name_QString = QString::fromUtf8(name.data, name.len); return new QColor(name_QString); } @@ -69,34 +69,46 @@ bool QColor_IsValid(const QColor* self) { return self->isValid(); } -struct miqt_string* QColor_Name(const QColor* self) { +struct miqt_string QColor_Name(const QColor* self) { QString _ret = self->name(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QColor_NameWithFormat(const QColor* self, int format) { +struct miqt_string QColor_NameWithFormat(const QColor* self, int format) { QString _ret = self->name(static_cast(format)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QColor_SetNamedColor(QColor* self, struct miqt_string* name) { - QString name_QString = QString::fromUtf8(&name->data, name->len); +void QColor_SetNamedColor(QColor* self, struct miqt_string name) { + QString name_QString = QString::fromUtf8(name.data, name.len); self->setNamedColor(name_QString); } struct miqt_array* QColor_ColorNames() { QStringList _ret = QColor::colorNames(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -479,8 +491,8 @@ bool QColor_OperatorNotEqual(const QColor* self, QColor* c) { return self->operator!=(*c); } -bool QColor_IsValidColor(struct miqt_string* name) { - QString name_QString = QString::fromUtf8(&name->data, name->len); +bool QColor_IsValidColor(struct miqt_string name) { + QString name_QString = QString::fromUtf8(name.data, name.len); return QColor::isValidColor(name_QString); } diff --git a/qt/gen_qcolor.go b/qt/gen_qcolor.go index 80c18d6f..24e5166b 100644 --- a/qt/gen_qcolor.go +++ b/qt/gen_qcolor.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -93,9 +92,11 @@ func NewQColor5(rgba64 QRgba64) *QColor { // NewQColor6 constructs a new QColor object. func NewQColor6(name string) *QColor { - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - ret := C.QColor_new6((*C.struct_miqt_string)(name_ms)) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + ret := C.QColor_new6(name_ms) return newQColor(ret) } @@ -150,33 +151,35 @@ func (this *QColor) IsValid() bool { } func (this *QColor) Name() string { - var _ms *C.struct_miqt_string = C.QColor_Name(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QColor_Name(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QColor) NameWithFormat(format QColor__NameFormat) string { - var _ms *C.struct_miqt_string = C.QColor_NameWithFormat(this.h, (C.int)(format)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QColor_NameWithFormat(this.h, (C.int)(format)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QColor) SetNamedColor(name string) { - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - C.QColor_SetNamedColor(this.h, (*C.struct_miqt_string)(name_ms)) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + C.QColor_SetNamedColor(this.h, name_ms) } func QColor_ColorNames() []string { var _ma *C.struct_miqt_array = C.QColor_ColorNames() _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -609,9 +612,11 @@ func (this *QColor) OperatorNotEqual(c *QColor) bool { } func QColor_IsValidColor(name string) bool { - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - return (bool)(C.QColor_IsValidColor((*C.struct_miqt_string)(name_ms))) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + return (bool)(C.QColor_IsValidColor(name_ms)) } func (this *QColor) GetRgb4(r *int, g *int, b *int, a *int) { diff --git a/qt/gen_qcolor.h b/qt/gen_qcolor.h index 5d76c747..23973ce9 100644 --- a/qt/gen_qcolor.h +++ b/qt/gen_qcolor.h @@ -26,7 +26,7 @@ QColor* QColor_new2(int color); QColor* QColor_new3(int r, int g, int b); QColor* QColor_new4(unsigned int rgb); QColor* QColor_new5(QRgba64* rgba64); -QColor* QColor_new6(struct miqt_string* name); +QColor* QColor_new6(struct miqt_string name); QColor* QColor_new7(const char* aname); QColor* QColor_new8(int spec); QColor* QColor_new9(QColor* color); @@ -36,9 +36,9 @@ QColor* QColor_new12(int spec, uint16_t a1, uint16_t a2, uint16_t a3, uint16_t a void QColor_OperatorAssign(QColor* self, QColor* param1); void QColor_OperatorAssignWithColor(QColor* self, int color); bool QColor_IsValid(const QColor* self); -struct miqt_string* QColor_Name(const QColor* self); -struct miqt_string* QColor_NameWithFormat(const QColor* self, int format); -void QColor_SetNamedColor(QColor* self, struct miqt_string* name); +struct miqt_string QColor_Name(const QColor* self); +struct miqt_string QColor_NameWithFormat(const QColor* self, int format); +void QColor_SetNamedColor(QColor* self, struct miqt_string name); struct miqt_array* QColor_ColorNames(); int QColor_Spec(const QColor* self); int QColor_Alpha(const QColor* self); @@ -129,7 +129,7 @@ QColor* QColor_Lighter(const QColor* self); QColor* QColor_Darker(const QColor* self); bool QColor_OperatorEqual(const QColor* self, QColor* c); bool QColor_OperatorNotEqual(const QColor* self, QColor* c); -bool QColor_IsValidColor(struct miqt_string* name); +bool QColor_IsValidColor(struct miqt_string name); void QColor_GetRgb4(const QColor* self, int* r, int* g, int* b, int* a); void QColor_SetRgb4(QColor* self, int r, int g, int b, int a); void QColor_GetRgbF4(const QColor* self, double* r, double* g, double* b, double* a); diff --git a/qt/gen_qcolordialog.cpp b/qt/gen_qcolordialog.cpp index 299975ab..20f48ba6 100644 --- a/qt/gen_qcolordialog.cpp +++ b/qt/gen_qcolordialog.cpp @@ -33,18 +33,26 @@ void* QColorDialog_Metacast(QColorDialog* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QColorDialog_Tr(const char* s) { +struct miqt_string QColorDialog_Tr(const char* s) { QString _ret = QColorDialog::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QColorDialog_TrUtf8(const char* s) { +struct miqt_string QColorDialog_TrUtf8(const char* s) { QString _ret = QColorDialog::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QColorDialog_SetCurrentColor(QColorDialog* self, QColor* color) { @@ -135,32 +143,48 @@ void QColorDialog_connect_ColorSelected(QColorDialog* self, intptr_t slot) { }); } -struct miqt_string* QColorDialog_Tr2(const char* s, const char* c) { +struct miqt_string QColorDialog_Tr2(const char* s, const char* c) { QString _ret = QColorDialog::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QColorDialog_Tr3(const char* s, const char* c, int n) { +struct miqt_string QColorDialog_Tr3(const char* s, const char* c, int n) { QString _ret = QColorDialog::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QColorDialog_TrUtf82(const char* s, const char* c) { +struct miqt_string QColorDialog_TrUtf82(const char* s, const char* c) { QString _ret = QColorDialog::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QColorDialog_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QColorDialog_TrUtf83(const char* s, const char* c, int n) { QString _ret = QColorDialog::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QColorDialog_SetOption2(QColorDialog* self, int option, bool on) { @@ -175,13 +199,13 @@ QColor* QColorDialog_GetColor2(QColor* initial, QWidget* parent) { return new QColor(QColorDialog::getColor(*initial, parent)); } -QColor* QColorDialog_GetColor3(QColor* initial, QWidget* parent, struct miqt_string* title) { - QString title_QString = QString::fromUtf8(&title->data, title->len); +QColor* QColorDialog_GetColor3(QColor* initial, QWidget* parent, struct miqt_string title) { + QString title_QString = QString::fromUtf8(title.data, title.len); return new QColor(QColorDialog::getColor(*initial, parent, title_QString)); } -QColor* QColorDialog_GetColor4(QColor* initial, QWidget* parent, struct miqt_string* title, int options) { - QString title_QString = QString::fromUtf8(&title->data, title->len); +QColor* QColorDialog_GetColor4(QColor* initial, QWidget* parent, struct miqt_string title, int options) { + QString title_QString = QString::fromUtf8(title.data, title.len); return new QColor(QColorDialog::getColor(*initial, parent, title_QString, static_cast(options))); } diff --git a/qt/gen_qcolordialog.go b/qt/gen_qcolordialog.go index afbc615f..db26084b 100644 --- a/qt/gen_qcolordialog.go +++ b/qt/gen_qcolordialog.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "runtime/cgo" "unsafe" @@ -84,24 +83,24 @@ func (this *QColorDialog) MetaObject() *QMetaObject { func (this *QColorDialog) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QColorDialog_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QColorDialog_Metacast(this.h, param1_Cstring)) } func QColorDialog_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QColorDialog_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QColorDialog_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QColorDialog_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QColorDialog_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QColorDialog_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -225,9 +224,9 @@ func QColorDialog_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QColorDialog_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QColorDialog_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -236,9 +235,9 @@ func QColorDialog_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QColorDialog_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QColorDialog_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -247,9 +246,9 @@ func QColorDialog_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QColorDialog_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QColorDialog_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -258,9 +257,9 @@ func QColorDialog_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QColorDialog_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QColorDialog_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -283,18 +282,22 @@ func QColorDialog_GetColor2(initial *QColor, parent *QWidget) *QColor { } func QColorDialog_GetColor3(initial *QColor, parent *QWidget, title string) *QColor { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - _ret := C.QColorDialog_GetColor3(initial.cPointer(), parent.cPointer(), (*C.struct_miqt_string)(title_ms)) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + _ret := C.QColorDialog_GetColor3(initial.cPointer(), parent.cPointer(), title_ms) _goptr := newQColor(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func QColorDialog_GetColor4(initial *QColor, parent *QWidget, title string, options QColorDialog__ColorDialogOption) *QColor { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - _ret := C.QColorDialog_GetColor4(initial.cPointer(), parent.cPointer(), (*C.struct_miqt_string)(title_ms), (C.int)(options)) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + _ret := C.QColorDialog_GetColor4(initial.cPointer(), parent.cPointer(), title_ms, (C.int)(options)) _goptr := newQColor(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr diff --git a/qt/gen_qcolordialog.h b/qt/gen_qcolordialog.h index 7d9c2028..4b089d10 100644 --- a/qt/gen_qcolordialog.h +++ b/qt/gen_qcolordialog.h @@ -31,8 +31,8 @@ QColorDialog* QColorDialog_new3(QWidget* parent); QColorDialog* QColorDialog_new4(QColor* initial, QWidget* parent); QMetaObject* QColorDialog_MetaObject(const QColorDialog* self); void* QColorDialog_Metacast(QColorDialog* self, const char* param1); -struct miqt_string* QColorDialog_Tr(const char* s); -struct miqt_string* QColorDialog_TrUtf8(const char* s); +struct miqt_string QColorDialog_Tr(const char* s); +struct miqt_string QColorDialog_TrUtf8(const char* s); void QColorDialog_SetCurrentColor(QColorDialog* self, QColor* color); QColor* QColorDialog_CurrentColor(const QColorDialog* self); QColor* QColorDialog_SelectedColor(const QColorDialog* self); @@ -52,15 +52,15 @@ void QColorDialog_CurrentColorChanged(QColorDialog* self, QColor* color); void QColorDialog_connect_CurrentColorChanged(QColorDialog* self, intptr_t slot); void QColorDialog_ColorSelected(QColorDialog* self, QColor* color); void QColorDialog_connect_ColorSelected(QColorDialog* self, intptr_t slot); -struct miqt_string* QColorDialog_Tr2(const char* s, const char* c); -struct miqt_string* QColorDialog_Tr3(const char* s, const char* c, int n); -struct miqt_string* QColorDialog_TrUtf82(const char* s, const char* c); -struct miqt_string* QColorDialog_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QColorDialog_Tr2(const char* s, const char* c); +struct miqt_string QColorDialog_Tr3(const char* s, const char* c, int n); +struct miqt_string QColorDialog_TrUtf82(const char* s, const char* c); +struct miqt_string QColorDialog_TrUtf83(const char* s, const char* c, int n); void QColorDialog_SetOption2(QColorDialog* self, int option, bool on); QColor* QColorDialog_GetColor1(QColor* initial); QColor* QColorDialog_GetColor2(QColor* initial, QWidget* parent); -QColor* QColorDialog_GetColor3(QColor* initial, QWidget* parent, struct miqt_string* title); -QColor* QColorDialog_GetColor4(QColor* initial, QWidget* parent, struct miqt_string* title, int options); +QColor* QColorDialog_GetColor3(QColor* initial, QWidget* parent, struct miqt_string title); +QColor* QColorDialog_GetColor4(QColor* initial, QWidget* parent, struct miqt_string title, int options); unsigned int QColorDialog_GetRgba1(unsigned int rgba); unsigned int QColorDialog_GetRgba2(unsigned int rgba, bool* ok); unsigned int QColorDialog_GetRgba3(unsigned int rgba, bool* ok, QWidget* parent); diff --git a/qt/gen_qcolorspace.cpp b/qt/gen_qcolorspace.cpp index 899bb015..7d38c837 100644 --- a/qt/gen_qcolorspace.cpp +++ b/qt/gen_qcolorspace.cpp @@ -80,12 +80,18 @@ bool QColorSpace_IsValid(const QColorSpace* self) { return self->isValid(); } -QColorSpace* QColorSpace_FromIccProfile(QByteArray* iccProfile) { - return new QColorSpace(QColorSpace::fromIccProfile(*iccProfile)); +QColorSpace* QColorSpace_FromIccProfile(struct miqt_string iccProfile) { + QByteArray iccProfile_QByteArray(iccProfile.data, iccProfile.len); + return new QColorSpace(QColorSpace::fromIccProfile(iccProfile_QByteArray)); } -QByteArray* QColorSpace_IccProfile(const QColorSpace* self) { - return new QByteArray(self->iccProfile()); +struct miqt_string QColorSpace_IccProfile(const QColorSpace* self) { + QByteArray _qb = self->iccProfile(); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } QColorTransform* QColorSpace_TransformationToColorSpace(const QColorSpace* self, QColorSpace* colorspace) { diff --git a/qt/gen_qcolorspace.go b/qt/gen_qcolorspace.go index 39f873a1..35168c77 100644 --- a/qt/gen_qcolorspace.go +++ b/qt/gen_qcolorspace.go @@ -163,18 +163,21 @@ func (this *QColorSpace) IsValid() bool { return (bool)(C.QColorSpace_IsValid(this.h)) } -func QColorSpace_FromIccProfile(iccProfile *QByteArray) *QColorSpace { - _ret := C.QColorSpace_FromIccProfile(iccProfile.cPointer()) +func QColorSpace_FromIccProfile(iccProfile []byte) *QColorSpace { + iccProfile_alias := C.struct_miqt_string{} + iccProfile_alias.data = (*C.char)(unsafe.Pointer(&iccProfile[0])) + iccProfile_alias.len = C.size_t(len(iccProfile)) + _ret := C.QColorSpace_FromIccProfile(iccProfile_alias) _goptr := newQColorSpace(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QColorSpace) IccProfile() *QByteArray { - _ret := C.QColorSpace_IccProfile(this.h) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QColorSpace) IccProfile() []byte { + var _bytearray C.struct_miqt_string = C.QColorSpace_IccProfile(this.h) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } func (this *QColorSpace) TransformationToColorSpace(colorspace *QColorSpace) *QColorTransform { diff --git a/qt/gen_qcolorspace.h b/qt/gen_qcolorspace.h index 80dd4155..7faf24c6 100644 --- a/qt/gen_qcolorspace.h +++ b/qt/gen_qcolorspace.h @@ -43,8 +43,8 @@ QColorSpace* QColorSpace_WithTransferFunction(const QColorSpace* self, int trans void QColorSpace_SetPrimaries(QColorSpace* self, int primariesId); void QColorSpace_SetPrimaries2(QColorSpace* self, QPointF* whitePoint, QPointF* redPoint, QPointF* greenPoint, QPointF* bluePoint); bool QColorSpace_IsValid(const QColorSpace* self); -QColorSpace* QColorSpace_FromIccProfile(QByteArray* iccProfile); -QByteArray* QColorSpace_IccProfile(const QColorSpace* self); +QColorSpace* QColorSpace_FromIccProfile(struct miqt_string iccProfile); +struct miqt_string QColorSpace_IccProfile(const QColorSpace* self); QColorTransform* QColorSpace_TransformationToColorSpace(const QColorSpace* self, QColorSpace* colorspace); void QColorSpace_SetTransferFunction2(QColorSpace* self, int transferFunction, float gamma); QColorSpace* QColorSpace_WithTransferFunction2(const QColorSpace* self, int transferFunction, float gamma); diff --git a/qt/gen_qcolumnview.cpp b/qt/gen_qcolumnview.cpp index 5378e832..5d2e537d 100644 --- a/qt/gen_qcolumnview.cpp +++ b/qt/gen_qcolumnview.cpp @@ -31,18 +31,26 @@ void* QColumnView_Metacast(QColumnView* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QColumnView_Tr(const char* s) { +struct miqt_string QColumnView_Tr(const char* s) { QString _ret = QColumnView::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QColumnView_TrUtf8(const char* s) { +struct miqt_string QColumnView_TrUtf8(const char* s) { QString _ret = QColumnView::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QColumnView_UpdatePreviewWidget(QColumnView* self, QModelIndex* index) { @@ -129,32 +137,48 @@ struct miqt_array* QColumnView_ColumnWidths(const QColumnView* self) { return _out; } -struct miqt_string* QColumnView_Tr2(const char* s, const char* c) { +struct miqt_string QColumnView_Tr2(const char* s, const char* c) { QString _ret = QColumnView::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QColumnView_Tr3(const char* s, const char* c, int n) { +struct miqt_string QColumnView_Tr3(const char* s, const char* c, int n) { QString _ret = QColumnView::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QColumnView_TrUtf82(const char* s, const char* c) { +struct miqt_string QColumnView_TrUtf82(const char* s, const char* c) { QString _ret = QColumnView::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QColumnView_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QColumnView_TrUtf83(const char* s, const char* c, int n) { QString _ret = QColumnView::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QColumnView_ScrollTo2(QColumnView* self, QModelIndex* index, int hint) { diff --git a/qt/gen_qcolumnview.go b/qt/gen_qcolumnview.go index 7fe307a4..186e21e5 100644 --- a/qt/gen_qcolumnview.go +++ b/qt/gen_qcolumnview.go @@ -63,24 +63,24 @@ func (this *QColumnView) MetaObject() *QMetaObject { func (this *QColumnView) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QColumnView_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QColumnView_Metacast(this.h, param1_Cstring)) } func QColumnView_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QColumnView_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QColumnView_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QColumnView_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QColumnView_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QColumnView_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -189,9 +189,9 @@ func QColumnView_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QColumnView_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QColumnView_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -200,9 +200,9 @@ func QColumnView_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QColumnView_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QColumnView_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -211,9 +211,9 @@ func QColumnView_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QColumnView_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QColumnView_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -222,9 +222,9 @@ func QColumnView_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QColumnView_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QColumnView_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qcolumnview.h b/qt/gen_qcolumnview.h index 8ae55a17..ee39bf6b 100644 --- a/qt/gen_qcolumnview.h +++ b/qt/gen_qcolumnview.h @@ -39,8 +39,8 @@ QColumnView* QColumnView_new(); QColumnView* QColumnView_new2(QWidget* parent); QMetaObject* QColumnView_MetaObject(const QColumnView* self); void* QColumnView_Metacast(QColumnView* self, const char* param1); -struct miqt_string* QColumnView_Tr(const char* s); -struct miqt_string* QColumnView_TrUtf8(const char* s); +struct miqt_string QColumnView_Tr(const char* s); +struct miqt_string QColumnView_TrUtf8(const char* s); void QColumnView_UpdatePreviewWidget(QColumnView* self, QModelIndex* index); void QColumnView_connect_UpdatePreviewWidget(QColumnView* self, intptr_t slot); QModelIndex* QColumnView_IndexAt(const QColumnView* self, QPoint* point); @@ -57,10 +57,10 @@ QWidget* QColumnView_PreviewWidget(const QColumnView* self); void QColumnView_SetPreviewWidget(QColumnView* self, QWidget* widget); void QColumnView_SetColumnWidths(QColumnView* self, struct miqt_array* /* of int */ list); struct miqt_array* QColumnView_ColumnWidths(const QColumnView* self); -struct miqt_string* QColumnView_Tr2(const char* s, const char* c); -struct miqt_string* QColumnView_Tr3(const char* s, const char* c, int n); -struct miqt_string* QColumnView_TrUtf82(const char* s, const char* c); -struct miqt_string* QColumnView_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QColumnView_Tr2(const char* s, const char* c); +struct miqt_string QColumnView_Tr3(const char* s, const char* c, int n); +struct miqt_string QColumnView_TrUtf82(const char* s, const char* c); +struct miqt_string QColumnView_TrUtf83(const char* s, const char* c, int n); void QColumnView_ScrollTo2(QColumnView* self, QModelIndex* index, int hint); void QColumnView_Delete(QColumnView* self); diff --git a/qt/gen_qcombobox.cpp b/qt/gen_qcombobox.cpp index f445a7c9..4018444e 100644 --- a/qt/gen_qcombobox.cpp +++ b/qt/gen_qcombobox.cpp @@ -36,18 +36,26 @@ void* QComboBox_Metacast(QComboBox* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QComboBox_Tr(const char* s) { +struct miqt_string QComboBox_Tr(const char* s) { QString _ret = QComboBox::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QComboBox_TrUtf8(const char* s) { +struct miqt_string QComboBox_TrUtf8(const char* s) { QString _ret = QComboBox::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QComboBox_MaxVisibleItems(const QComboBox* self) { @@ -103,8 +111,8 @@ bool QComboBox_HasFrame(const QComboBox* self) { return self->hasFrame(); } -int QComboBox_FindText(const QComboBox* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +int QComboBox_FindText(const QComboBox* self, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); return self->findText(text_QString); } @@ -146,16 +154,20 @@ void QComboBox_SetIconSize(QComboBox* self, QSize* size) { self->setIconSize(*size); } -void QComboBox_SetPlaceholderText(QComboBox* self, struct miqt_string* placeholderText) { - QString placeholderText_QString = QString::fromUtf8(&placeholderText->data, placeholderText->len); +void QComboBox_SetPlaceholderText(QComboBox* self, struct miqt_string placeholderText) { + QString placeholderText_QString = QString::fromUtf8(placeholderText.data, placeholderText.len); self->setPlaceholderText(placeholderText_QString); } -struct miqt_string* QComboBox_PlaceholderText(const QComboBox* self) { +struct miqt_string QComboBox_PlaceholderText(const QComboBox* self) { QString _ret = self->placeholderText(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } bool QComboBox_IsEditable(const QComboBox* self) { @@ -226,22 +238,30 @@ int QComboBox_CurrentIndex(const QComboBox* self) { return self->currentIndex(); } -struct miqt_string* QComboBox_CurrentText(const QComboBox* self) { +struct miqt_string QComboBox_CurrentText(const QComboBox* self) { QString _ret = self->currentText(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QVariant* QComboBox_CurrentData(const QComboBox* self) { return new QVariant(self->currentData()); } -struct miqt_string* QComboBox_ItemText(const QComboBox* self, int index) { +struct miqt_string QComboBox_ItemText(const QComboBox* self, int index) { QString _ret = self->itemText(static_cast(index)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QIcon* QComboBox_ItemIcon(const QComboBox* self, int index) { @@ -252,43 +272,43 @@ QVariant* QComboBox_ItemData(const QComboBox* self, int index) { return new QVariant(self->itemData(static_cast(index))); } -void QComboBox_AddItem(QComboBox* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QComboBox_AddItem(QComboBox* self, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->addItem(text_QString); } -void QComboBox_AddItem2(QComboBox* self, QIcon* icon, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QComboBox_AddItem2(QComboBox* self, QIcon* icon, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->addItem(*icon, text_QString); } -void QComboBox_AddItems(QComboBox* self, struct miqt_array* /* of struct miqt_string* */ texts) { +void QComboBox_AddItems(QComboBox* self, struct miqt_array* /* of struct miqt_string */ texts) { QStringList texts_QList; texts_QList.reserve(texts->len); - struct miqt_string** texts_arr = static_cast(texts->data); + struct miqt_string* texts_arr = static_cast(texts->data); for(size_t i = 0; i < texts->len; ++i) { - QString texts_arr_i_QString = QString::fromUtf8(&texts_arr[i]->data, texts_arr[i]->len); + QString texts_arr_i_QString = QString::fromUtf8(texts_arr[i].data, texts_arr[i].len); texts_QList.push_back(texts_arr_i_QString); } self->addItems(texts_QList); } -void QComboBox_InsertItem(QComboBox* self, int index, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QComboBox_InsertItem(QComboBox* self, int index, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->insertItem(static_cast(index), text_QString); } -void QComboBox_InsertItem2(QComboBox* self, int index, QIcon* icon, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QComboBox_InsertItem2(QComboBox* self, int index, QIcon* icon, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->insertItem(static_cast(index), *icon, text_QString); } -void QComboBox_InsertItems(QComboBox* self, int index, struct miqt_array* /* of struct miqt_string* */ texts) { +void QComboBox_InsertItems(QComboBox* self, int index, struct miqt_array* /* of struct miqt_string */ texts) { QStringList texts_QList; texts_QList.reserve(texts->len); - struct miqt_string** texts_arr = static_cast(texts->data); + struct miqt_string* texts_arr = static_cast(texts->data); for(size_t i = 0; i < texts->len; ++i) { - QString texts_arr_i_QString = QString::fromUtf8(&texts_arr[i]->data, texts_arr[i]->len); + QString texts_arr_i_QString = QString::fromUtf8(texts_arr[i].data, texts_arr[i].len); texts_QList.push_back(texts_arr_i_QString); } self->insertItems(static_cast(index), texts_QList); @@ -302,8 +322,8 @@ void QComboBox_RemoveItem(QComboBox* self, int index) { self->removeItem(static_cast(index)); } -void QComboBox_SetItemText(QComboBox* self, int index, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QComboBox_SetItemText(QComboBox* self, int index, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->setItemText(static_cast(index), text_QString); } @@ -359,8 +379,8 @@ void QComboBox_ClearEditText(QComboBox* self) { self->clearEditText(); } -void QComboBox_SetEditText(QComboBox* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QComboBox_SetEditText(QComboBox* self, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->setEditText(text_QString); } @@ -368,13 +388,13 @@ void QComboBox_SetCurrentIndex(QComboBox* self, int index) { self->setCurrentIndex(static_cast(index)); } -void QComboBox_SetCurrentText(QComboBox* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QComboBox_SetCurrentText(QComboBox* self, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->setCurrentText(text_QString); } -void QComboBox_EditTextChanged(QComboBox* self, struct miqt_string* param1) { - QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); +void QComboBox_EditTextChanged(QComboBox* self, struct miqt_string param1) { + QString param1_QString = QString::fromUtf8(param1.data, param1.len); self->editTextChanged(param1_QString); } @@ -383,7 +403,11 @@ void QComboBox_connect_EditTextChanged(QComboBox* self, intptr_t slot) { const QString param1_ret = param1; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray param1_b = param1_ret.toUtf8(); - struct miqt_string* sigval1 = miqt_strdup(param1_b.data(), param1_b.length()); + struct miqt_string param1_ms; + param1_ms.len = param1_b.length(); + param1_ms.data = static_cast(malloc(param1_ms.len)); + memcpy(param1_ms.data, param1_b.data(), param1_ms.len); + struct miqt_string sigval1 = param1_ms; miqt_exec_callback_QComboBox_EditTextChanged(slot, sigval1); }); } @@ -399,8 +423,8 @@ void QComboBox_connect_Activated(QComboBox* self, intptr_t slot) { }); } -void QComboBox_TextActivated(QComboBox* self, struct miqt_string* param1) { - QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); +void QComboBox_TextActivated(QComboBox* self, struct miqt_string param1) { + QString param1_QString = QString::fromUtf8(param1.data, param1.len); self->textActivated(param1_QString); } @@ -409,7 +433,11 @@ void QComboBox_connect_TextActivated(QComboBox* self, intptr_t slot) { const QString param1_ret = param1; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray param1_b = param1_ret.toUtf8(); - struct miqt_string* sigval1 = miqt_strdup(param1_b.data(), param1_b.length()); + struct miqt_string param1_ms; + param1_ms.len = param1_b.length(); + param1_ms.data = static_cast(malloc(param1_ms.len)); + memcpy(param1_ms.data, param1_b.data(), param1_ms.len); + struct miqt_string sigval1 = param1_ms; miqt_exec_callback_QComboBox_TextActivated(slot, sigval1); }); } @@ -425,8 +453,8 @@ void QComboBox_connect_Highlighted(QComboBox* self, intptr_t slot) { }); } -void QComboBox_TextHighlighted(QComboBox* self, struct miqt_string* param1) { - QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); +void QComboBox_TextHighlighted(QComboBox* self, struct miqt_string param1) { + QString param1_QString = QString::fromUtf8(param1.data, param1.len); self->textHighlighted(param1_QString); } @@ -435,7 +463,11 @@ void QComboBox_connect_TextHighlighted(QComboBox* self, intptr_t slot) { const QString param1_ret = param1; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray param1_b = param1_ret.toUtf8(); - struct miqt_string* sigval1 = miqt_strdup(param1_b.data(), param1_b.length()); + struct miqt_string param1_ms; + param1_ms.len = param1_b.length(); + param1_ms.data = static_cast(malloc(param1_ms.len)); + memcpy(param1_ms.data, param1_b.data(), param1_ms.len); + struct miqt_string sigval1 = param1_ms; miqt_exec_callback_QComboBox_TextHighlighted(slot, sigval1); }); } @@ -451,8 +483,8 @@ void QComboBox_connect_CurrentIndexChanged(QComboBox* self, intptr_t slot) { }); } -void QComboBox_CurrentIndexChangedWithQString(QComboBox* self, struct miqt_string* param1) { - QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); +void QComboBox_CurrentIndexChangedWithQString(QComboBox* self, struct miqt_string param1) { + QString param1_QString = QString::fromUtf8(param1.data, param1.len); self->currentIndexChanged(param1_QString); } @@ -461,13 +493,17 @@ void QComboBox_connect_CurrentIndexChangedWithQString(QComboBox* self, intptr_t const QString param1_ret = param1; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray param1_b = param1_ret.toUtf8(); - struct miqt_string* sigval1 = miqt_strdup(param1_b.data(), param1_b.length()); + struct miqt_string param1_ms; + param1_ms.len = param1_b.length(); + param1_ms.data = static_cast(malloc(param1_ms.len)); + memcpy(param1_ms.data, param1_b.data(), param1_ms.len); + struct miqt_string sigval1 = param1_ms; miqt_exec_callback_QComboBox_CurrentIndexChangedWithQString(slot, sigval1); }); } -void QComboBox_CurrentTextChanged(QComboBox* self, struct miqt_string* param1) { - QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); +void QComboBox_CurrentTextChanged(QComboBox* self, struct miqt_string param1) { + QString param1_QString = QString::fromUtf8(param1.data, param1.len); self->currentTextChanged(param1_QString); } @@ -476,13 +512,17 @@ void QComboBox_connect_CurrentTextChanged(QComboBox* self, intptr_t slot) { const QString param1_ret = param1; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray param1_b = param1_ret.toUtf8(); - struct miqt_string* sigval1 = miqt_strdup(param1_b.data(), param1_b.length()); + struct miqt_string param1_ms; + param1_ms.len = param1_b.length(); + param1_ms.data = static_cast(malloc(param1_ms.len)); + memcpy(param1_ms.data, param1_b.data(), param1_ms.len); + struct miqt_string sigval1 = param1_ms; miqt_exec_callback_QComboBox_CurrentTextChanged(slot, sigval1); }); } -void QComboBox_ActivatedWithQString(QComboBox* self, struct miqt_string* param1) { - QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); +void QComboBox_ActivatedWithQString(QComboBox* self, struct miqt_string param1) { + QString param1_QString = QString::fromUtf8(param1.data, param1.len); self->activated(param1_QString); } @@ -491,13 +531,17 @@ void QComboBox_connect_ActivatedWithQString(QComboBox* self, intptr_t slot) { const QString param1_ret = param1; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray param1_b = param1_ret.toUtf8(); - struct miqt_string* sigval1 = miqt_strdup(param1_b.data(), param1_b.length()); + struct miqt_string param1_ms; + param1_ms.len = param1_b.length(); + param1_ms.data = static_cast(malloc(param1_ms.len)); + memcpy(param1_ms.data, param1_b.data(), param1_ms.len); + struct miqt_string sigval1 = param1_ms; miqt_exec_callback_QComboBox_ActivatedWithQString(slot, sigval1); }); } -void QComboBox_HighlightedWithQString(QComboBox* self, struct miqt_string* param1) { - QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); +void QComboBox_HighlightedWithQString(QComboBox* self, struct miqt_string param1) { + QString param1_QString = QString::fromUtf8(param1.data, param1.len); self->highlighted(param1_QString); } @@ -506,41 +550,61 @@ void QComboBox_connect_HighlightedWithQString(QComboBox* self, intptr_t slot) { const QString param1_ret = param1; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray param1_b = param1_ret.toUtf8(); - struct miqt_string* sigval1 = miqt_strdup(param1_b.data(), param1_b.length()); + struct miqt_string param1_ms; + param1_ms.len = param1_b.length(); + param1_ms.data = static_cast(malloc(param1_ms.len)); + memcpy(param1_ms.data, param1_b.data(), param1_ms.len); + struct miqt_string sigval1 = param1_ms; miqt_exec_callback_QComboBox_HighlightedWithQString(slot, sigval1); }); } -struct miqt_string* QComboBox_Tr2(const char* s, const char* c) { +struct miqt_string QComboBox_Tr2(const char* s, const char* c) { QString _ret = QComboBox::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QComboBox_Tr3(const char* s, const char* c, int n) { +struct miqt_string QComboBox_Tr3(const char* s, const char* c, int n) { QString _ret = QComboBox::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QComboBox_TrUtf82(const char* s, const char* c) { +struct miqt_string QComboBox_TrUtf82(const char* s, const char* c) { QString _ret = QComboBox::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QComboBox_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QComboBox_TrUtf83(const char* s, const char* c, int n) { QString _ret = QComboBox::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -int QComboBox_FindText2(const QComboBox* self, struct miqt_string* text, int flags) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +int QComboBox_FindText2(const QComboBox* self, struct miqt_string text, int flags) { + QString text_QString = QString::fromUtf8(text.data, text.len); return self->findText(text_QString, static_cast(flags)); } @@ -560,23 +624,23 @@ QVariant* QComboBox_ItemData2(const QComboBox* self, int index, int role) { return new QVariant(self->itemData(static_cast(index), static_cast(role))); } -void QComboBox_AddItem22(QComboBox* self, struct miqt_string* text, QVariant* userData) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QComboBox_AddItem22(QComboBox* self, struct miqt_string text, QVariant* userData) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->addItem(text_QString, *userData); } -void QComboBox_AddItem3(QComboBox* self, QIcon* icon, struct miqt_string* text, QVariant* userData) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QComboBox_AddItem3(QComboBox* self, QIcon* icon, struct miqt_string text, QVariant* userData) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->addItem(*icon, text_QString, *userData); } -void QComboBox_InsertItem3(QComboBox* self, int index, struct miqt_string* text, QVariant* userData) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QComboBox_InsertItem3(QComboBox* self, int index, struct miqt_string text, QVariant* userData) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->insertItem(static_cast(index), text_QString, *userData); } -void QComboBox_InsertItem4(QComboBox* self, int index, QIcon* icon, struct miqt_string* text, QVariant* userData) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QComboBox_InsertItem4(QComboBox* self, int index, QIcon* icon, struct miqt_string text, QVariant* userData) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->insertItem(static_cast(index), *icon, text_QString, *userData); } diff --git a/qt/gen_qcombobox.go b/qt/gen_qcombobox.go index 1d851b60..d42ba7ee 100644 --- a/qt/gen_qcombobox.go +++ b/qt/gen_qcombobox.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "runtime/cgo" "unsafe" @@ -85,24 +84,24 @@ func (this *QComboBox) MetaObject() *QMetaObject { func (this *QComboBox) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QComboBox_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QComboBox_Metacast(this.h, param1_Cstring)) } func QComboBox_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QComboBox_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QComboBox_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QComboBox_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QComboBox_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QComboBox_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -159,9 +158,11 @@ func (this *QComboBox) HasFrame() bool { } func (this *QComboBox) FindText(text string) int { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - return (int)(C.QComboBox_FindText(this.h, (*C.struct_miqt_string)(text_ms))) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + return (int)(C.QComboBox_FindText(this.h, text_ms)) } func (this *QComboBox) FindData(data *QVariant) int { @@ -204,15 +205,17 @@ func (this *QComboBox) SetIconSize(size *QSize) { } func (this *QComboBox) SetPlaceholderText(placeholderText string) { - placeholderText_ms := libmiqt.Strdupg(placeholderText) - defer C.free(placeholderText_ms) - C.QComboBox_SetPlaceholderText(this.h, (*C.struct_miqt_string)(placeholderText_ms)) + placeholderText_ms := C.struct_miqt_string{} + placeholderText_ms.data = C.CString(placeholderText) + placeholderText_ms.len = C.size_t(len(placeholderText)) + defer C.free(unsafe.Pointer(placeholderText_ms.data)) + C.QComboBox_SetPlaceholderText(this.h, placeholderText_ms) } func (this *QComboBox) PlaceholderText() string { - var _ms *C.struct_miqt_string = C.QComboBox_PlaceholderText(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QComboBox_PlaceholderText(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -288,9 +291,9 @@ func (this *QComboBox) CurrentIndex() int { } func (this *QComboBox) CurrentText() string { - var _ms *C.struct_miqt_string = C.QComboBox_CurrentText(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QComboBox_CurrentText(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -302,9 +305,9 @@ func (this *QComboBox) CurrentData() *QVariant { } func (this *QComboBox) ItemText(index int) string { - var _ms *C.struct_miqt_string = C.QComboBox_ItemText(this.h, (C.int)(index)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QComboBox_ItemText(this.h, (C.int)(index)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -323,25 +326,31 @@ func (this *QComboBox) ItemData(index int) *QVariant { } func (this *QComboBox) AddItem(text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QComboBox_AddItem(this.h, (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QComboBox_AddItem(this.h, text_ms) } func (this *QComboBox) AddItem2(icon *QIcon, text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QComboBox_AddItem2(this.h, icon.cPointer(), (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QComboBox_AddItem2(this.h, icon.cPointer(), text_ms) } func (this *QComboBox) AddItems(texts []string) { // For the C ABI, malloc a C array of raw pointers - texts_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(texts)))) + texts_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(texts)))) defer C.free(unsafe.Pointer(texts_CArray)) for i := range texts { - texts_i_ms := libmiqt.Strdupg(texts[i]) - defer C.free(texts_i_ms) - texts_CArray[i] = (*C.struct_miqt_string)(texts_i_ms) + texts_i_ms := C.struct_miqt_string{} + texts_i_ms.data = C.CString(texts[i]) + texts_i_ms.len = C.size_t(len(texts[i])) + defer C.free(unsafe.Pointer(texts_i_ms.data)) + texts_CArray[i] = texts_i_ms } texts_ma := &C.struct_miqt_array{len: C.size_t(len(texts)), data: unsafe.Pointer(texts_CArray)} defer runtime.KeepAlive(unsafe.Pointer(texts_ma)) @@ -349,25 +358,31 @@ func (this *QComboBox) AddItems(texts []string) { } func (this *QComboBox) InsertItem(index int, text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QComboBox_InsertItem(this.h, (C.int)(index), (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QComboBox_InsertItem(this.h, (C.int)(index), text_ms) } func (this *QComboBox) InsertItem2(index int, icon *QIcon, text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QComboBox_InsertItem2(this.h, (C.int)(index), icon.cPointer(), (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QComboBox_InsertItem2(this.h, (C.int)(index), icon.cPointer(), text_ms) } func (this *QComboBox) InsertItems(index int, texts []string) { // For the C ABI, malloc a C array of raw pointers - texts_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(texts)))) + texts_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(texts)))) defer C.free(unsafe.Pointer(texts_CArray)) for i := range texts { - texts_i_ms := libmiqt.Strdupg(texts[i]) - defer C.free(texts_i_ms) - texts_CArray[i] = (*C.struct_miqt_string)(texts_i_ms) + texts_i_ms := C.struct_miqt_string{} + texts_i_ms.data = C.CString(texts[i]) + texts_i_ms.len = C.size_t(len(texts[i])) + defer C.free(unsafe.Pointer(texts_i_ms.data)) + texts_CArray[i] = texts_i_ms } texts_ma := &C.struct_miqt_array{len: C.size_t(len(texts)), data: unsafe.Pointer(texts_CArray)} defer runtime.KeepAlive(unsafe.Pointer(texts_ma)) @@ -383,9 +398,11 @@ func (this *QComboBox) RemoveItem(index int) { } func (this *QComboBox) SetItemText(index int, text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QComboBox_SetItemText(this.h, (C.int)(index), (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QComboBox_SetItemText(this.h, (C.int)(index), text_ms) } func (this *QComboBox) SetItemIcon(index int, icon *QIcon) { @@ -453,9 +470,11 @@ func (this *QComboBox) ClearEditText() { } func (this *QComboBox) SetEditText(text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QComboBox_SetEditText(this.h, (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QComboBox_SetEditText(this.h, text_ms) } func (this *QComboBox) SetCurrentIndex(index int) { @@ -463,31 +482,35 @@ func (this *QComboBox) SetCurrentIndex(index int) { } func (this *QComboBox) SetCurrentText(text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QComboBox_SetCurrentText(this.h, (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QComboBox_SetCurrentText(this.h, text_ms) } func (this *QComboBox) EditTextChanged(param1 string) { - param1_ms := libmiqt.Strdupg(param1) - defer C.free(param1_ms) - C.QComboBox_EditTextChanged(this.h, (*C.struct_miqt_string)(param1_ms)) + param1_ms := C.struct_miqt_string{} + param1_ms.data = C.CString(param1) + param1_ms.len = C.size_t(len(param1)) + defer C.free(unsafe.Pointer(param1_ms.data)) + C.QComboBox_EditTextChanged(this.h, param1_ms) } func (this *QComboBox) OnEditTextChanged(slot func(param1 string)) { C.QComboBox_connect_EditTextChanged(this.h, C.intptr_t(cgo.NewHandle(slot))) } //export miqt_exec_callback_QComboBox_EditTextChanged -func miqt_exec_callback_QComboBox_EditTextChanged(cb C.intptr_t, param1 *C.struct_miqt_string) { +func miqt_exec_callback_QComboBox_EditTextChanged(cb C.intptr_t, param1 C.struct_miqt_string) { gofunc, ok := cgo.Handle(cb).Value().(func(param1 string)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") } // Convert all CABI parameters to Go parameters - var param1_ms *C.struct_miqt_string = param1 - param1_ret := C.GoStringN(¶m1_ms.data, C.int(int64(param1_ms.len))) - C.free(unsafe.Pointer(param1_ms)) + var param1_ms C.struct_miqt_string = param1 + param1_ret := C.GoStringN(param1_ms.data, C.int(int64(param1_ms.len))) + C.free(unsafe.Pointer(param1_ms.data)) slotval1 := param1_ret gofunc(slotval1) @@ -514,25 +537,27 @@ func miqt_exec_callback_QComboBox_Activated(cb C.intptr_t, index C.int) { } func (this *QComboBox) TextActivated(param1 string) { - param1_ms := libmiqt.Strdupg(param1) - defer C.free(param1_ms) - C.QComboBox_TextActivated(this.h, (*C.struct_miqt_string)(param1_ms)) + param1_ms := C.struct_miqt_string{} + param1_ms.data = C.CString(param1) + param1_ms.len = C.size_t(len(param1)) + defer C.free(unsafe.Pointer(param1_ms.data)) + C.QComboBox_TextActivated(this.h, param1_ms) } func (this *QComboBox) OnTextActivated(slot func(param1 string)) { C.QComboBox_connect_TextActivated(this.h, C.intptr_t(cgo.NewHandle(slot))) } //export miqt_exec_callback_QComboBox_TextActivated -func miqt_exec_callback_QComboBox_TextActivated(cb C.intptr_t, param1 *C.struct_miqt_string) { +func miqt_exec_callback_QComboBox_TextActivated(cb C.intptr_t, param1 C.struct_miqt_string) { gofunc, ok := cgo.Handle(cb).Value().(func(param1 string)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") } // Convert all CABI parameters to Go parameters - var param1_ms *C.struct_miqt_string = param1 - param1_ret := C.GoStringN(¶m1_ms.data, C.int(int64(param1_ms.len))) - C.free(unsafe.Pointer(param1_ms)) + var param1_ms C.struct_miqt_string = param1 + param1_ret := C.GoStringN(param1_ms.data, C.int(int64(param1_ms.len))) + C.free(unsafe.Pointer(param1_ms.data)) slotval1 := param1_ret gofunc(slotval1) @@ -559,25 +584,27 @@ func miqt_exec_callback_QComboBox_Highlighted(cb C.intptr_t, index C.int) { } func (this *QComboBox) TextHighlighted(param1 string) { - param1_ms := libmiqt.Strdupg(param1) - defer C.free(param1_ms) - C.QComboBox_TextHighlighted(this.h, (*C.struct_miqt_string)(param1_ms)) + param1_ms := C.struct_miqt_string{} + param1_ms.data = C.CString(param1) + param1_ms.len = C.size_t(len(param1)) + defer C.free(unsafe.Pointer(param1_ms.data)) + C.QComboBox_TextHighlighted(this.h, param1_ms) } func (this *QComboBox) OnTextHighlighted(slot func(param1 string)) { C.QComboBox_connect_TextHighlighted(this.h, C.intptr_t(cgo.NewHandle(slot))) } //export miqt_exec_callback_QComboBox_TextHighlighted -func miqt_exec_callback_QComboBox_TextHighlighted(cb C.intptr_t, param1 *C.struct_miqt_string) { +func miqt_exec_callback_QComboBox_TextHighlighted(cb C.intptr_t, param1 C.struct_miqt_string) { gofunc, ok := cgo.Handle(cb).Value().(func(param1 string)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") } // Convert all CABI parameters to Go parameters - var param1_ms *C.struct_miqt_string = param1 - param1_ret := C.GoStringN(¶m1_ms.data, C.int(int64(param1_ms.len))) - C.free(unsafe.Pointer(param1_ms)) + var param1_ms C.struct_miqt_string = param1 + param1_ret := C.GoStringN(param1_ms.data, C.int(int64(param1_ms.len))) + C.free(unsafe.Pointer(param1_ms.data)) slotval1 := param1_ret gofunc(slotval1) @@ -604,100 +631,108 @@ func miqt_exec_callback_QComboBox_CurrentIndexChanged(cb C.intptr_t, index C.int } func (this *QComboBox) CurrentIndexChangedWithQString(param1 string) { - param1_ms := libmiqt.Strdupg(param1) - defer C.free(param1_ms) - C.QComboBox_CurrentIndexChangedWithQString(this.h, (*C.struct_miqt_string)(param1_ms)) + param1_ms := C.struct_miqt_string{} + param1_ms.data = C.CString(param1) + param1_ms.len = C.size_t(len(param1)) + defer C.free(unsafe.Pointer(param1_ms.data)) + C.QComboBox_CurrentIndexChangedWithQString(this.h, param1_ms) } func (this *QComboBox) OnCurrentIndexChangedWithQString(slot func(param1 string)) { C.QComboBox_connect_CurrentIndexChangedWithQString(this.h, C.intptr_t(cgo.NewHandle(slot))) } //export miqt_exec_callback_QComboBox_CurrentIndexChangedWithQString -func miqt_exec_callback_QComboBox_CurrentIndexChangedWithQString(cb C.intptr_t, param1 *C.struct_miqt_string) { +func miqt_exec_callback_QComboBox_CurrentIndexChangedWithQString(cb C.intptr_t, param1 C.struct_miqt_string) { gofunc, ok := cgo.Handle(cb).Value().(func(param1 string)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") } // Convert all CABI parameters to Go parameters - var param1_ms *C.struct_miqt_string = param1 - param1_ret := C.GoStringN(¶m1_ms.data, C.int(int64(param1_ms.len))) - C.free(unsafe.Pointer(param1_ms)) + var param1_ms C.struct_miqt_string = param1 + param1_ret := C.GoStringN(param1_ms.data, C.int(int64(param1_ms.len))) + C.free(unsafe.Pointer(param1_ms.data)) slotval1 := param1_ret gofunc(slotval1) } func (this *QComboBox) CurrentTextChanged(param1 string) { - param1_ms := libmiqt.Strdupg(param1) - defer C.free(param1_ms) - C.QComboBox_CurrentTextChanged(this.h, (*C.struct_miqt_string)(param1_ms)) + param1_ms := C.struct_miqt_string{} + param1_ms.data = C.CString(param1) + param1_ms.len = C.size_t(len(param1)) + defer C.free(unsafe.Pointer(param1_ms.data)) + C.QComboBox_CurrentTextChanged(this.h, param1_ms) } func (this *QComboBox) OnCurrentTextChanged(slot func(param1 string)) { C.QComboBox_connect_CurrentTextChanged(this.h, C.intptr_t(cgo.NewHandle(slot))) } //export miqt_exec_callback_QComboBox_CurrentTextChanged -func miqt_exec_callback_QComboBox_CurrentTextChanged(cb C.intptr_t, param1 *C.struct_miqt_string) { +func miqt_exec_callback_QComboBox_CurrentTextChanged(cb C.intptr_t, param1 C.struct_miqt_string) { gofunc, ok := cgo.Handle(cb).Value().(func(param1 string)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") } // Convert all CABI parameters to Go parameters - var param1_ms *C.struct_miqt_string = param1 - param1_ret := C.GoStringN(¶m1_ms.data, C.int(int64(param1_ms.len))) - C.free(unsafe.Pointer(param1_ms)) + var param1_ms C.struct_miqt_string = param1 + param1_ret := C.GoStringN(param1_ms.data, C.int(int64(param1_ms.len))) + C.free(unsafe.Pointer(param1_ms.data)) slotval1 := param1_ret gofunc(slotval1) } func (this *QComboBox) ActivatedWithQString(param1 string) { - param1_ms := libmiqt.Strdupg(param1) - defer C.free(param1_ms) - C.QComboBox_ActivatedWithQString(this.h, (*C.struct_miqt_string)(param1_ms)) + param1_ms := C.struct_miqt_string{} + param1_ms.data = C.CString(param1) + param1_ms.len = C.size_t(len(param1)) + defer C.free(unsafe.Pointer(param1_ms.data)) + C.QComboBox_ActivatedWithQString(this.h, param1_ms) } func (this *QComboBox) OnActivatedWithQString(slot func(param1 string)) { C.QComboBox_connect_ActivatedWithQString(this.h, C.intptr_t(cgo.NewHandle(slot))) } //export miqt_exec_callback_QComboBox_ActivatedWithQString -func miqt_exec_callback_QComboBox_ActivatedWithQString(cb C.intptr_t, param1 *C.struct_miqt_string) { +func miqt_exec_callback_QComboBox_ActivatedWithQString(cb C.intptr_t, param1 C.struct_miqt_string) { gofunc, ok := cgo.Handle(cb).Value().(func(param1 string)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") } // Convert all CABI parameters to Go parameters - var param1_ms *C.struct_miqt_string = param1 - param1_ret := C.GoStringN(¶m1_ms.data, C.int(int64(param1_ms.len))) - C.free(unsafe.Pointer(param1_ms)) + var param1_ms C.struct_miqt_string = param1 + param1_ret := C.GoStringN(param1_ms.data, C.int(int64(param1_ms.len))) + C.free(unsafe.Pointer(param1_ms.data)) slotval1 := param1_ret gofunc(slotval1) } func (this *QComboBox) HighlightedWithQString(param1 string) { - param1_ms := libmiqt.Strdupg(param1) - defer C.free(param1_ms) - C.QComboBox_HighlightedWithQString(this.h, (*C.struct_miqt_string)(param1_ms)) + param1_ms := C.struct_miqt_string{} + param1_ms.data = C.CString(param1) + param1_ms.len = C.size_t(len(param1)) + defer C.free(unsafe.Pointer(param1_ms.data)) + C.QComboBox_HighlightedWithQString(this.h, param1_ms) } func (this *QComboBox) OnHighlightedWithQString(slot func(param1 string)) { C.QComboBox_connect_HighlightedWithQString(this.h, C.intptr_t(cgo.NewHandle(slot))) } //export miqt_exec_callback_QComboBox_HighlightedWithQString -func miqt_exec_callback_QComboBox_HighlightedWithQString(cb C.intptr_t, param1 *C.struct_miqt_string) { +func miqt_exec_callback_QComboBox_HighlightedWithQString(cb C.intptr_t, param1 C.struct_miqt_string) { gofunc, ok := cgo.Handle(cb).Value().(func(param1 string)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") } // Convert all CABI parameters to Go parameters - var param1_ms *C.struct_miqt_string = param1 - param1_ret := C.GoStringN(¶m1_ms.data, C.int(int64(param1_ms.len))) - C.free(unsafe.Pointer(param1_ms)) + var param1_ms C.struct_miqt_string = param1 + param1_ret := C.GoStringN(param1_ms.data, C.int(int64(param1_ms.len))) + C.free(unsafe.Pointer(param1_ms.data)) slotval1 := param1_ret gofunc(slotval1) @@ -708,9 +743,9 @@ func QComboBox_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QComboBox_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QComboBox_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -719,9 +754,9 @@ func QComboBox_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QComboBox_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QComboBox_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -730,9 +765,9 @@ func QComboBox_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QComboBox_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QComboBox_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -741,16 +776,18 @@ func QComboBox_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QComboBox_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QComboBox_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QComboBox) FindText2(text string, flags MatchFlag) int { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - return (int)(C.QComboBox_FindText2(this.h, (*C.struct_miqt_string)(text_ms), (C.int)(flags))) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + return (int)(C.QComboBox_FindText2(this.h, text_ms, (C.int)(flags))) } func (this *QComboBox) FindData2(data *QVariant, role int) int { @@ -776,27 +813,35 @@ func (this *QComboBox) ItemData2(index int, role int) *QVariant { } func (this *QComboBox) AddItem22(text string, userData *QVariant) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QComboBox_AddItem22(this.h, (*C.struct_miqt_string)(text_ms), userData.cPointer()) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QComboBox_AddItem22(this.h, text_ms, userData.cPointer()) } func (this *QComboBox) AddItem3(icon *QIcon, text string, userData *QVariant) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QComboBox_AddItem3(this.h, icon.cPointer(), (*C.struct_miqt_string)(text_ms), userData.cPointer()) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QComboBox_AddItem3(this.h, icon.cPointer(), text_ms, userData.cPointer()) } func (this *QComboBox) InsertItem3(index int, text string, userData *QVariant) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QComboBox_InsertItem3(this.h, (C.int)(index), (*C.struct_miqt_string)(text_ms), userData.cPointer()) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QComboBox_InsertItem3(this.h, (C.int)(index), text_ms, userData.cPointer()) } func (this *QComboBox) InsertItem4(index int, icon *QIcon, text string, userData *QVariant) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QComboBox_InsertItem4(this.h, (C.int)(index), icon.cPointer(), (*C.struct_miqt_string)(text_ms), userData.cPointer()) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QComboBox_InsertItem4(this.h, (C.int)(index), icon.cPointer(), text_ms, userData.cPointer()) } func (this *QComboBox) SetItemData3(index int, value *QVariant, role int) { diff --git a/qt/gen_qcombobox.h b/qt/gen_qcombobox.h index 1c60d741..42066b89 100644 --- a/qt/gen_qcombobox.h +++ b/qt/gen_qcombobox.h @@ -49,8 +49,8 @@ QComboBox* QComboBox_new(); QComboBox* QComboBox_new2(QWidget* parent); QMetaObject* QComboBox_MetaObject(const QComboBox* self); void* QComboBox_Metacast(QComboBox* self, const char* param1); -struct miqt_string* QComboBox_Tr(const char* s); -struct miqt_string* QComboBox_TrUtf8(const char* s); +struct miqt_string QComboBox_Tr(const char* s); +struct miqt_string QComboBox_TrUtf8(const char* s); int QComboBox_MaxVisibleItems(const QComboBox* self); void QComboBox_SetMaxVisibleItems(QComboBox* self, int maxItems); int QComboBox_Count(const QComboBox* self); @@ -64,7 +64,7 @@ bool QComboBox_DuplicatesEnabled(const QComboBox* self); void QComboBox_SetDuplicatesEnabled(QComboBox* self, bool enable); void QComboBox_SetFrame(QComboBox* self, bool frame); bool QComboBox_HasFrame(const QComboBox* self); -int QComboBox_FindText(const QComboBox* self, struct miqt_string* text); +int QComboBox_FindText(const QComboBox* self, struct miqt_string text); int QComboBox_FindData(const QComboBox* self, QVariant* data); int QComboBox_InsertPolicy(const QComboBox* self); void QComboBox_SetInsertPolicy(QComboBox* self, int policy); @@ -74,8 +74,8 @@ int QComboBox_MinimumContentsLength(const QComboBox* self); void QComboBox_SetMinimumContentsLength(QComboBox* self, int characters); QSize* QComboBox_IconSize(const QComboBox* self); void QComboBox_SetIconSize(QComboBox* self, QSize* size); -void QComboBox_SetPlaceholderText(QComboBox* self, struct miqt_string* placeholderText); -struct miqt_string* QComboBox_PlaceholderText(const QComboBox* self); +void QComboBox_SetPlaceholderText(QComboBox* self, struct miqt_string placeholderText); +struct miqt_string QComboBox_PlaceholderText(const QComboBox* self); bool QComboBox_IsEditable(const QComboBox* self); void QComboBox_SetEditable(QComboBox* self, bool editable); void QComboBox_SetLineEdit(QComboBox* self, QLineEdit* edit); @@ -93,20 +93,20 @@ void QComboBox_SetRootModelIndex(QComboBox* self, QModelIndex* index); int QComboBox_ModelColumn(const QComboBox* self); void QComboBox_SetModelColumn(QComboBox* self, int visibleColumn); int QComboBox_CurrentIndex(const QComboBox* self); -struct miqt_string* QComboBox_CurrentText(const QComboBox* self); +struct miqt_string QComboBox_CurrentText(const QComboBox* self); QVariant* QComboBox_CurrentData(const QComboBox* self); -struct miqt_string* QComboBox_ItemText(const QComboBox* self, int index); +struct miqt_string QComboBox_ItemText(const QComboBox* self, int index); QIcon* QComboBox_ItemIcon(const QComboBox* self, int index); QVariant* QComboBox_ItemData(const QComboBox* self, int index); -void QComboBox_AddItem(QComboBox* self, struct miqt_string* text); -void QComboBox_AddItem2(QComboBox* self, QIcon* icon, struct miqt_string* text); -void QComboBox_AddItems(QComboBox* self, struct miqt_array* /* of struct miqt_string* */ texts); -void QComboBox_InsertItem(QComboBox* self, int index, struct miqt_string* text); -void QComboBox_InsertItem2(QComboBox* self, int index, QIcon* icon, struct miqt_string* text); -void QComboBox_InsertItems(QComboBox* self, int index, struct miqt_array* /* of struct miqt_string* */ texts); +void QComboBox_AddItem(QComboBox* self, struct miqt_string text); +void QComboBox_AddItem2(QComboBox* self, QIcon* icon, struct miqt_string text); +void QComboBox_AddItems(QComboBox* self, struct miqt_array* /* of struct miqt_string */ texts); +void QComboBox_InsertItem(QComboBox* self, int index, struct miqt_string text); +void QComboBox_InsertItem2(QComboBox* self, int index, QIcon* icon, struct miqt_string text); +void QComboBox_InsertItems(QComboBox* self, int index, struct miqt_array* /* of struct miqt_string */ texts); void QComboBox_InsertSeparator(QComboBox* self, int index); void QComboBox_RemoveItem(QComboBox* self, int index); -void QComboBox_SetItemText(QComboBox* self, int index, struct miqt_string* text); +void QComboBox_SetItemText(QComboBox* self, int index, struct miqt_string text); void QComboBox_SetItemIcon(QComboBox* self, int index, QIcon* icon); void QComboBox_SetItemData(QComboBox* self, int index, QVariant* value); QAbstractItemView* QComboBox_View(const QComboBox* self); @@ -120,42 +120,42 @@ QVariant* QComboBox_InputMethodQuery(const QComboBox* self, int param1); QVariant* QComboBox_InputMethodQuery2(const QComboBox* self, int query, QVariant* argument); void QComboBox_Clear(QComboBox* self); void QComboBox_ClearEditText(QComboBox* self); -void QComboBox_SetEditText(QComboBox* self, struct miqt_string* text); +void QComboBox_SetEditText(QComboBox* self, struct miqt_string text); void QComboBox_SetCurrentIndex(QComboBox* self, int index); -void QComboBox_SetCurrentText(QComboBox* self, struct miqt_string* text); -void QComboBox_EditTextChanged(QComboBox* self, struct miqt_string* param1); +void QComboBox_SetCurrentText(QComboBox* self, struct miqt_string text); +void QComboBox_EditTextChanged(QComboBox* self, struct miqt_string param1); void QComboBox_connect_EditTextChanged(QComboBox* self, intptr_t slot); void QComboBox_Activated(QComboBox* self, int index); void QComboBox_connect_Activated(QComboBox* self, intptr_t slot); -void QComboBox_TextActivated(QComboBox* self, struct miqt_string* param1); +void QComboBox_TextActivated(QComboBox* self, struct miqt_string param1); void QComboBox_connect_TextActivated(QComboBox* self, intptr_t slot); void QComboBox_Highlighted(QComboBox* self, int index); void QComboBox_connect_Highlighted(QComboBox* self, intptr_t slot); -void QComboBox_TextHighlighted(QComboBox* self, struct miqt_string* param1); +void QComboBox_TextHighlighted(QComboBox* self, struct miqt_string param1); void QComboBox_connect_TextHighlighted(QComboBox* self, intptr_t slot); void QComboBox_CurrentIndexChanged(QComboBox* self, int index); void QComboBox_connect_CurrentIndexChanged(QComboBox* self, intptr_t slot); -void QComboBox_CurrentIndexChangedWithQString(QComboBox* self, struct miqt_string* param1); +void QComboBox_CurrentIndexChangedWithQString(QComboBox* self, struct miqt_string param1); void QComboBox_connect_CurrentIndexChangedWithQString(QComboBox* self, intptr_t slot); -void QComboBox_CurrentTextChanged(QComboBox* self, struct miqt_string* param1); +void QComboBox_CurrentTextChanged(QComboBox* self, struct miqt_string param1); void QComboBox_connect_CurrentTextChanged(QComboBox* self, intptr_t slot); -void QComboBox_ActivatedWithQString(QComboBox* self, struct miqt_string* param1); +void QComboBox_ActivatedWithQString(QComboBox* self, struct miqt_string param1); void QComboBox_connect_ActivatedWithQString(QComboBox* self, intptr_t slot); -void QComboBox_HighlightedWithQString(QComboBox* self, struct miqt_string* param1); +void QComboBox_HighlightedWithQString(QComboBox* self, struct miqt_string param1); void QComboBox_connect_HighlightedWithQString(QComboBox* self, intptr_t slot); -struct miqt_string* QComboBox_Tr2(const char* s, const char* c); -struct miqt_string* QComboBox_Tr3(const char* s, const char* c, int n); -struct miqt_string* QComboBox_TrUtf82(const char* s, const char* c); -struct miqt_string* QComboBox_TrUtf83(const char* s, const char* c, int n); -int QComboBox_FindText2(const QComboBox* self, struct miqt_string* text, int flags); +struct miqt_string QComboBox_Tr2(const char* s, const char* c); +struct miqt_string QComboBox_Tr3(const char* s, const char* c, int n); +struct miqt_string QComboBox_TrUtf82(const char* s, const char* c); +struct miqt_string QComboBox_TrUtf83(const char* s, const char* c, int n); +int QComboBox_FindText2(const QComboBox* self, struct miqt_string text, int flags); int QComboBox_FindData2(const QComboBox* self, QVariant* data, int role); int QComboBox_FindData3(const QComboBox* self, QVariant* data, int role, int flags); QVariant* QComboBox_CurrentData1(const QComboBox* self, int role); QVariant* QComboBox_ItemData2(const QComboBox* self, int index, int role); -void QComboBox_AddItem22(QComboBox* self, struct miqt_string* text, QVariant* userData); -void QComboBox_AddItem3(QComboBox* self, QIcon* icon, struct miqt_string* text, QVariant* userData); -void QComboBox_InsertItem3(QComboBox* self, int index, struct miqt_string* text, QVariant* userData); -void QComboBox_InsertItem4(QComboBox* self, int index, QIcon* icon, struct miqt_string* text, QVariant* userData); +void QComboBox_AddItem22(QComboBox* self, struct miqt_string text, QVariant* userData); +void QComboBox_AddItem3(QComboBox* self, QIcon* icon, struct miqt_string text, QVariant* userData); +void QComboBox_InsertItem3(QComboBox* self, int index, struct miqt_string text, QVariant* userData); +void QComboBox_InsertItem4(QComboBox* self, int index, QIcon* icon, struct miqt_string text, QVariant* userData); void QComboBox_SetItemData3(QComboBox* self, int index, QVariant* value, int role); void QComboBox_Delete(QComboBox* self); diff --git a/qt/gen_qcommandlineoption.cpp b/qt/gen_qcommandlineoption.cpp index cc6a522b..5f03d558 100644 --- a/qt/gen_qcommandlineoption.cpp +++ b/qt/gen_qcommandlineoption.cpp @@ -7,37 +7,37 @@ #include "gen_qcommandlineoption.h" #include "_cgo_export.h" -QCommandLineOption* QCommandLineOption_new(struct miqt_string* name) { - QString name_QString = QString::fromUtf8(&name->data, name->len); +QCommandLineOption* QCommandLineOption_new(struct miqt_string name) { + QString name_QString = QString::fromUtf8(name.data, name.len); return new QCommandLineOption(name_QString); } -QCommandLineOption* QCommandLineOption_new2(struct miqt_array* /* of struct miqt_string* */ names) { +QCommandLineOption* QCommandLineOption_new2(struct miqt_array* /* of struct miqt_string */ names) { QStringList names_QList; names_QList.reserve(names->len); - struct miqt_string** names_arr = static_cast(names->data); + struct miqt_string* names_arr = static_cast(names->data); for(size_t i = 0; i < names->len; ++i) { - QString names_arr_i_QString = QString::fromUtf8(&names_arr[i]->data, names_arr[i]->len); + QString names_arr_i_QString = QString::fromUtf8(names_arr[i].data, names_arr[i].len); names_QList.push_back(names_arr_i_QString); } return new QCommandLineOption(names_QList); } -QCommandLineOption* QCommandLineOption_new3(struct miqt_string* name, struct miqt_string* description) { - QString name_QString = QString::fromUtf8(&name->data, name->len); - QString description_QString = QString::fromUtf8(&description->data, description->len); +QCommandLineOption* QCommandLineOption_new3(struct miqt_string name, struct miqt_string description) { + QString name_QString = QString::fromUtf8(name.data, name.len); + QString description_QString = QString::fromUtf8(description.data, description.len); return new QCommandLineOption(name_QString, description_QString); } -QCommandLineOption* QCommandLineOption_new4(struct miqt_array* /* of struct miqt_string* */ names, struct miqt_string* description) { +QCommandLineOption* QCommandLineOption_new4(struct miqt_array* /* of struct miqt_string */ names, struct miqt_string description) { QStringList names_QList; names_QList.reserve(names->len); - struct miqt_string** names_arr = static_cast(names->data); + struct miqt_string* names_arr = static_cast(names->data); for(size_t i = 0; i < names->len; ++i) { - QString names_arr_i_QString = QString::fromUtf8(&names_arr[i]->data, names_arr[i]->len); + QString names_arr_i_QString = QString::fromUtf8(names_arr[i].data, names_arr[i].len); names_QList.push_back(names_arr_i_QString); } - QString description_QString = QString::fromUtf8(&description->data, description->len); + QString description_QString = QString::fromUtf8(description.data, description.len); return new QCommandLineOption(names_QList, description_QString); } @@ -45,45 +45,45 @@ QCommandLineOption* QCommandLineOption_new5(QCommandLineOption* other) { return new QCommandLineOption(*other); } -QCommandLineOption* QCommandLineOption_new6(struct miqt_string* name, struct miqt_string* description, struct miqt_string* valueName) { - QString name_QString = QString::fromUtf8(&name->data, name->len); - QString description_QString = QString::fromUtf8(&description->data, description->len); - QString valueName_QString = QString::fromUtf8(&valueName->data, valueName->len); +QCommandLineOption* QCommandLineOption_new6(struct miqt_string name, struct miqt_string description, struct miqt_string valueName) { + QString name_QString = QString::fromUtf8(name.data, name.len); + QString description_QString = QString::fromUtf8(description.data, description.len); + QString valueName_QString = QString::fromUtf8(valueName.data, valueName.len); return new QCommandLineOption(name_QString, description_QString, valueName_QString); } -QCommandLineOption* QCommandLineOption_new7(struct miqt_string* name, struct miqt_string* description, struct miqt_string* valueName, struct miqt_string* defaultValue) { - QString name_QString = QString::fromUtf8(&name->data, name->len); - QString description_QString = QString::fromUtf8(&description->data, description->len); - QString valueName_QString = QString::fromUtf8(&valueName->data, valueName->len); - QString defaultValue_QString = QString::fromUtf8(&defaultValue->data, defaultValue->len); +QCommandLineOption* QCommandLineOption_new7(struct miqt_string name, struct miqt_string description, struct miqt_string valueName, struct miqt_string defaultValue) { + QString name_QString = QString::fromUtf8(name.data, name.len); + QString description_QString = QString::fromUtf8(description.data, description.len); + QString valueName_QString = QString::fromUtf8(valueName.data, valueName.len); + QString defaultValue_QString = QString::fromUtf8(defaultValue.data, defaultValue.len); return new QCommandLineOption(name_QString, description_QString, valueName_QString, defaultValue_QString); } -QCommandLineOption* QCommandLineOption_new8(struct miqt_array* /* of struct miqt_string* */ names, struct miqt_string* description, struct miqt_string* valueName) { +QCommandLineOption* QCommandLineOption_new8(struct miqt_array* /* of struct miqt_string */ names, struct miqt_string description, struct miqt_string valueName) { QStringList names_QList; names_QList.reserve(names->len); - struct miqt_string** names_arr = static_cast(names->data); + struct miqt_string* names_arr = static_cast(names->data); for(size_t i = 0; i < names->len; ++i) { - QString names_arr_i_QString = QString::fromUtf8(&names_arr[i]->data, names_arr[i]->len); + QString names_arr_i_QString = QString::fromUtf8(names_arr[i].data, names_arr[i].len); names_QList.push_back(names_arr_i_QString); } - QString description_QString = QString::fromUtf8(&description->data, description->len); - QString valueName_QString = QString::fromUtf8(&valueName->data, valueName->len); + QString description_QString = QString::fromUtf8(description.data, description.len); + QString valueName_QString = QString::fromUtf8(valueName.data, valueName.len); return new QCommandLineOption(names_QList, description_QString, valueName_QString); } -QCommandLineOption* QCommandLineOption_new9(struct miqt_array* /* of struct miqt_string* */ names, struct miqt_string* description, struct miqt_string* valueName, struct miqt_string* defaultValue) { +QCommandLineOption* QCommandLineOption_new9(struct miqt_array* /* of struct miqt_string */ names, struct miqt_string description, struct miqt_string valueName, struct miqt_string defaultValue) { QStringList names_QList; names_QList.reserve(names->len); - struct miqt_string** names_arr = static_cast(names->data); + struct miqt_string* names_arr = static_cast(names->data); for(size_t i = 0; i < names->len; ++i) { - QString names_arr_i_QString = QString::fromUtf8(&names_arr[i]->data, names_arr[i]->len); + QString names_arr_i_QString = QString::fromUtf8(names_arr[i].data, names_arr[i].len); names_QList.push_back(names_arr_i_QString); } - QString description_QString = QString::fromUtf8(&description->data, description->len); - QString valueName_QString = QString::fromUtf8(&valueName->data, valueName->len); - QString defaultValue_QString = QString::fromUtf8(&defaultValue->data, defaultValue->len); + QString description_QString = QString::fromUtf8(description.data, description.len); + QString valueName_QString = QString::fromUtf8(valueName.data, valueName.len); + QString defaultValue_QString = QString::fromUtf8(defaultValue.data, defaultValue.len); return new QCommandLineOption(names_QList, description_QString, valueName_QString, defaultValue_QString); } @@ -98,12 +98,16 @@ void QCommandLineOption_Swap(QCommandLineOption* self, QCommandLineOption* other struct miqt_array* QCommandLineOption_Names(const QCommandLineOption* self) { QStringList _ret = self->names(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -111,41 +115,49 @@ struct miqt_array* QCommandLineOption_Names(const QCommandLineOption* self) { return _out; } -void QCommandLineOption_SetValueName(QCommandLineOption* self, struct miqt_string* name) { - QString name_QString = QString::fromUtf8(&name->data, name->len); +void QCommandLineOption_SetValueName(QCommandLineOption* self, struct miqt_string name) { + QString name_QString = QString::fromUtf8(name.data, name.len); self->setValueName(name_QString); } -struct miqt_string* QCommandLineOption_ValueName(const QCommandLineOption* self) { +struct miqt_string QCommandLineOption_ValueName(const QCommandLineOption* self) { QString _ret = self->valueName(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QCommandLineOption_SetDescription(QCommandLineOption* self, struct miqt_string* description) { - QString description_QString = QString::fromUtf8(&description->data, description->len); +void QCommandLineOption_SetDescription(QCommandLineOption* self, struct miqt_string description) { + QString description_QString = QString::fromUtf8(description.data, description.len); self->setDescription(description_QString); } -struct miqt_string* QCommandLineOption_Description(const QCommandLineOption* self) { +struct miqt_string QCommandLineOption_Description(const QCommandLineOption* self) { QString _ret = self->description(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QCommandLineOption_SetDefaultValue(QCommandLineOption* self, struct miqt_string* defaultValue) { - QString defaultValue_QString = QString::fromUtf8(&defaultValue->data, defaultValue->len); +void QCommandLineOption_SetDefaultValue(QCommandLineOption* self, struct miqt_string defaultValue) { + QString defaultValue_QString = QString::fromUtf8(defaultValue.data, defaultValue.len); self->setDefaultValue(defaultValue_QString); } -void QCommandLineOption_SetDefaultValues(QCommandLineOption* self, struct miqt_array* /* of struct miqt_string* */ defaultValues) { +void QCommandLineOption_SetDefaultValues(QCommandLineOption* self, struct miqt_array* /* of struct miqt_string */ defaultValues) { QStringList defaultValues_QList; defaultValues_QList.reserve(defaultValues->len); - struct miqt_string** defaultValues_arr = static_cast(defaultValues->data); + struct miqt_string* defaultValues_arr = static_cast(defaultValues->data); for(size_t i = 0; i < defaultValues->len; ++i) { - QString defaultValues_arr_i_QString = QString::fromUtf8(&defaultValues_arr[i]->data, defaultValues_arr[i]->len); + QString defaultValues_arr_i_QString = QString::fromUtf8(defaultValues_arr[i].data, defaultValues_arr[i].len); defaultValues_QList.push_back(defaultValues_arr_i_QString); } self->setDefaultValues(defaultValues_QList); @@ -154,12 +166,16 @@ void QCommandLineOption_SetDefaultValues(QCommandLineOption* self, struct miqt_a struct miqt_array* QCommandLineOption_DefaultValues(const QCommandLineOption* self) { QStringList _ret = self->defaultValues(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); diff --git a/qt/gen_qcommandlineoption.go b/qt/gen_qcommandlineoption.go index f7d5c3fc..a4311e1f 100644 --- a/qt/gen_qcommandlineoption.go +++ b/qt/gen_qcommandlineoption.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -52,21 +51,25 @@ func UnsafeNewQCommandLineOption(h unsafe.Pointer) *QCommandLineOption { // NewQCommandLineOption constructs a new QCommandLineOption object. func NewQCommandLineOption(name string) *QCommandLineOption { - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - ret := C.QCommandLineOption_new((*C.struct_miqt_string)(name_ms)) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + ret := C.QCommandLineOption_new(name_ms) return newQCommandLineOption(ret) } // NewQCommandLineOption2 constructs a new QCommandLineOption object. func NewQCommandLineOption2(names []string) *QCommandLineOption { // For the C ABI, malloc a C array of raw pointers - names_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(names)))) + names_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(names)))) defer C.free(unsafe.Pointer(names_CArray)) for i := range names { - names_i_ms := libmiqt.Strdupg(names[i]) - defer C.free(names_i_ms) - names_CArray[i] = (*C.struct_miqt_string)(names_i_ms) + names_i_ms := C.struct_miqt_string{} + names_i_ms.data = C.CString(names[i]) + names_i_ms.len = C.size_t(len(names[i])) + defer C.free(unsafe.Pointer(names_i_ms.data)) + names_CArray[i] = names_i_ms } names_ma := &C.struct_miqt_array{len: C.size_t(len(names)), data: unsafe.Pointer(names_CArray)} defer runtime.KeepAlive(unsafe.Pointer(names_ma)) @@ -76,29 +79,37 @@ func NewQCommandLineOption2(names []string) *QCommandLineOption { // NewQCommandLineOption3 constructs a new QCommandLineOption object. func NewQCommandLineOption3(name string, description string) *QCommandLineOption { - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - description_ms := libmiqt.Strdupg(description) - defer C.free(description_ms) - ret := C.QCommandLineOption_new3((*C.struct_miqt_string)(name_ms), (*C.struct_miqt_string)(description_ms)) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + description_ms := C.struct_miqt_string{} + description_ms.data = C.CString(description) + description_ms.len = C.size_t(len(description)) + defer C.free(unsafe.Pointer(description_ms.data)) + ret := C.QCommandLineOption_new3(name_ms, description_ms) return newQCommandLineOption(ret) } // NewQCommandLineOption4 constructs a new QCommandLineOption object. func NewQCommandLineOption4(names []string, description string) *QCommandLineOption { // For the C ABI, malloc a C array of raw pointers - names_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(names)))) + names_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(names)))) defer C.free(unsafe.Pointer(names_CArray)) for i := range names { - names_i_ms := libmiqt.Strdupg(names[i]) - defer C.free(names_i_ms) - names_CArray[i] = (*C.struct_miqt_string)(names_i_ms) + names_i_ms := C.struct_miqt_string{} + names_i_ms.data = C.CString(names[i]) + names_i_ms.len = C.size_t(len(names[i])) + defer C.free(unsafe.Pointer(names_i_ms.data)) + names_CArray[i] = names_i_ms } names_ma := &C.struct_miqt_array{len: C.size_t(len(names)), data: unsafe.Pointer(names_CArray)} defer runtime.KeepAlive(unsafe.Pointer(names_ma)) - description_ms := libmiqt.Strdupg(description) - defer C.free(description_ms) - ret := C.QCommandLineOption_new4(names_ma, (*C.struct_miqt_string)(description_ms)) + description_ms := C.struct_miqt_string{} + description_ms.data = C.CString(description) + description_ms.len = C.size_t(len(description)) + defer C.free(unsafe.Pointer(description_ms.data)) + ret := C.QCommandLineOption_new4(names_ma, description_ms) return newQCommandLineOption(ret) } @@ -110,69 +121,97 @@ func NewQCommandLineOption5(other *QCommandLineOption) *QCommandLineOption { // NewQCommandLineOption6 constructs a new QCommandLineOption object. func NewQCommandLineOption6(name string, description string, valueName string) *QCommandLineOption { - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - description_ms := libmiqt.Strdupg(description) - defer C.free(description_ms) - valueName_ms := libmiqt.Strdupg(valueName) - defer C.free(valueName_ms) - ret := C.QCommandLineOption_new6((*C.struct_miqt_string)(name_ms), (*C.struct_miqt_string)(description_ms), (*C.struct_miqt_string)(valueName_ms)) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + description_ms := C.struct_miqt_string{} + description_ms.data = C.CString(description) + description_ms.len = C.size_t(len(description)) + defer C.free(unsafe.Pointer(description_ms.data)) + valueName_ms := C.struct_miqt_string{} + valueName_ms.data = C.CString(valueName) + valueName_ms.len = C.size_t(len(valueName)) + defer C.free(unsafe.Pointer(valueName_ms.data)) + ret := C.QCommandLineOption_new6(name_ms, description_ms, valueName_ms) return newQCommandLineOption(ret) } // NewQCommandLineOption7 constructs a new QCommandLineOption object. func NewQCommandLineOption7(name string, description string, valueName string, defaultValue string) *QCommandLineOption { - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - description_ms := libmiqt.Strdupg(description) - defer C.free(description_ms) - valueName_ms := libmiqt.Strdupg(valueName) - defer C.free(valueName_ms) - defaultValue_ms := libmiqt.Strdupg(defaultValue) - defer C.free(defaultValue_ms) - ret := C.QCommandLineOption_new7((*C.struct_miqt_string)(name_ms), (*C.struct_miqt_string)(description_ms), (*C.struct_miqt_string)(valueName_ms), (*C.struct_miqt_string)(defaultValue_ms)) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + description_ms := C.struct_miqt_string{} + description_ms.data = C.CString(description) + description_ms.len = C.size_t(len(description)) + defer C.free(unsafe.Pointer(description_ms.data)) + valueName_ms := C.struct_miqt_string{} + valueName_ms.data = C.CString(valueName) + valueName_ms.len = C.size_t(len(valueName)) + defer C.free(unsafe.Pointer(valueName_ms.data)) + defaultValue_ms := C.struct_miqt_string{} + defaultValue_ms.data = C.CString(defaultValue) + defaultValue_ms.len = C.size_t(len(defaultValue)) + defer C.free(unsafe.Pointer(defaultValue_ms.data)) + ret := C.QCommandLineOption_new7(name_ms, description_ms, valueName_ms, defaultValue_ms) return newQCommandLineOption(ret) } // NewQCommandLineOption8 constructs a new QCommandLineOption object. func NewQCommandLineOption8(names []string, description string, valueName string) *QCommandLineOption { // For the C ABI, malloc a C array of raw pointers - names_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(names)))) + names_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(names)))) defer C.free(unsafe.Pointer(names_CArray)) for i := range names { - names_i_ms := libmiqt.Strdupg(names[i]) - defer C.free(names_i_ms) - names_CArray[i] = (*C.struct_miqt_string)(names_i_ms) + names_i_ms := C.struct_miqt_string{} + names_i_ms.data = C.CString(names[i]) + names_i_ms.len = C.size_t(len(names[i])) + defer C.free(unsafe.Pointer(names_i_ms.data)) + names_CArray[i] = names_i_ms } names_ma := &C.struct_miqt_array{len: C.size_t(len(names)), data: unsafe.Pointer(names_CArray)} defer runtime.KeepAlive(unsafe.Pointer(names_ma)) - description_ms := libmiqt.Strdupg(description) - defer C.free(description_ms) - valueName_ms := libmiqt.Strdupg(valueName) - defer C.free(valueName_ms) - ret := C.QCommandLineOption_new8(names_ma, (*C.struct_miqt_string)(description_ms), (*C.struct_miqt_string)(valueName_ms)) + description_ms := C.struct_miqt_string{} + description_ms.data = C.CString(description) + description_ms.len = C.size_t(len(description)) + defer C.free(unsafe.Pointer(description_ms.data)) + valueName_ms := C.struct_miqt_string{} + valueName_ms.data = C.CString(valueName) + valueName_ms.len = C.size_t(len(valueName)) + defer C.free(unsafe.Pointer(valueName_ms.data)) + ret := C.QCommandLineOption_new8(names_ma, description_ms, valueName_ms) return newQCommandLineOption(ret) } // NewQCommandLineOption9 constructs a new QCommandLineOption object. func NewQCommandLineOption9(names []string, description string, valueName string, defaultValue string) *QCommandLineOption { // For the C ABI, malloc a C array of raw pointers - names_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(names)))) + names_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(names)))) defer C.free(unsafe.Pointer(names_CArray)) for i := range names { - names_i_ms := libmiqt.Strdupg(names[i]) - defer C.free(names_i_ms) - names_CArray[i] = (*C.struct_miqt_string)(names_i_ms) + names_i_ms := C.struct_miqt_string{} + names_i_ms.data = C.CString(names[i]) + names_i_ms.len = C.size_t(len(names[i])) + defer C.free(unsafe.Pointer(names_i_ms.data)) + names_CArray[i] = names_i_ms } names_ma := &C.struct_miqt_array{len: C.size_t(len(names)), data: unsafe.Pointer(names_CArray)} defer runtime.KeepAlive(unsafe.Pointer(names_ma)) - description_ms := libmiqt.Strdupg(description) - defer C.free(description_ms) - valueName_ms := libmiqt.Strdupg(valueName) - defer C.free(valueName_ms) - defaultValue_ms := libmiqt.Strdupg(defaultValue) - defer C.free(defaultValue_ms) - ret := C.QCommandLineOption_new9(names_ma, (*C.struct_miqt_string)(description_ms), (*C.struct_miqt_string)(valueName_ms), (*C.struct_miqt_string)(defaultValue_ms)) + description_ms := C.struct_miqt_string{} + description_ms.data = C.CString(description) + description_ms.len = C.size_t(len(description)) + defer C.free(unsafe.Pointer(description_ms.data)) + valueName_ms := C.struct_miqt_string{} + valueName_ms.data = C.CString(valueName) + valueName_ms.len = C.size_t(len(valueName)) + defer C.free(unsafe.Pointer(valueName_ms.data)) + defaultValue_ms := C.struct_miqt_string{} + defaultValue_ms.data = C.CString(defaultValue) + defaultValue_ms.len = C.size_t(len(defaultValue)) + defer C.free(unsafe.Pointer(defaultValue_ms.data)) + ret := C.QCommandLineOption_new9(names_ma, description_ms, valueName_ms, defaultValue_ms) return newQCommandLineOption(ret) } @@ -187,11 +226,11 @@ func (this *QCommandLineOption) Swap(other *QCommandLineOption) { func (this *QCommandLineOption) Names() []string { var _ma *C.struct_miqt_array = C.QCommandLineOption_Names(this.h) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -199,45 +238,53 @@ func (this *QCommandLineOption) Names() []string { } func (this *QCommandLineOption) SetValueName(name string) { - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - C.QCommandLineOption_SetValueName(this.h, (*C.struct_miqt_string)(name_ms)) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + C.QCommandLineOption_SetValueName(this.h, name_ms) } func (this *QCommandLineOption) ValueName() string { - var _ms *C.struct_miqt_string = C.QCommandLineOption_ValueName(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCommandLineOption_ValueName(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QCommandLineOption) SetDescription(description string) { - description_ms := libmiqt.Strdupg(description) - defer C.free(description_ms) - C.QCommandLineOption_SetDescription(this.h, (*C.struct_miqt_string)(description_ms)) + description_ms := C.struct_miqt_string{} + description_ms.data = C.CString(description) + description_ms.len = C.size_t(len(description)) + defer C.free(unsafe.Pointer(description_ms.data)) + C.QCommandLineOption_SetDescription(this.h, description_ms) } func (this *QCommandLineOption) Description() string { - var _ms *C.struct_miqt_string = C.QCommandLineOption_Description(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCommandLineOption_Description(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QCommandLineOption) SetDefaultValue(defaultValue string) { - defaultValue_ms := libmiqt.Strdupg(defaultValue) - defer C.free(defaultValue_ms) - C.QCommandLineOption_SetDefaultValue(this.h, (*C.struct_miqt_string)(defaultValue_ms)) + defaultValue_ms := C.struct_miqt_string{} + defaultValue_ms.data = C.CString(defaultValue) + defaultValue_ms.len = C.size_t(len(defaultValue)) + defer C.free(unsafe.Pointer(defaultValue_ms.data)) + C.QCommandLineOption_SetDefaultValue(this.h, defaultValue_ms) } func (this *QCommandLineOption) SetDefaultValues(defaultValues []string) { // For the C ABI, malloc a C array of raw pointers - defaultValues_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(defaultValues)))) + defaultValues_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(defaultValues)))) defer C.free(unsafe.Pointer(defaultValues_CArray)) for i := range defaultValues { - defaultValues_i_ms := libmiqt.Strdupg(defaultValues[i]) - defer C.free(defaultValues_i_ms) - defaultValues_CArray[i] = (*C.struct_miqt_string)(defaultValues_i_ms) + defaultValues_i_ms := C.struct_miqt_string{} + defaultValues_i_ms.data = C.CString(defaultValues[i]) + defaultValues_i_ms.len = C.size_t(len(defaultValues[i])) + defer C.free(unsafe.Pointer(defaultValues_i_ms.data)) + defaultValues_CArray[i] = defaultValues_i_ms } defaultValues_ma := &C.struct_miqt_array{len: C.size_t(len(defaultValues)), data: unsafe.Pointer(defaultValues_CArray)} defer runtime.KeepAlive(unsafe.Pointer(defaultValues_ma)) @@ -247,11 +294,11 @@ func (this *QCommandLineOption) SetDefaultValues(defaultValues []string) { func (this *QCommandLineOption) DefaultValues() []string { var _ma *C.struct_miqt_array = C.QCommandLineOption_DefaultValues(this.h) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) diff --git a/qt/gen_qcommandlineoption.h b/qt/gen_qcommandlineoption.h index ec461da7..30729765 100644 --- a/qt/gen_qcommandlineoption.h +++ b/qt/gen_qcommandlineoption.h @@ -19,24 +19,24 @@ class QCommandLineOption; typedef struct QCommandLineOption QCommandLineOption; #endif -QCommandLineOption* QCommandLineOption_new(struct miqt_string* name); -QCommandLineOption* QCommandLineOption_new2(struct miqt_array* /* of struct miqt_string* */ names); -QCommandLineOption* QCommandLineOption_new3(struct miqt_string* name, struct miqt_string* description); -QCommandLineOption* QCommandLineOption_new4(struct miqt_array* /* of struct miqt_string* */ names, struct miqt_string* description); +QCommandLineOption* QCommandLineOption_new(struct miqt_string name); +QCommandLineOption* QCommandLineOption_new2(struct miqt_array* /* of struct miqt_string */ names); +QCommandLineOption* QCommandLineOption_new3(struct miqt_string name, struct miqt_string description); +QCommandLineOption* QCommandLineOption_new4(struct miqt_array* /* of struct miqt_string */ names, struct miqt_string description); QCommandLineOption* QCommandLineOption_new5(QCommandLineOption* other); -QCommandLineOption* QCommandLineOption_new6(struct miqt_string* name, struct miqt_string* description, struct miqt_string* valueName); -QCommandLineOption* QCommandLineOption_new7(struct miqt_string* name, struct miqt_string* description, struct miqt_string* valueName, struct miqt_string* defaultValue); -QCommandLineOption* QCommandLineOption_new8(struct miqt_array* /* of struct miqt_string* */ names, struct miqt_string* description, struct miqt_string* valueName); -QCommandLineOption* QCommandLineOption_new9(struct miqt_array* /* of struct miqt_string* */ names, struct miqt_string* description, struct miqt_string* valueName, struct miqt_string* defaultValue); +QCommandLineOption* QCommandLineOption_new6(struct miqt_string name, struct miqt_string description, struct miqt_string valueName); +QCommandLineOption* QCommandLineOption_new7(struct miqt_string name, struct miqt_string description, struct miqt_string valueName, struct miqt_string defaultValue); +QCommandLineOption* QCommandLineOption_new8(struct miqt_array* /* of struct miqt_string */ names, struct miqt_string description, struct miqt_string valueName); +QCommandLineOption* QCommandLineOption_new9(struct miqt_array* /* of struct miqt_string */ names, struct miqt_string description, struct miqt_string valueName, struct miqt_string defaultValue); void QCommandLineOption_OperatorAssign(QCommandLineOption* self, QCommandLineOption* other); void QCommandLineOption_Swap(QCommandLineOption* self, QCommandLineOption* other); struct miqt_array* QCommandLineOption_Names(const QCommandLineOption* self); -void QCommandLineOption_SetValueName(QCommandLineOption* self, struct miqt_string* name); -struct miqt_string* QCommandLineOption_ValueName(const QCommandLineOption* self); -void QCommandLineOption_SetDescription(QCommandLineOption* self, struct miqt_string* description); -struct miqt_string* QCommandLineOption_Description(const QCommandLineOption* self); -void QCommandLineOption_SetDefaultValue(QCommandLineOption* self, struct miqt_string* defaultValue); -void QCommandLineOption_SetDefaultValues(QCommandLineOption* self, struct miqt_array* /* of struct miqt_string* */ defaultValues); +void QCommandLineOption_SetValueName(QCommandLineOption* self, struct miqt_string name); +struct miqt_string QCommandLineOption_ValueName(const QCommandLineOption* self); +void QCommandLineOption_SetDescription(QCommandLineOption* self, struct miqt_string description); +struct miqt_string QCommandLineOption_Description(const QCommandLineOption* self); +void QCommandLineOption_SetDefaultValue(QCommandLineOption* self, struct miqt_string defaultValue); +void QCommandLineOption_SetDefaultValues(QCommandLineOption* self, struct miqt_array* /* of struct miqt_string */ defaultValues); struct miqt_array* QCommandLineOption_DefaultValues(const QCommandLineOption* self); int QCommandLineOption_Flags(const QCommandLineOption* self); void QCommandLineOption_SetFlags(QCommandLineOption* self, int aflags); diff --git a/qt/gen_qcommandlineparser.cpp b/qt/gen_qcommandlineparser.cpp index 3c2b7eae..294fbdd8 100644 --- a/qt/gen_qcommandlineparser.cpp +++ b/qt/gen_qcommandlineparser.cpp @@ -13,18 +13,26 @@ QCommandLineParser* QCommandLineParser_new() { return new QCommandLineParser(); } -struct miqt_string* QCommandLineParser_Tr(const char* sourceText) { +struct miqt_string QCommandLineParser_Tr(const char* sourceText) { QString _ret = QCommandLineParser::tr(sourceText); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QCommandLineParser_TrUtf8(const char* sourceText) { +struct miqt_string QCommandLineParser_TrUtf8(const char* sourceText) { QString _ret = QCommandLineParser::trUtf8(sourceText); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QCommandLineParser_SetSingleDashWordOptionMode(QCommandLineParser* self, int parsingMode) { @@ -57,21 +65,25 @@ QCommandLineOption* QCommandLineParser_AddHelpOption(QCommandLineParser* self) { return new QCommandLineOption(self->addHelpOption()); } -void QCommandLineParser_SetApplicationDescription(QCommandLineParser* self, struct miqt_string* description) { - QString description_QString = QString::fromUtf8(&description->data, description->len); +void QCommandLineParser_SetApplicationDescription(QCommandLineParser* self, struct miqt_string description) { + QString description_QString = QString::fromUtf8(description.data, description.len); self->setApplicationDescription(description_QString); } -struct miqt_string* QCommandLineParser_ApplicationDescription(const QCommandLineParser* self) { +struct miqt_string QCommandLineParser_ApplicationDescription(const QCommandLineParser* self) { QString _ret = self->applicationDescription(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QCommandLineParser_AddPositionalArgument(QCommandLineParser* self, struct miqt_string* name, struct miqt_string* description) { - QString name_QString = QString::fromUtf8(&name->data, name->len); - QString description_QString = QString::fromUtf8(&description->data, description->len); +void QCommandLineParser_AddPositionalArgument(QCommandLineParser* self, struct miqt_string name, struct miqt_string description) { + QString name_QString = QString::fromUtf8(name.data, name.len); + QString description_QString = QString::fromUtf8(description.data, description.len); self->addPositionalArgument(name_QString, description_QString); } @@ -79,12 +91,12 @@ void QCommandLineParser_ClearPositionalArguments(QCommandLineParser* self) { self->clearPositionalArguments(); } -void QCommandLineParser_Process(QCommandLineParser* self, struct miqt_array* /* of struct miqt_string* */ arguments) { +void QCommandLineParser_Process(QCommandLineParser* self, struct miqt_array* /* of struct miqt_string */ arguments) { QStringList arguments_QList; arguments_QList.reserve(arguments->len); - struct miqt_string** arguments_arr = static_cast(arguments->data); + struct miqt_string* arguments_arr = static_cast(arguments->data); for(size_t i = 0; i < arguments->len; ++i) { - QString arguments_arr_i_QString = QString::fromUtf8(&arguments_arr[i]->data, arguments_arr[i]->len); + QString arguments_arr_i_QString = QString::fromUtf8(arguments_arr[i].data, arguments_arr[i].len); arguments_QList.push_back(arguments_arr_i_QString); } self->process(arguments_QList); @@ -94,47 +106,59 @@ void QCommandLineParser_ProcessWithApp(QCommandLineParser* self, QCoreApplicatio self->process(*app); } -bool QCommandLineParser_Parse(QCommandLineParser* self, struct miqt_array* /* of struct miqt_string* */ arguments) { +bool QCommandLineParser_Parse(QCommandLineParser* self, struct miqt_array* /* of struct miqt_string */ arguments) { QStringList arguments_QList; arguments_QList.reserve(arguments->len); - struct miqt_string** arguments_arr = static_cast(arguments->data); + struct miqt_string* arguments_arr = static_cast(arguments->data); for(size_t i = 0; i < arguments->len; ++i) { - QString arguments_arr_i_QString = QString::fromUtf8(&arguments_arr[i]->data, arguments_arr[i]->len); + QString arguments_arr_i_QString = QString::fromUtf8(arguments_arr[i].data, arguments_arr[i].len); arguments_QList.push_back(arguments_arr_i_QString); } return self->parse(arguments_QList); } -struct miqt_string* QCommandLineParser_ErrorText(const QCommandLineParser* self) { +struct miqt_string QCommandLineParser_ErrorText(const QCommandLineParser* self) { QString _ret = self->errorText(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -bool QCommandLineParser_IsSet(const QCommandLineParser* self, struct miqt_string* name) { - QString name_QString = QString::fromUtf8(&name->data, name->len); +bool QCommandLineParser_IsSet(const QCommandLineParser* self, struct miqt_string name) { + QString name_QString = QString::fromUtf8(name.data, name.len); return self->isSet(name_QString); } -struct miqt_string* QCommandLineParser_Value(const QCommandLineParser* self, struct miqt_string* name) { - QString name_QString = QString::fromUtf8(&name->data, name->len); +struct miqt_string QCommandLineParser_Value(const QCommandLineParser* self, struct miqt_string name) { + QString name_QString = QString::fromUtf8(name.data, name.len); QString _ret = self->value(name_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_array* QCommandLineParser_Values(const QCommandLineParser* self, struct miqt_string* name) { - QString name_QString = QString::fromUtf8(&name->data, name->len); +struct miqt_array* QCommandLineParser_Values(const QCommandLineParser* self, struct miqt_string name) { + QString name_QString = QString::fromUtf8(name.data, name.len); QStringList _ret = self->values(name_QString); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -146,22 +170,30 @@ bool QCommandLineParser_IsSetWithOption(const QCommandLineParser* self, QCommand return self->isSet(*option); } -struct miqt_string* QCommandLineParser_ValueWithOption(const QCommandLineParser* self, QCommandLineOption* option) { +struct miqt_string QCommandLineParser_ValueWithOption(const QCommandLineParser* self, QCommandLineOption* option) { QString _ret = self->value(*option); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } struct miqt_array* QCommandLineParser_ValuesWithOption(const QCommandLineParser* self, QCommandLineOption* option) { QStringList _ret = self->values(*option); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -172,12 +204,16 @@ struct miqt_array* QCommandLineParser_ValuesWithOption(const QCommandLineParser* struct miqt_array* QCommandLineParser_PositionalArguments(const QCommandLineParser* self) { QStringList _ret = self->positionalArguments(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -188,12 +224,16 @@ struct miqt_array* QCommandLineParser_PositionalArguments(const QCommandLinePars struct miqt_array* QCommandLineParser_OptionNames(const QCommandLineParser* self) { QStringList _ret = self->optionNames(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -204,12 +244,16 @@ struct miqt_array* QCommandLineParser_OptionNames(const QCommandLineParser* self struct miqt_array* QCommandLineParser_UnknownOptionNames(const QCommandLineParser* self) { QStringList _ret = self->unknownOptionNames(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -217,45 +261,65 @@ struct miqt_array* QCommandLineParser_UnknownOptionNames(const QCommandLineParse return _out; } -struct miqt_string* QCommandLineParser_HelpText(const QCommandLineParser* self) { +struct miqt_string QCommandLineParser_HelpText(const QCommandLineParser* self) { QString _ret = self->helpText(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QCommandLineParser_Tr2(const char* sourceText, const char* disambiguation) { +struct miqt_string QCommandLineParser_Tr2(const char* sourceText, const char* disambiguation) { QString _ret = QCommandLineParser::tr(sourceText, disambiguation); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QCommandLineParser_Tr3(const char* sourceText, const char* disambiguation, int n) { +struct miqt_string QCommandLineParser_Tr3(const char* sourceText, const char* disambiguation, int n) { QString _ret = QCommandLineParser::tr(sourceText, disambiguation, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QCommandLineParser_TrUtf82(const char* sourceText, const char* disambiguation) { +struct miqt_string QCommandLineParser_TrUtf82(const char* sourceText, const char* disambiguation) { QString _ret = QCommandLineParser::trUtf8(sourceText, disambiguation); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QCommandLineParser_TrUtf83(const char* sourceText, const char* disambiguation, int n) { +struct miqt_string QCommandLineParser_TrUtf83(const char* sourceText, const char* disambiguation, int n) { QString _ret = QCommandLineParser::trUtf8(sourceText, disambiguation, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QCommandLineParser_AddPositionalArgument3(QCommandLineParser* self, struct miqt_string* name, struct miqt_string* description, struct miqt_string* syntax) { - QString name_QString = QString::fromUtf8(&name->data, name->len); - QString description_QString = QString::fromUtf8(&description->data, description->len); - QString syntax_QString = QString::fromUtf8(&syntax->data, syntax->len); +void QCommandLineParser_AddPositionalArgument3(QCommandLineParser* self, struct miqt_string name, struct miqt_string description, struct miqt_string syntax) { + QString name_QString = QString::fromUtf8(name.data, name.len); + QString description_QString = QString::fromUtf8(description.data, description.len); + QString syntax_QString = QString::fromUtf8(syntax.data, syntax.len); self->addPositionalArgument(name_QString, description_QString, syntax_QString); } diff --git a/qt/gen_qcommandlineparser.go b/qt/gen_qcommandlineparser.go index 841e6ffa..70f7d026 100644 --- a/qt/gen_qcommandlineparser.go +++ b/qt/gen_qcommandlineparser.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -66,18 +65,18 @@ func NewQCommandLineParser() *QCommandLineParser { func QCommandLineParser_Tr(sourceText string) string { sourceText_Cstring := C.CString(sourceText) defer C.free(unsafe.Pointer(sourceText_Cstring)) - var _ms *C.struct_miqt_string = C.QCommandLineParser_Tr(sourceText_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCommandLineParser_Tr(sourceText_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QCommandLineParser_TrUtf8(sourceText string) string { sourceText_Cstring := C.CString(sourceText) defer C.free(unsafe.Pointer(sourceText_Cstring)) - var _ms *C.struct_miqt_string = C.QCommandLineParser_TrUtf8(sourceText_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCommandLineParser_TrUtf8(sourceText_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -120,24 +119,30 @@ func (this *QCommandLineParser) AddHelpOption() *QCommandLineOption { } func (this *QCommandLineParser) SetApplicationDescription(description string) { - description_ms := libmiqt.Strdupg(description) - defer C.free(description_ms) - C.QCommandLineParser_SetApplicationDescription(this.h, (*C.struct_miqt_string)(description_ms)) + description_ms := C.struct_miqt_string{} + description_ms.data = C.CString(description) + description_ms.len = C.size_t(len(description)) + defer C.free(unsafe.Pointer(description_ms.data)) + C.QCommandLineParser_SetApplicationDescription(this.h, description_ms) } func (this *QCommandLineParser) ApplicationDescription() string { - var _ms *C.struct_miqt_string = C.QCommandLineParser_ApplicationDescription(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCommandLineParser_ApplicationDescription(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QCommandLineParser) AddPositionalArgument(name string, description string) { - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - description_ms := libmiqt.Strdupg(description) - defer C.free(description_ms) - C.QCommandLineParser_AddPositionalArgument(this.h, (*C.struct_miqt_string)(name_ms), (*C.struct_miqt_string)(description_ms)) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + description_ms := C.struct_miqt_string{} + description_ms.data = C.CString(description) + description_ms.len = C.size_t(len(description)) + defer C.free(unsafe.Pointer(description_ms.data)) + C.QCommandLineParser_AddPositionalArgument(this.h, name_ms, description_ms) } func (this *QCommandLineParser) ClearPositionalArguments() { @@ -146,12 +151,14 @@ func (this *QCommandLineParser) ClearPositionalArguments() { func (this *QCommandLineParser) Process(arguments []string) { // For the C ABI, malloc a C array of raw pointers - arguments_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(arguments)))) + arguments_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(arguments)))) defer C.free(unsafe.Pointer(arguments_CArray)) for i := range arguments { - arguments_i_ms := libmiqt.Strdupg(arguments[i]) - defer C.free(arguments_i_ms) - arguments_CArray[i] = (*C.struct_miqt_string)(arguments_i_ms) + arguments_i_ms := C.struct_miqt_string{} + arguments_i_ms.data = C.CString(arguments[i]) + arguments_i_ms.len = C.size_t(len(arguments[i])) + defer C.free(unsafe.Pointer(arguments_i_ms.data)) + arguments_CArray[i] = arguments_i_ms } arguments_ma := &C.struct_miqt_array{len: C.size_t(len(arguments)), data: unsafe.Pointer(arguments_CArray)} defer runtime.KeepAlive(unsafe.Pointer(arguments_ma)) @@ -164,12 +171,14 @@ func (this *QCommandLineParser) ProcessWithApp(app *QCoreApplication) { func (this *QCommandLineParser) Parse(arguments []string) bool { // For the C ABI, malloc a C array of raw pointers - arguments_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(arguments)))) + arguments_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(arguments)))) defer C.free(unsafe.Pointer(arguments_CArray)) for i := range arguments { - arguments_i_ms := libmiqt.Strdupg(arguments[i]) - defer C.free(arguments_i_ms) - arguments_CArray[i] = (*C.struct_miqt_string)(arguments_i_ms) + arguments_i_ms := C.struct_miqt_string{} + arguments_i_ms.data = C.CString(arguments[i]) + arguments_i_ms.len = C.size_t(len(arguments[i])) + defer C.free(unsafe.Pointer(arguments_i_ms.data)) + arguments_CArray[i] = arguments_i_ms } arguments_ma := &C.struct_miqt_array{len: C.size_t(len(arguments)), data: unsafe.Pointer(arguments_CArray)} defer runtime.KeepAlive(unsafe.Pointer(arguments_ma)) @@ -177,37 +186,43 @@ func (this *QCommandLineParser) Parse(arguments []string) bool { } func (this *QCommandLineParser) ErrorText() string { - var _ms *C.struct_miqt_string = C.QCommandLineParser_ErrorText(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCommandLineParser_ErrorText(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QCommandLineParser) IsSet(name string) bool { - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - return (bool)(C.QCommandLineParser_IsSet(this.h, (*C.struct_miqt_string)(name_ms))) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + return (bool)(C.QCommandLineParser_IsSet(this.h, name_ms)) } func (this *QCommandLineParser) Value(name string) string { - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - var _ms *C.struct_miqt_string = C.QCommandLineParser_Value(this.h, (*C.struct_miqt_string)(name_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + var _ms C.struct_miqt_string = C.QCommandLineParser_Value(this.h, name_ms) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QCommandLineParser) Values(name string) []string { - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - var _ma *C.struct_miqt_array = C.QCommandLineParser_Values(this.h, (*C.struct_miqt_string)(name_ms)) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + var _ma *C.struct_miqt_array = C.QCommandLineParser_Values(this.h, name_ms) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -219,20 +234,20 @@ func (this *QCommandLineParser) IsSetWithOption(option *QCommandLineOption) bool } func (this *QCommandLineParser) ValueWithOption(option *QCommandLineOption) string { - var _ms *C.struct_miqt_string = C.QCommandLineParser_ValueWithOption(this.h, option.cPointer()) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCommandLineParser_ValueWithOption(this.h, option.cPointer()) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QCommandLineParser) ValuesWithOption(option *QCommandLineOption) []string { var _ma *C.struct_miqt_array = C.QCommandLineParser_ValuesWithOption(this.h, option.cPointer()) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -242,11 +257,11 @@ func (this *QCommandLineParser) ValuesWithOption(option *QCommandLineOption) []s func (this *QCommandLineParser) PositionalArguments() []string { var _ma *C.struct_miqt_array = C.QCommandLineParser_PositionalArguments(this.h) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -256,11 +271,11 @@ func (this *QCommandLineParser) PositionalArguments() []string { func (this *QCommandLineParser) OptionNames() []string { var _ma *C.struct_miqt_array = C.QCommandLineParser_OptionNames(this.h) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -270,11 +285,11 @@ func (this *QCommandLineParser) OptionNames() []string { func (this *QCommandLineParser) UnknownOptionNames() []string { var _ma *C.struct_miqt_array = C.QCommandLineParser_UnknownOptionNames(this.h) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -282,9 +297,9 @@ func (this *QCommandLineParser) UnknownOptionNames() []string { } func (this *QCommandLineParser) HelpText() string { - var _ms *C.struct_miqt_string = C.QCommandLineParser_HelpText(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCommandLineParser_HelpText(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -293,9 +308,9 @@ func QCommandLineParser_Tr2(sourceText string, disambiguation string) string { defer C.free(unsafe.Pointer(sourceText_Cstring)) disambiguation_Cstring := C.CString(disambiguation) defer C.free(unsafe.Pointer(disambiguation_Cstring)) - var _ms *C.struct_miqt_string = C.QCommandLineParser_Tr2(sourceText_Cstring, disambiguation_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCommandLineParser_Tr2(sourceText_Cstring, disambiguation_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -304,9 +319,9 @@ func QCommandLineParser_Tr3(sourceText string, disambiguation string, n int) str defer C.free(unsafe.Pointer(sourceText_Cstring)) disambiguation_Cstring := C.CString(disambiguation) defer C.free(unsafe.Pointer(disambiguation_Cstring)) - var _ms *C.struct_miqt_string = C.QCommandLineParser_Tr3(sourceText_Cstring, disambiguation_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCommandLineParser_Tr3(sourceText_Cstring, disambiguation_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -315,9 +330,9 @@ func QCommandLineParser_TrUtf82(sourceText string, disambiguation string) string defer C.free(unsafe.Pointer(sourceText_Cstring)) disambiguation_Cstring := C.CString(disambiguation) defer C.free(unsafe.Pointer(disambiguation_Cstring)) - var _ms *C.struct_miqt_string = C.QCommandLineParser_TrUtf82(sourceText_Cstring, disambiguation_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCommandLineParser_TrUtf82(sourceText_Cstring, disambiguation_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -326,20 +341,26 @@ func QCommandLineParser_TrUtf83(sourceText string, disambiguation string, n int) defer C.free(unsafe.Pointer(sourceText_Cstring)) disambiguation_Cstring := C.CString(disambiguation) defer C.free(unsafe.Pointer(disambiguation_Cstring)) - var _ms *C.struct_miqt_string = C.QCommandLineParser_TrUtf83(sourceText_Cstring, disambiguation_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCommandLineParser_TrUtf83(sourceText_Cstring, disambiguation_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QCommandLineParser) AddPositionalArgument3(name string, description string, syntax string) { - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - description_ms := libmiqt.Strdupg(description) - defer C.free(description_ms) - syntax_ms := libmiqt.Strdupg(syntax) - defer C.free(syntax_ms) - C.QCommandLineParser_AddPositionalArgument3(this.h, (*C.struct_miqt_string)(name_ms), (*C.struct_miqt_string)(description_ms), (*C.struct_miqt_string)(syntax_ms)) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + description_ms := C.struct_miqt_string{} + description_ms.data = C.CString(description) + description_ms.len = C.size_t(len(description)) + defer C.free(unsafe.Pointer(description_ms.data)) + syntax_ms := C.struct_miqt_string{} + syntax_ms.data = C.CString(syntax) + syntax_ms.len = C.size_t(len(syntax)) + defer C.free(unsafe.Pointer(syntax_ms.data)) + C.QCommandLineParser_AddPositionalArgument3(this.h, name_ms, description_ms, syntax_ms) } // Delete this object from C++ memory. diff --git a/qt/gen_qcommandlineparser.h b/qt/gen_qcommandlineparser.h index 1ffb9b67..96b786e8 100644 --- a/qt/gen_qcommandlineparser.h +++ b/qt/gen_qcommandlineparser.h @@ -24,37 +24,37 @@ typedef struct QCoreApplication QCoreApplication; #endif QCommandLineParser* QCommandLineParser_new(); -struct miqt_string* QCommandLineParser_Tr(const char* sourceText); -struct miqt_string* QCommandLineParser_TrUtf8(const char* sourceText); +struct miqt_string QCommandLineParser_Tr(const char* sourceText); +struct miqt_string QCommandLineParser_TrUtf8(const char* sourceText); void QCommandLineParser_SetSingleDashWordOptionMode(QCommandLineParser* self, int parsingMode); void QCommandLineParser_SetOptionsAfterPositionalArgumentsMode(QCommandLineParser* self, int mode); bool QCommandLineParser_AddOption(QCommandLineParser* self, QCommandLineOption* commandLineOption); bool QCommandLineParser_AddOptions(QCommandLineParser* self, struct miqt_array* /* of QCommandLineOption* */ options); QCommandLineOption* QCommandLineParser_AddVersionOption(QCommandLineParser* self); QCommandLineOption* QCommandLineParser_AddHelpOption(QCommandLineParser* self); -void QCommandLineParser_SetApplicationDescription(QCommandLineParser* self, struct miqt_string* description); -struct miqt_string* QCommandLineParser_ApplicationDescription(const QCommandLineParser* self); -void QCommandLineParser_AddPositionalArgument(QCommandLineParser* self, struct miqt_string* name, struct miqt_string* description); +void QCommandLineParser_SetApplicationDescription(QCommandLineParser* self, struct miqt_string description); +struct miqt_string QCommandLineParser_ApplicationDescription(const QCommandLineParser* self); +void QCommandLineParser_AddPositionalArgument(QCommandLineParser* self, struct miqt_string name, struct miqt_string description); void QCommandLineParser_ClearPositionalArguments(QCommandLineParser* self); -void QCommandLineParser_Process(QCommandLineParser* self, struct miqt_array* /* of struct miqt_string* */ arguments); +void QCommandLineParser_Process(QCommandLineParser* self, struct miqt_array* /* of struct miqt_string */ arguments); void QCommandLineParser_ProcessWithApp(QCommandLineParser* self, QCoreApplication* app); -bool QCommandLineParser_Parse(QCommandLineParser* self, struct miqt_array* /* of struct miqt_string* */ arguments); -struct miqt_string* QCommandLineParser_ErrorText(const QCommandLineParser* self); -bool QCommandLineParser_IsSet(const QCommandLineParser* self, struct miqt_string* name); -struct miqt_string* QCommandLineParser_Value(const QCommandLineParser* self, struct miqt_string* name); -struct miqt_array* QCommandLineParser_Values(const QCommandLineParser* self, struct miqt_string* name); +bool QCommandLineParser_Parse(QCommandLineParser* self, struct miqt_array* /* of struct miqt_string */ arguments); +struct miqt_string QCommandLineParser_ErrorText(const QCommandLineParser* self); +bool QCommandLineParser_IsSet(const QCommandLineParser* self, struct miqt_string name); +struct miqt_string QCommandLineParser_Value(const QCommandLineParser* self, struct miqt_string name); +struct miqt_array* QCommandLineParser_Values(const QCommandLineParser* self, struct miqt_string name); bool QCommandLineParser_IsSetWithOption(const QCommandLineParser* self, QCommandLineOption* option); -struct miqt_string* QCommandLineParser_ValueWithOption(const QCommandLineParser* self, QCommandLineOption* option); +struct miqt_string QCommandLineParser_ValueWithOption(const QCommandLineParser* self, QCommandLineOption* option); struct miqt_array* QCommandLineParser_ValuesWithOption(const QCommandLineParser* self, QCommandLineOption* option); struct miqt_array* QCommandLineParser_PositionalArguments(const QCommandLineParser* self); struct miqt_array* QCommandLineParser_OptionNames(const QCommandLineParser* self); struct miqt_array* QCommandLineParser_UnknownOptionNames(const QCommandLineParser* self); -struct miqt_string* QCommandLineParser_HelpText(const QCommandLineParser* self); -struct miqt_string* QCommandLineParser_Tr2(const char* sourceText, const char* disambiguation); -struct miqt_string* QCommandLineParser_Tr3(const char* sourceText, const char* disambiguation, int n); -struct miqt_string* QCommandLineParser_TrUtf82(const char* sourceText, const char* disambiguation); -struct miqt_string* QCommandLineParser_TrUtf83(const char* sourceText, const char* disambiguation, int n); -void QCommandLineParser_AddPositionalArgument3(QCommandLineParser* self, struct miqt_string* name, struct miqt_string* description, struct miqt_string* syntax); +struct miqt_string QCommandLineParser_HelpText(const QCommandLineParser* self); +struct miqt_string QCommandLineParser_Tr2(const char* sourceText, const char* disambiguation); +struct miqt_string QCommandLineParser_Tr3(const char* sourceText, const char* disambiguation, int n); +struct miqt_string QCommandLineParser_TrUtf82(const char* sourceText, const char* disambiguation); +struct miqt_string QCommandLineParser_TrUtf83(const char* sourceText, const char* disambiguation, int n); +void QCommandLineParser_AddPositionalArgument3(QCommandLineParser* self, struct miqt_string name, struct miqt_string description, struct miqt_string syntax); void QCommandLineParser_Delete(QCommandLineParser* self); #ifdef __cplusplus diff --git a/qt/gen_qcommandlinkbutton.cpp b/qt/gen_qcommandlinkbutton.cpp index 5ea00b85..b3d6cb4b 100644 --- a/qt/gen_qcommandlinkbutton.cpp +++ b/qt/gen_qcommandlinkbutton.cpp @@ -12,14 +12,14 @@ QCommandLinkButton* QCommandLinkButton_new() { return new QCommandLinkButton(); } -QCommandLinkButton* QCommandLinkButton_new2(struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QCommandLinkButton* QCommandLinkButton_new2(struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QCommandLinkButton(text_QString); } -QCommandLinkButton* QCommandLinkButton_new3(struct miqt_string* text, struct miqt_string* description) { - QString text_QString = QString::fromUtf8(&text->data, text->len); - QString description_QString = QString::fromUtf8(&description->data, description->len); +QCommandLinkButton* QCommandLinkButton_new3(struct miqt_string text, struct miqt_string description) { + QString text_QString = QString::fromUtf8(text.data, text.len); + QString description_QString = QString::fromUtf8(description.data, description.len); return new QCommandLinkButton(text_QString, description_QString); } @@ -27,14 +27,14 @@ QCommandLinkButton* QCommandLinkButton_new4(QWidget* parent) { return new QCommandLinkButton(parent); } -QCommandLinkButton* QCommandLinkButton_new5(struct miqt_string* text, QWidget* parent) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QCommandLinkButton* QCommandLinkButton_new5(struct miqt_string text, QWidget* parent) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QCommandLinkButton(text_QString, parent); } -QCommandLinkButton* QCommandLinkButton_new6(struct miqt_string* text, struct miqt_string* description, QWidget* parent) { - QString text_QString = QString::fromUtf8(&text->data, text->len); - QString description_QString = QString::fromUtf8(&description->data, description->len); +QCommandLinkButton* QCommandLinkButton_new6(struct miqt_string text, struct miqt_string description, QWidget* parent) { + QString text_QString = QString::fromUtf8(text.data, text.len); + QString description_QString = QString::fromUtf8(description.data, description.len); return new QCommandLinkButton(text_QString, description_QString, parent); } @@ -46,58 +46,86 @@ void* QCommandLinkButton_Metacast(QCommandLinkButton* self, const char* param1) return self->qt_metacast(param1); } -struct miqt_string* QCommandLinkButton_Tr(const char* s) { +struct miqt_string QCommandLinkButton_Tr(const char* s) { QString _ret = QCommandLinkButton::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QCommandLinkButton_TrUtf8(const char* s) { +struct miqt_string QCommandLinkButton_TrUtf8(const char* s) { QString _ret = QCommandLinkButton::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QCommandLinkButton_Description(const QCommandLinkButton* self) { +struct miqt_string QCommandLinkButton_Description(const QCommandLinkButton* self) { QString _ret = self->description(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QCommandLinkButton_SetDescription(QCommandLinkButton* self, struct miqt_string* description) { - QString description_QString = QString::fromUtf8(&description->data, description->len); +void QCommandLinkButton_SetDescription(QCommandLinkButton* self, struct miqt_string description) { + QString description_QString = QString::fromUtf8(description.data, description.len); self->setDescription(description_QString); } -struct miqt_string* QCommandLinkButton_Tr2(const char* s, const char* c) { +struct miqt_string QCommandLinkButton_Tr2(const char* s, const char* c) { QString _ret = QCommandLinkButton::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QCommandLinkButton_Tr3(const char* s, const char* c, int n) { +struct miqt_string QCommandLinkButton_Tr3(const char* s, const char* c, int n) { QString _ret = QCommandLinkButton::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QCommandLinkButton_TrUtf82(const char* s, const char* c) { +struct miqt_string QCommandLinkButton_TrUtf82(const char* s, const char* c) { QString _ret = QCommandLinkButton::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QCommandLinkButton_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QCommandLinkButton_TrUtf83(const char* s, const char* c, int n) { QString _ret = QCommandLinkButton::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QCommandLinkButton_Delete(QCommandLinkButton* self) { diff --git a/qt/gen_qcommandlinkbutton.go b/qt/gen_qcommandlinkbutton.go index 5984deed..d738be78 100644 --- a/qt/gen_qcommandlinkbutton.go +++ b/qt/gen_qcommandlinkbutton.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -52,19 +51,25 @@ func NewQCommandLinkButton() *QCommandLinkButton { // NewQCommandLinkButton2 constructs a new QCommandLinkButton object. func NewQCommandLinkButton2(text string) *QCommandLinkButton { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - ret := C.QCommandLinkButton_new2((*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + ret := C.QCommandLinkButton_new2(text_ms) return newQCommandLinkButton(ret) } // NewQCommandLinkButton3 constructs a new QCommandLinkButton object. func NewQCommandLinkButton3(text string, description string) *QCommandLinkButton { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - description_ms := libmiqt.Strdupg(description) - defer C.free(description_ms) - ret := C.QCommandLinkButton_new3((*C.struct_miqt_string)(text_ms), (*C.struct_miqt_string)(description_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + description_ms := C.struct_miqt_string{} + description_ms.data = C.CString(description) + description_ms.len = C.size_t(len(description)) + defer C.free(unsafe.Pointer(description_ms.data)) + ret := C.QCommandLinkButton_new3(text_ms, description_ms) return newQCommandLinkButton(ret) } @@ -76,19 +81,25 @@ func NewQCommandLinkButton4(parent *QWidget) *QCommandLinkButton { // NewQCommandLinkButton5 constructs a new QCommandLinkButton object. func NewQCommandLinkButton5(text string, parent *QWidget) *QCommandLinkButton { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - ret := C.QCommandLinkButton_new5((*C.struct_miqt_string)(text_ms), parent.cPointer()) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + ret := C.QCommandLinkButton_new5(text_ms, parent.cPointer()) return newQCommandLinkButton(ret) } // NewQCommandLinkButton6 constructs a new QCommandLinkButton object. func NewQCommandLinkButton6(text string, description string, parent *QWidget) *QCommandLinkButton { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - description_ms := libmiqt.Strdupg(description) - defer C.free(description_ms) - ret := C.QCommandLinkButton_new6((*C.struct_miqt_string)(text_ms), (*C.struct_miqt_string)(description_ms), parent.cPointer()) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + description_ms := C.struct_miqt_string{} + description_ms.data = C.CString(description) + description_ms.len = C.size_t(len(description)) + defer C.free(unsafe.Pointer(description_ms.data)) + ret := C.QCommandLinkButton_new6(text_ms, description_ms, parent.cPointer()) return newQCommandLinkButton(ret) } @@ -99,38 +110,40 @@ func (this *QCommandLinkButton) MetaObject() *QMetaObject { func (this *QCommandLinkButton) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QCommandLinkButton_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QCommandLinkButton_Metacast(this.h, param1_Cstring)) } func QCommandLinkButton_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QCommandLinkButton_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCommandLinkButton_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QCommandLinkButton_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QCommandLinkButton_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCommandLinkButton_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QCommandLinkButton) Description() string { - var _ms *C.struct_miqt_string = C.QCommandLinkButton_Description(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCommandLinkButton_Description(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QCommandLinkButton) SetDescription(description string) { - description_ms := libmiqt.Strdupg(description) - defer C.free(description_ms) - C.QCommandLinkButton_SetDescription(this.h, (*C.struct_miqt_string)(description_ms)) + description_ms := C.struct_miqt_string{} + description_ms.data = C.CString(description) + description_ms.len = C.size_t(len(description)) + defer C.free(unsafe.Pointer(description_ms.data)) + C.QCommandLinkButton_SetDescription(this.h, description_ms) } func QCommandLinkButton_Tr2(s string, c string) string { @@ -138,9 +151,9 @@ func QCommandLinkButton_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QCommandLinkButton_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCommandLinkButton_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -149,9 +162,9 @@ func QCommandLinkButton_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QCommandLinkButton_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCommandLinkButton_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -160,9 +173,9 @@ func QCommandLinkButton_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QCommandLinkButton_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCommandLinkButton_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -171,9 +184,9 @@ func QCommandLinkButton_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QCommandLinkButton_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCommandLinkButton_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qcommandlinkbutton.h b/qt/gen_qcommandlinkbutton.h index 77a813cc..8045451a 100644 --- a/qt/gen_qcommandlinkbutton.h +++ b/qt/gen_qcommandlinkbutton.h @@ -24,21 +24,21 @@ typedef struct QWidget QWidget; #endif QCommandLinkButton* QCommandLinkButton_new(); -QCommandLinkButton* QCommandLinkButton_new2(struct miqt_string* text); -QCommandLinkButton* QCommandLinkButton_new3(struct miqt_string* text, struct miqt_string* description); +QCommandLinkButton* QCommandLinkButton_new2(struct miqt_string text); +QCommandLinkButton* QCommandLinkButton_new3(struct miqt_string text, struct miqt_string description); QCommandLinkButton* QCommandLinkButton_new4(QWidget* parent); -QCommandLinkButton* QCommandLinkButton_new5(struct miqt_string* text, QWidget* parent); -QCommandLinkButton* QCommandLinkButton_new6(struct miqt_string* text, struct miqt_string* description, QWidget* parent); +QCommandLinkButton* QCommandLinkButton_new5(struct miqt_string text, QWidget* parent); +QCommandLinkButton* QCommandLinkButton_new6(struct miqt_string text, struct miqt_string description, QWidget* parent); QMetaObject* QCommandLinkButton_MetaObject(const QCommandLinkButton* self); void* QCommandLinkButton_Metacast(QCommandLinkButton* self, const char* param1); -struct miqt_string* QCommandLinkButton_Tr(const char* s); -struct miqt_string* QCommandLinkButton_TrUtf8(const char* s); -struct miqt_string* QCommandLinkButton_Description(const QCommandLinkButton* self); -void QCommandLinkButton_SetDescription(QCommandLinkButton* self, struct miqt_string* description); -struct miqt_string* QCommandLinkButton_Tr2(const char* s, const char* c); -struct miqt_string* QCommandLinkButton_Tr3(const char* s, const char* c, int n); -struct miqt_string* QCommandLinkButton_TrUtf82(const char* s, const char* c); -struct miqt_string* QCommandLinkButton_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QCommandLinkButton_Tr(const char* s); +struct miqt_string QCommandLinkButton_TrUtf8(const char* s); +struct miqt_string QCommandLinkButton_Description(const QCommandLinkButton* self); +void QCommandLinkButton_SetDescription(QCommandLinkButton* self, struct miqt_string description); +struct miqt_string QCommandLinkButton_Tr2(const char* s, const char* c); +struct miqt_string QCommandLinkButton_Tr3(const char* s, const char* c, int n); +struct miqt_string QCommandLinkButton_TrUtf82(const char* s, const char* c); +struct miqt_string QCommandLinkButton_TrUtf83(const char* s, const char* c, int n); void QCommandLinkButton_Delete(QCommandLinkButton* self); #ifdef __cplusplus diff --git a/qt/gen_qcommonstyle.cpp b/qt/gen_qcommonstyle.cpp index e67db4a7..e4f62fd0 100644 --- a/qt/gen_qcommonstyle.cpp +++ b/qt/gen_qcommonstyle.cpp @@ -31,18 +31,26 @@ void* QCommonStyle_Metacast(QCommonStyle* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QCommonStyle_Tr(const char* s) { +struct miqt_string QCommonStyle_Tr(const char* s) { QString _ret = QCommonStyle::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QCommonStyle_TrUtf8(const char* s) { +struct miqt_string QCommonStyle_TrUtf8(const char* s) { QString _ret = QCommonStyle::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QCommonStyle_DrawPrimitive(const QCommonStyle* self, int pe, QStyleOption* opt, QPainter* p) { @@ -118,32 +126,48 @@ void QCommonStyle_UnpolishWithApplication(QCommonStyle* self, QApplication* appl self->unpolish(application); } -struct miqt_string* QCommonStyle_Tr2(const char* s, const char* c) { +struct miqt_string QCommonStyle_Tr2(const char* s, const char* c) { QString _ret = QCommonStyle::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QCommonStyle_Tr3(const char* s, const char* c, int n) { +struct miqt_string QCommonStyle_Tr3(const char* s, const char* c, int n) { QString _ret = QCommonStyle::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QCommonStyle_TrUtf82(const char* s, const char* c) { +struct miqt_string QCommonStyle_TrUtf82(const char* s, const char* c) { QString _ret = QCommonStyle::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QCommonStyle_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QCommonStyle_TrUtf83(const char* s, const char* c, int n) { QString _ret = QCommonStyle::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QCommonStyle_DrawPrimitive4(const QCommonStyle* self, int pe, QStyleOption* opt, QPainter* p, QWidget* w) { diff --git a/qt/gen_qcommonstyle.go b/qt/gen_qcommonstyle.go index 49530bd3..e76ebc29 100644 --- a/qt/gen_qcommonstyle.go +++ b/qt/gen_qcommonstyle.go @@ -56,24 +56,24 @@ func (this *QCommonStyle) MetaObject() *QMetaObject { func (this *QCommonStyle) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QCommonStyle_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QCommonStyle_Metacast(this.h, param1_Cstring)) } func QCommonStyle_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QCommonStyle_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCommonStyle_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QCommonStyle_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QCommonStyle_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCommonStyle_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -172,9 +172,9 @@ func QCommonStyle_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QCommonStyle_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCommonStyle_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -183,9 +183,9 @@ func QCommonStyle_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QCommonStyle_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCommonStyle_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -194,9 +194,9 @@ func QCommonStyle_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QCommonStyle_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCommonStyle_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -205,9 +205,9 @@ func QCommonStyle_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QCommonStyle_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCommonStyle_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qcommonstyle.h b/qt/gen_qcommonstyle.h index f93799e0..e178959d 100644 --- a/qt/gen_qcommonstyle.h +++ b/qt/gen_qcommonstyle.h @@ -48,8 +48,8 @@ typedef struct QWidget QWidget; QCommonStyle* QCommonStyle_new(); QMetaObject* QCommonStyle_MetaObject(const QCommonStyle* self); void* QCommonStyle_Metacast(QCommonStyle* self, const char* param1); -struct miqt_string* QCommonStyle_Tr(const char* s); -struct miqt_string* QCommonStyle_TrUtf8(const char* s); +struct miqt_string QCommonStyle_Tr(const char* s); +struct miqt_string QCommonStyle_TrUtf8(const char* s); void QCommonStyle_DrawPrimitive(const QCommonStyle* self, int pe, QStyleOption* opt, QPainter* p); void QCommonStyle_DrawControl(const QCommonStyle* self, int element, QStyleOption* opt, QPainter* p); QRect* QCommonStyle_SubElementRect(const QCommonStyle* self, int r, QStyleOption* opt); @@ -68,10 +68,10 @@ void QCommonStyle_PolishWithApp(QCommonStyle* self, QApplication* app); void QCommonStyle_PolishWithWidget(QCommonStyle* self, QWidget* widget); void QCommonStyle_Unpolish(QCommonStyle* self, QWidget* widget); void QCommonStyle_UnpolishWithApplication(QCommonStyle* self, QApplication* application); -struct miqt_string* QCommonStyle_Tr2(const char* s, const char* c); -struct miqt_string* QCommonStyle_Tr3(const char* s, const char* c, int n); -struct miqt_string* QCommonStyle_TrUtf82(const char* s, const char* c); -struct miqt_string* QCommonStyle_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QCommonStyle_Tr2(const char* s, const char* c); +struct miqt_string QCommonStyle_Tr3(const char* s, const char* c, int n); +struct miqt_string QCommonStyle_TrUtf82(const char* s, const char* c); +struct miqt_string QCommonStyle_TrUtf83(const char* s, const char* c, int n); void QCommonStyle_DrawPrimitive4(const QCommonStyle* self, int pe, QStyleOption* opt, QPainter* p, QWidget* w); void QCommonStyle_DrawControl4(const QCommonStyle* self, int element, QStyleOption* opt, QPainter* p, QWidget* w); QRect* QCommonStyle_SubElementRect3(const QCommonStyle* self, int r, QStyleOption* opt, QWidget* widget); diff --git a/qt/gen_qcompleter.cpp b/qt/gen_qcompleter.cpp index 34cb5a88..7aa70132 100644 --- a/qt/gen_qcompleter.cpp +++ b/qt/gen_qcompleter.cpp @@ -22,12 +22,12 @@ QCompleter* QCompleter_new2(QAbstractItemModel* model) { return new QCompleter(model); } -QCompleter* QCompleter_new3(struct miqt_array* /* of struct miqt_string* */ completions) { +QCompleter* QCompleter_new3(struct miqt_array* /* of struct miqt_string */ completions) { QStringList completions_QList; completions_QList.reserve(completions->len); - struct miqt_string** completions_arr = static_cast(completions->data); + struct miqt_string* completions_arr = static_cast(completions->data); for(size_t i = 0; i < completions->len; ++i) { - QString completions_arr_i_QString = QString::fromUtf8(&completions_arr[i]->data, completions_arr[i]->len); + QString completions_arr_i_QString = QString::fromUtf8(completions_arr[i].data, completions_arr[i].len); completions_QList.push_back(completions_arr_i_QString); } return new QCompleter(completions_QList); @@ -41,12 +41,12 @@ QCompleter* QCompleter_new5(QAbstractItemModel* model, QObject* parent) { return new QCompleter(model, parent); } -QCompleter* QCompleter_new6(struct miqt_array* /* of struct miqt_string* */ completions, QObject* parent) { +QCompleter* QCompleter_new6(struct miqt_array* /* of struct miqt_string */ completions, QObject* parent) { QStringList completions_QList; completions_QList.reserve(completions->len); - struct miqt_string** completions_arr = static_cast(completions->data); + struct miqt_string* completions_arr = static_cast(completions->data); for(size_t i = 0; i < completions->len; ++i) { - QString completions_arr_i_QString = QString::fromUtf8(&completions_arr[i]->data, completions_arr[i]->len); + QString completions_arr_i_QString = QString::fromUtf8(completions_arr[i].data, completions_arr[i].len); completions_QList.push_back(completions_arr_i_QString); } return new QCompleter(completions_QList, parent); @@ -60,18 +60,26 @@ void* QCompleter_Metacast(QCompleter* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QCompleter_Tr(const char* s) { +struct miqt_string QCompleter_Tr(const char* s) { QString _ret = QCompleter::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QCompleter_TrUtf8(const char* s) { +struct miqt_string QCompleter_TrUtf8(const char* s) { QString _ret = QCompleter::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QCompleter_SetWidget(QCompleter* self, QWidget* widget) { @@ -178,26 +186,34 @@ QModelIndex* QCompleter_CurrentIndex(const QCompleter* self) { return new QModelIndex(self->currentIndex()); } -struct miqt_string* QCompleter_CurrentCompletion(const QCompleter* self) { +struct miqt_string QCompleter_CurrentCompletion(const QCompleter* self) { QString _ret = self->currentCompletion(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QAbstractItemModel* QCompleter_CompletionModel(const QCompleter* self) { return self->completionModel(); } -struct miqt_string* QCompleter_CompletionPrefix(const QCompleter* self) { +struct miqt_string QCompleter_CompletionPrefix(const QCompleter* self) { QString _ret = self->completionPrefix(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QCompleter_SetCompletionPrefix(QCompleter* self, struct miqt_string* prefix) { - QString prefix_QString = QString::fromUtf8(&prefix->data, prefix->len); +void QCompleter_SetCompletionPrefix(QCompleter* self, struct miqt_string prefix) { + QString prefix_QString = QString::fromUtf8(prefix.data, prefix.len); self->setCompletionPrefix(prefix_QString); } @@ -209,23 +225,31 @@ void QCompleter_SetWrapAround(QCompleter* self, bool wrap) { self->setWrapAround(wrap); } -struct miqt_string* QCompleter_PathFromIndex(const QCompleter* self, QModelIndex* index) { +struct miqt_string QCompleter_PathFromIndex(const QCompleter* self, QModelIndex* index) { QString _ret = self->pathFromIndex(*index); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_array* QCompleter_SplitPath(const QCompleter* self, struct miqt_string* path) { - QString path_QString = QString::fromUtf8(&path->data, path->len); +struct miqt_array* QCompleter_SplitPath(const QCompleter* self, struct miqt_string path) { + QString path_QString = QString::fromUtf8(path.data, path.len); QStringList _ret = self->splitPath(path_QString); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -233,8 +257,8 @@ struct miqt_array* QCompleter_SplitPath(const QCompleter* self, struct miqt_stri return _out; } -void QCompleter_Activated(QCompleter* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QCompleter_Activated(QCompleter* self, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->activated(text_QString); } @@ -243,7 +267,11 @@ void QCompleter_connect_Activated(QCompleter* self, intptr_t slot) { const QString text_ret = text; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray text_b = text_ret.toUtf8(); - struct miqt_string* sigval1 = miqt_strdup(text_b.data(), text_b.length()); + struct miqt_string text_ms; + text_ms.len = text_b.length(); + text_ms.data = static_cast(malloc(text_ms.len)); + memcpy(text_ms.data, text_b.data(), text_ms.len); + struct miqt_string sigval1 = text_ms; miqt_exec_callback_QCompleter_Activated(slot, sigval1); }); } @@ -261,8 +289,8 @@ void QCompleter_connect_ActivatedWithIndex(QCompleter* self, intptr_t slot) { }); } -void QCompleter_Highlighted(QCompleter* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QCompleter_Highlighted(QCompleter* self, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->highlighted(text_QString); } @@ -271,7 +299,11 @@ void QCompleter_connect_Highlighted(QCompleter* self, intptr_t slot) { const QString text_ret = text; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray text_b = text_ret.toUtf8(); - struct miqt_string* sigval1 = miqt_strdup(text_b.data(), text_b.length()); + struct miqt_string text_ms; + text_ms.len = text_b.length(); + text_ms.data = static_cast(malloc(text_ms.len)); + memcpy(text_ms.data, text_b.data(), text_ms.len); + struct miqt_string sigval1 = text_ms; miqt_exec_callback_QCompleter_Highlighted(slot, sigval1); }); } @@ -289,32 +321,48 @@ void QCompleter_connect_HighlightedWithIndex(QCompleter* self, intptr_t slot) { }); } -struct miqt_string* QCompleter_Tr2(const char* s, const char* c) { +struct miqt_string QCompleter_Tr2(const char* s, const char* c) { QString _ret = QCompleter::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QCompleter_Tr3(const char* s, const char* c, int n) { +struct miqt_string QCompleter_Tr3(const char* s, const char* c, int n) { QString _ret = QCompleter::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QCompleter_TrUtf82(const char* s, const char* c) { +struct miqt_string QCompleter_TrUtf82(const char* s, const char* c) { QString _ret = QCompleter::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QCompleter_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QCompleter_TrUtf83(const char* s, const char* c, int n) { QString _ret = QCompleter::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QCompleter_Complete1(QCompleter* self, QRect* rect) { diff --git a/qt/gen_qcompleter.go b/qt/gen_qcompleter.go index 90c93f36..ec8554ab 100644 --- a/qt/gen_qcompleter.go +++ b/qt/gen_qcompleter.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "runtime/cgo" "unsafe" @@ -76,12 +75,14 @@ func NewQCompleter2(model *QAbstractItemModel) *QCompleter { // NewQCompleter3 constructs a new QCompleter object. func NewQCompleter3(completions []string) *QCompleter { // For the C ABI, malloc a C array of raw pointers - completions_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(completions)))) + completions_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(completions)))) defer C.free(unsafe.Pointer(completions_CArray)) for i := range completions { - completions_i_ms := libmiqt.Strdupg(completions[i]) - defer C.free(completions_i_ms) - completions_CArray[i] = (*C.struct_miqt_string)(completions_i_ms) + completions_i_ms := C.struct_miqt_string{} + completions_i_ms.data = C.CString(completions[i]) + completions_i_ms.len = C.size_t(len(completions[i])) + defer C.free(unsafe.Pointer(completions_i_ms.data)) + completions_CArray[i] = completions_i_ms } completions_ma := &C.struct_miqt_array{len: C.size_t(len(completions)), data: unsafe.Pointer(completions_CArray)} defer runtime.KeepAlive(unsafe.Pointer(completions_ma)) @@ -104,12 +105,14 @@ func NewQCompleter5(model *QAbstractItemModel, parent *QObject) *QCompleter { // NewQCompleter6 constructs a new QCompleter object. func NewQCompleter6(completions []string, parent *QObject) *QCompleter { // For the C ABI, malloc a C array of raw pointers - completions_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(completions)))) + completions_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(completions)))) defer C.free(unsafe.Pointer(completions_CArray)) for i := range completions { - completions_i_ms := libmiqt.Strdupg(completions[i]) - defer C.free(completions_i_ms) - completions_CArray[i] = (*C.struct_miqt_string)(completions_i_ms) + completions_i_ms := C.struct_miqt_string{} + completions_i_ms.data = C.CString(completions[i]) + completions_i_ms.len = C.size_t(len(completions[i])) + defer C.free(unsafe.Pointer(completions_i_ms.data)) + completions_CArray[i] = completions_i_ms } completions_ma := &C.struct_miqt_array{len: C.size_t(len(completions)), data: unsafe.Pointer(completions_CArray)} defer runtime.KeepAlive(unsafe.Pointer(completions_ma)) @@ -124,24 +127,24 @@ func (this *QCompleter) MetaObject() *QMetaObject { func (this *QCompleter) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QCompleter_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QCompleter_Metacast(this.h, param1_Cstring)) } func QCompleter_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QCompleter_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCompleter_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QCompleter_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QCompleter_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCompleter_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -249,9 +252,9 @@ func (this *QCompleter) CurrentIndex() *QModelIndex { } func (this *QCompleter) CurrentCompletion() string { - var _ms *C.struct_miqt_string = C.QCompleter_CurrentCompletion(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCompleter_CurrentCompletion(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -260,16 +263,18 @@ func (this *QCompleter) CompletionModel() *QAbstractItemModel { } func (this *QCompleter) CompletionPrefix() string { - var _ms *C.struct_miqt_string = C.QCompleter_CompletionPrefix(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCompleter_CompletionPrefix(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QCompleter) SetCompletionPrefix(prefix string) { - prefix_ms := libmiqt.Strdupg(prefix) - defer C.free(prefix_ms) - C.QCompleter_SetCompletionPrefix(this.h, (*C.struct_miqt_string)(prefix_ms)) + prefix_ms := C.struct_miqt_string{} + prefix_ms.data = C.CString(prefix) + prefix_ms.len = C.size_t(len(prefix)) + defer C.free(unsafe.Pointer(prefix_ms.data)) + C.QCompleter_SetCompletionPrefix(this.h, prefix_ms) } func (this *QCompleter) Complete() { @@ -281,22 +286,24 @@ func (this *QCompleter) SetWrapAround(wrap bool) { } func (this *QCompleter) PathFromIndex(index *QModelIndex) string { - var _ms *C.struct_miqt_string = C.QCompleter_PathFromIndex(this.h, index.cPointer()) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCompleter_PathFromIndex(this.h, index.cPointer()) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QCompleter) SplitPath(path string) []string { - path_ms := libmiqt.Strdupg(path) - defer C.free(path_ms) - var _ma *C.struct_miqt_array = C.QCompleter_SplitPath(this.h, (*C.struct_miqt_string)(path_ms)) + path_ms := C.struct_miqt_string{} + path_ms.data = C.CString(path) + path_ms.len = C.size_t(len(path)) + defer C.free(unsafe.Pointer(path_ms.data)) + var _ma *C.struct_miqt_array = C.QCompleter_SplitPath(this.h, path_ms) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -304,25 +311,27 @@ func (this *QCompleter) SplitPath(path string) []string { } func (this *QCompleter) Activated(text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QCompleter_Activated(this.h, (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QCompleter_Activated(this.h, text_ms) } func (this *QCompleter) OnActivated(slot func(text string)) { C.QCompleter_connect_Activated(this.h, C.intptr_t(cgo.NewHandle(slot))) } //export miqt_exec_callback_QCompleter_Activated -func miqt_exec_callback_QCompleter_Activated(cb C.intptr_t, text *C.struct_miqt_string) { +func miqt_exec_callback_QCompleter_Activated(cb C.intptr_t, text C.struct_miqt_string) { gofunc, ok := cgo.Handle(cb).Value().(func(text string)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") } // Convert all CABI parameters to Go parameters - var text_ms *C.struct_miqt_string = text - text_ret := C.GoStringN(&text_ms.data, C.int(int64(text_ms.len))) - C.free(unsafe.Pointer(text_ms)) + var text_ms C.struct_miqt_string = text + text_ret := C.GoStringN(text_ms.data, C.int(int64(text_ms.len))) + C.free(unsafe.Pointer(text_ms.data)) slotval1 := text_ret gofunc(slotval1) @@ -349,25 +358,27 @@ func miqt_exec_callback_QCompleter_ActivatedWithIndex(cb C.intptr_t, index *C.QM } func (this *QCompleter) Highlighted(text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QCompleter_Highlighted(this.h, (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QCompleter_Highlighted(this.h, text_ms) } func (this *QCompleter) OnHighlighted(slot func(text string)) { C.QCompleter_connect_Highlighted(this.h, C.intptr_t(cgo.NewHandle(slot))) } //export miqt_exec_callback_QCompleter_Highlighted -func miqt_exec_callback_QCompleter_Highlighted(cb C.intptr_t, text *C.struct_miqt_string) { +func miqt_exec_callback_QCompleter_Highlighted(cb C.intptr_t, text C.struct_miqt_string) { gofunc, ok := cgo.Handle(cb).Value().(func(text string)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") } // Convert all CABI parameters to Go parameters - var text_ms *C.struct_miqt_string = text - text_ret := C.GoStringN(&text_ms.data, C.int(int64(text_ms.len))) - C.free(unsafe.Pointer(text_ms)) + var text_ms C.struct_miqt_string = text + text_ret := C.GoStringN(text_ms.data, C.int(int64(text_ms.len))) + C.free(unsafe.Pointer(text_ms.data)) slotval1 := text_ret gofunc(slotval1) @@ -398,9 +409,9 @@ func QCompleter_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QCompleter_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCompleter_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -409,9 +420,9 @@ func QCompleter_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QCompleter_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCompleter_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -420,9 +431,9 @@ func QCompleter_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QCompleter_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCompleter_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -431,9 +442,9 @@ func QCompleter_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QCompleter_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCompleter_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qcompleter.h b/qt/gen_qcompleter.h index 6c88e8a5..a63167d1 100644 --- a/qt/gen_qcompleter.h +++ b/qt/gen_qcompleter.h @@ -35,14 +35,14 @@ typedef struct QWidget QWidget; QCompleter* QCompleter_new(); QCompleter* QCompleter_new2(QAbstractItemModel* model); -QCompleter* QCompleter_new3(struct miqt_array* /* of struct miqt_string* */ completions); +QCompleter* QCompleter_new3(struct miqt_array* /* of struct miqt_string */ completions); QCompleter* QCompleter_new4(QObject* parent); QCompleter* QCompleter_new5(QAbstractItemModel* model, QObject* parent); -QCompleter* QCompleter_new6(struct miqt_array* /* of struct miqt_string* */ completions, QObject* parent); +QCompleter* QCompleter_new6(struct miqt_array* /* of struct miqt_string */ completions, QObject* parent); QMetaObject* QCompleter_MetaObject(const QCompleter* self); void* QCompleter_Metacast(QCompleter* self, const char* param1); -struct miqt_string* QCompleter_Tr(const char* s); -struct miqt_string* QCompleter_TrUtf8(const char* s); +struct miqt_string QCompleter_Tr(const char* s); +struct miqt_string QCompleter_TrUtf8(const char* s); void QCompleter_SetWidget(QCompleter* self, QWidget* widget); QWidget* QCompleter_Widget(const QCompleter* self); void QCompleter_SetModel(QCompleter* self, QAbstractItemModel* c); @@ -68,26 +68,26 @@ int QCompleter_CompletionCount(const QCompleter* self); bool QCompleter_SetCurrentRow(QCompleter* self, int row); int QCompleter_CurrentRow(const QCompleter* self); QModelIndex* QCompleter_CurrentIndex(const QCompleter* self); -struct miqt_string* QCompleter_CurrentCompletion(const QCompleter* self); +struct miqt_string QCompleter_CurrentCompletion(const QCompleter* self); QAbstractItemModel* QCompleter_CompletionModel(const QCompleter* self); -struct miqt_string* QCompleter_CompletionPrefix(const QCompleter* self); -void QCompleter_SetCompletionPrefix(QCompleter* self, struct miqt_string* prefix); +struct miqt_string QCompleter_CompletionPrefix(const QCompleter* self); +void QCompleter_SetCompletionPrefix(QCompleter* self, struct miqt_string prefix); void QCompleter_Complete(QCompleter* self); void QCompleter_SetWrapAround(QCompleter* self, bool wrap); -struct miqt_string* QCompleter_PathFromIndex(const QCompleter* self, QModelIndex* index); -struct miqt_array* QCompleter_SplitPath(const QCompleter* self, struct miqt_string* path); -void QCompleter_Activated(QCompleter* self, struct miqt_string* text); +struct miqt_string QCompleter_PathFromIndex(const QCompleter* self, QModelIndex* index); +struct miqt_array* QCompleter_SplitPath(const QCompleter* self, struct miqt_string path); +void QCompleter_Activated(QCompleter* self, struct miqt_string text); void QCompleter_connect_Activated(QCompleter* self, intptr_t slot); void QCompleter_ActivatedWithIndex(QCompleter* self, QModelIndex* index); void QCompleter_connect_ActivatedWithIndex(QCompleter* self, intptr_t slot); -void QCompleter_Highlighted(QCompleter* self, struct miqt_string* text); +void QCompleter_Highlighted(QCompleter* self, struct miqt_string text); void QCompleter_connect_Highlighted(QCompleter* self, intptr_t slot); void QCompleter_HighlightedWithIndex(QCompleter* self, QModelIndex* index); void QCompleter_connect_HighlightedWithIndex(QCompleter* self, intptr_t slot); -struct miqt_string* QCompleter_Tr2(const char* s, const char* c); -struct miqt_string* QCompleter_Tr3(const char* s, const char* c, int n); -struct miqt_string* QCompleter_TrUtf82(const char* s, const char* c); -struct miqt_string* QCompleter_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QCompleter_Tr2(const char* s, const char* c); +struct miqt_string QCompleter_Tr3(const char* s, const char* c, int n); +struct miqt_string QCompleter_TrUtf82(const char* s, const char* c); +struct miqt_string QCompleter_TrUtf83(const char* s, const char* c, int n); void QCompleter_Complete1(QCompleter* self, QRect* rect); void QCompleter_Delete(QCompleter* self); diff --git a/qt/gen_qconcatenatetablesproxymodel.cpp b/qt/gen_qconcatenatetablesproxymodel.cpp index 39ebc0a5..0b790683 100644 --- a/qt/gen_qconcatenatetablesproxymodel.cpp +++ b/qt/gen_qconcatenatetablesproxymodel.cpp @@ -30,18 +30,26 @@ void* QConcatenateTablesProxyModel_Metacast(QConcatenateTablesProxyModel* self, return self->qt_metacast(param1); } -struct miqt_string* QConcatenateTablesProxyModel_Tr(const char* s) { +struct miqt_string QConcatenateTablesProxyModel_Tr(const char* s) { QString _ret = QConcatenateTablesProxyModel::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QConcatenateTablesProxyModel_TrUtf8(const char* s) { +struct miqt_string QConcatenateTablesProxyModel_TrUtf8(const char* s) { QString _ret = QConcatenateTablesProxyModel::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } struct miqt_array* QConcatenateTablesProxyModel_SourceModels(const QConcatenateTablesProxyModel* self) { @@ -109,12 +117,16 @@ int QConcatenateTablesProxyModel_ColumnCount(const QConcatenateTablesProxyModel* struct miqt_array* QConcatenateTablesProxyModel_MimeTypes(const QConcatenateTablesProxyModel* self) { QStringList _ret = self->mimeTypes(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -144,32 +156,48 @@ QSize* QConcatenateTablesProxyModel_Span(const QConcatenateTablesProxyModel* sel return new QSize(self->span(*index)); } -struct miqt_string* QConcatenateTablesProxyModel_Tr2(const char* s, const char* c) { +struct miqt_string QConcatenateTablesProxyModel_Tr2(const char* s, const char* c) { QString _ret = QConcatenateTablesProxyModel::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QConcatenateTablesProxyModel_Tr3(const char* s, const char* c, int n) { +struct miqt_string QConcatenateTablesProxyModel_Tr3(const char* s, const char* c, int n) { QString _ret = QConcatenateTablesProxyModel::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QConcatenateTablesProxyModel_TrUtf82(const char* s, const char* c) { +struct miqt_string QConcatenateTablesProxyModel_TrUtf82(const char* s, const char* c) { QString _ret = QConcatenateTablesProxyModel::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QConcatenateTablesProxyModel_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QConcatenateTablesProxyModel_TrUtf83(const char* s, const char* c, int n) { QString _ret = QConcatenateTablesProxyModel::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QVariant* QConcatenateTablesProxyModel_Data2(const QConcatenateTablesProxyModel* self, QModelIndex* index, int role) { diff --git a/qt/gen_qconcatenatetablesproxymodel.go b/qt/gen_qconcatenatetablesproxymodel.go index ca88980a..8b1f4151 100644 --- a/qt/gen_qconcatenatetablesproxymodel.go +++ b/qt/gen_qconcatenatetablesproxymodel.go @@ -62,24 +62,24 @@ func (this *QConcatenateTablesProxyModel) MetaObject() *QMetaObject { func (this *QConcatenateTablesProxyModel) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QConcatenateTablesProxyModel_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QConcatenateTablesProxyModel_Metacast(this.h, param1_Cstring)) } func QConcatenateTablesProxyModel_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QConcatenateTablesProxyModel_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QConcatenateTablesProxyModel_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QConcatenateTablesProxyModel_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QConcatenateTablesProxyModel_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QConcatenateTablesProxyModel_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -163,11 +163,11 @@ func (this *QConcatenateTablesProxyModel) ColumnCount() int { func (this *QConcatenateTablesProxyModel) MimeTypes() []string { var _ma *C.struct_miqt_array = C.QConcatenateTablesProxyModel_MimeTypes(this.h) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -206,9 +206,9 @@ func QConcatenateTablesProxyModel_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QConcatenateTablesProxyModel_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QConcatenateTablesProxyModel_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -217,9 +217,9 @@ func QConcatenateTablesProxyModel_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QConcatenateTablesProxyModel_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QConcatenateTablesProxyModel_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -228,9 +228,9 @@ func QConcatenateTablesProxyModel_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QConcatenateTablesProxyModel_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QConcatenateTablesProxyModel_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -239,9 +239,9 @@ func QConcatenateTablesProxyModel_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QConcatenateTablesProxyModel_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QConcatenateTablesProxyModel_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qconcatenatetablesproxymodel.h b/qt/gen_qconcatenatetablesproxymodel.h index 691e6d2f..f0ee6883 100644 --- a/qt/gen_qconcatenatetablesproxymodel.h +++ b/qt/gen_qconcatenatetablesproxymodel.h @@ -37,8 +37,8 @@ QConcatenateTablesProxyModel* QConcatenateTablesProxyModel_new(); QConcatenateTablesProxyModel* QConcatenateTablesProxyModel_new2(QObject* parent); QMetaObject* QConcatenateTablesProxyModel_MetaObject(const QConcatenateTablesProxyModel* self); void* QConcatenateTablesProxyModel_Metacast(QConcatenateTablesProxyModel* self, const char* param1); -struct miqt_string* QConcatenateTablesProxyModel_Tr(const char* s); -struct miqt_string* QConcatenateTablesProxyModel_TrUtf8(const char* s); +struct miqt_string QConcatenateTablesProxyModel_Tr(const char* s); +struct miqt_string QConcatenateTablesProxyModel_TrUtf8(const char* s); struct miqt_array* QConcatenateTablesProxyModel_SourceModels(const QConcatenateTablesProxyModel* self); void QConcatenateTablesProxyModel_AddSourceModel(QConcatenateTablesProxyModel* self, QAbstractItemModel* sourceModel); void QConcatenateTablesProxyModel_RemoveSourceModel(QConcatenateTablesProxyModel* self, QAbstractItemModel* sourceModel); @@ -57,10 +57,10 @@ QMimeData* QConcatenateTablesProxyModel_MimeData(const QConcatenateTablesProxyMo bool QConcatenateTablesProxyModel_CanDropMimeData(const QConcatenateTablesProxyModel* self, QMimeData* data, int action, int row, int column, QModelIndex* parent); bool QConcatenateTablesProxyModel_DropMimeData(QConcatenateTablesProxyModel* self, QMimeData* data, int action, int row, int column, QModelIndex* parent); QSize* QConcatenateTablesProxyModel_Span(const QConcatenateTablesProxyModel* self, QModelIndex* index); -struct miqt_string* QConcatenateTablesProxyModel_Tr2(const char* s, const char* c); -struct miqt_string* QConcatenateTablesProxyModel_Tr3(const char* s, const char* c, int n); -struct miqt_string* QConcatenateTablesProxyModel_TrUtf82(const char* s, const char* c); -struct miqt_string* QConcatenateTablesProxyModel_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QConcatenateTablesProxyModel_Tr2(const char* s, const char* c); +struct miqt_string QConcatenateTablesProxyModel_Tr3(const char* s, const char* c, int n); +struct miqt_string QConcatenateTablesProxyModel_TrUtf82(const char* s, const char* c); +struct miqt_string QConcatenateTablesProxyModel_TrUtf83(const char* s, const char* c, int n); QVariant* QConcatenateTablesProxyModel_Data2(const QConcatenateTablesProxyModel* self, QModelIndex* index, int role); bool QConcatenateTablesProxyModel_SetData3(QConcatenateTablesProxyModel* self, QModelIndex* index, QVariant* value, int role); QModelIndex* QConcatenateTablesProxyModel_Index3(const QConcatenateTablesProxyModel* self, int row, int column, QModelIndex* parent); diff --git a/qt/gen_qcoreapplication.cpp b/qt/gen_qcoreapplication.cpp index 1d77a725..b1640a25 100644 --- a/qt/gen_qcoreapplication.cpp +++ b/qt/gen_qcoreapplication.cpp @@ -29,29 +29,41 @@ void* QCoreApplication_Metacast(QCoreApplication* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QCoreApplication_Tr(const char* s) { +struct miqt_string QCoreApplication_Tr(const char* s) { QString _ret = QCoreApplication::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QCoreApplication_TrUtf8(const char* s) { +struct miqt_string QCoreApplication_TrUtf8(const char* s) { QString _ret = QCoreApplication::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } struct miqt_array* QCoreApplication_Arguments() { QStringList _ret = QCoreApplication::arguments(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -67,52 +79,68 @@ bool QCoreApplication_TestAttribute(int attribute) { return QCoreApplication::testAttribute(static_cast(attribute)); } -void QCoreApplication_SetOrganizationDomain(struct miqt_string* orgDomain) { - QString orgDomain_QString = QString::fromUtf8(&orgDomain->data, orgDomain->len); +void QCoreApplication_SetOrganizationDomain(struct miqt_string orgDomain) { + QString orgDomain_QString = QString::fromUtf8(orgDomain.data, orgDomain.len); QCoreApplication::setOrganizationDomain(orgDomain_QString); } -struct miqt_string* QCoreApplication_OrganizationDomain() { +struct miqt_string QCoreApplication_OrganizationDomain() { QString _ret = QCoreApplication::organizationDomain(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QCoreApplication_SetOrganizationName(struct miqt_string* orgName) { - QString orgName_QString = QString::fromUtf8(&orgName->data, orgName->len); +void QCoreApplication_SetOrganizationName(struct miqt_string orgName) { + QString orgName_QString = QString::fromUtf8(orgName.data, orgName.len); QCoreApplication::setOrganizationName(orgName_QString); } -struct miqt_string* QCoreApplication_OrganizationName() { +struct miqt_string QCoreApplication_OrganizationName() { QString _ret = QCoreApplication::organizationName(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QCoreApplication_SetApplicationName(struct miqt_string* application) { - QString application_QString = QString::fromUtf8(&application->data, application->len); +void QCoreApplication_SetApplicationName(struct miqt_string application) { + QString application_QString = QString::fromUtf8(application.data, application.len); QCoreApplication::setApplicationName(application_QString); } -struct miqt_string* QCoreApplication_ApplicationName() { +struct miqt_string QCoreApplication_ApplicationName() { QString _ret = QCoreApplication::applicationName(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QCoreApplication_SetApplicationVersion(struct miqt_string* version) { - QString version_QString = QString::fromUtf8(&version->data, version->len); +void QCoreApplication_SetApplicationVersion(struct miqt_string version) { + QString version_QString = QString::fromUtf8(version.data, version.len); QCoreApplication::setApplicationVersion(version_QString); } -struct miqt_string* QCoreApplication_ApplicationVersion() { +struct miqt_string QCoreApplication_ApplicationVersion() { QString _ret = QCoreApplication::applicationVersion(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QCoreApplication_SetSetuidAllowed(bool allow) { @@ -183,18 +211,26 @@ bool QCoreApplication_ClosingDown() { return QCoreApplication::closingDown(); } -struct miqt_string* QCoreApplication_ApplicationDirPath() { +struct miqt_string QCoreApplication_ApplicationDirPath() { QString _ret = QCoreApplication::applicationDirPath(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QCoreApplication_ApplicationFilePath() { +struct miqt_string QCoreApplication_ApplicationFilePath() { QString _ret = QCoreApplication::applicationFilePath(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } long long QCoreApplication_ApplicationPid() { @@ -202,12 +238,12 @@ long long QCoreApplication_ApplicationPid() { return static_cast(_ret); } -void QCoreApplication_SetLibraryPaths(struct miqt_array* /* of struct miqt_string* */ libraryPaths) { +void QCoreApplication_SetLibraryPaths(struct miqt_array* /* of struct miqt_string */ libraryPaths) { QStringList libraryPaths_QList; libraryPaths_QList.reserve(libraryPaths->len); - struct miqt_string** libraryPaths_arr = static_cast(libraryPaths->data); + struct miqt_string* libraryPaths_arr = static_cast(libraryPaths->data); for(size_t i = 0; i < libraryPaths->len; ++i) { - QString libraryPaths_arr_i_QString = QString::fromUtf8(&libraryPaths_arr[i]->data, libraryPaths_arr[i]->len); + QString libraryPaths_arr_i_QString = QString::fromUtf8(libraryPaths_arr[i].data, libraryPaths_arr[i].len); libraryPaths_QList.push_back(libraryPaths_arr_i_QString); } QCoreApplication::setLibraryPaths(libraryPaths_QList); @@ -216,12 +252,16 @@ void QCoreApplication_SetLibraryPaths(struct miqt_array* /* of struct miqt_strin struct miqt_array* QCoreApplication_LibraryPaths() { QStringList _ret = QCoreApplication::libraryPaths(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -229,13 +269,13 @@ struct miqt_array* QCoreApplication_LibraryPaths() { return _out; } -void QCoreApplication_AddLibraryPath(struct miqt_string* param1) { - QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); +void QCoreApplication_AddLibraryPath(struct miqt_string param1) { + QString param1_QString = QString::fromUtf8(param1.data, param1.len); QCoreApplication::addLibraryPath(param1_QString); } -void QCoreApplication_RemoveLibraryPath(struct miqt_string* param1) { - QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); +void QCoreApplication_RemoveLibraryPath(struct miqt_string param1) { + QString param1_QString = QString::fromUtf8(param1.data, param1.len); QCoreApplication::removeLibraryPath(param1_QString); } @@ -247,11 +287,15 @@ bool QCoreApplication_RemoveTranslator(QTranslator* messageFile) { return QCoreApplication::removeTranslator(messageFile); } -struct miqt_string* QCoreApplication_Translate(const char* context, const char* key) { +struct miqt_string QCoreApplication_Translate(const char* context, const char* key) { QString _ret = QCoreApplication::translate(context, key); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QCoreApplication_Flush() { @@ -318,32 +362,48 @@ void QCoreApplication_connect_ApplicationVersionChanged(QCoreApplication* self, }); } -struct miqt_string* QCoreApplication_Tr2(const char* s, const char* c) { +struct miqt_string QCoreApplication_Tr2(const char* s, const char* c) { QString _ret = QCoreApplication::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QCoreApplication_Tr3(const char* s, const char* c, int n) { +struct miqt_string QCoreApplication_Tr3(const char* s, const char* c, int n) { QString _ret = QCoreApplication::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QCoreApplication_TrUtf82(const char* s, const char* c) { +struct miqt_string QCoreApplication_TrUtf82(const char* s, const char* c) { QString _ret = QCoreApplication::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QCoreApplication_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QCoreApplication_TrUtf83(const char* s, const char* c, int n) { QString _ret = QCoreApplication::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QCoreApplication_SetAttribute2(int attribute, bool on) { @@ -374,18 +434,26 @@ void QCoreApplication_RemovePostedEvents2(QObject* receiver, int eventType) { QCoreApplication::removePostedEvents(receiver, static_cast(eventType)); } -struct miqt_string* QCoreApplication_Translate3(const char* context, const char* key, const char* disambiguation) { +struct miqt_string QCoreApplication_Translate3(const char* context, const char* key, const char* disambiguation) { QString _ret = QCoreApplication::translate(context, key, disambiguation); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QCoreApplication_Translate4(const char* context, const char* key, const char* disambiguation, int n) { +struct miqt_string QCoreApplication_Translate4(const char* context, const char* key, const char* disambiguation, int n) { QString _ret = QCoreApplication::translate(context, key, disambiguation, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QCoreApplication_Delete(QCoreApplication* self) { diff --git a/qt/gen_qcoreapplication.go b/qt/gen_qcoreapplication.go index d81539fc..7981fb4b 100644 --- a/qt/gen_qcoreapplication.go +++ b/qt/gen_qcoreapplication.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "runtime/cgo" "unsafe" @@ -84,35 +83,35 @@ func (this *QCoreApplication) MetaObject() *QMetaObject { func (this *QCoreApplication) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QCoreApplication_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QCoreApplication_Metacast(this.h, param1_Cstring)) } func QCoreApplication_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QCoreApplication_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCoreApplication_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QCoreApplication_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QCoreApplication_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCoreApplication_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QCoreApplication_Arguments() []string { var _ma *C.struct_miqt_array = C.QCoreApplication_Arguments() _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -128,54 +127,62 @@ func QCoreApplication_TestAttribute(attribute ApplicationAttribute) bool { } func QCoreApplication_SetOrganizationDomain(orgDomain string) { - orgDomain_ms := libmiqt.Strdupg(orgDomain) - defer C.free(orgDomain_ms) - C.QCoreApplication_SetOrganizationDomain((*C.struct_miqt_string)(orgDomain_ms)) + orgDomain_ms := C.struct_miqt_string{} + orgDomain_ms.data = C.CString(orgDomain) + orgDomain_ms.len = C.size_t(len(orgDomain)) + defer C.free(unsafe.Pointer(orgDomain_ms.data)) + C.QCoreApplication_SetOrganizationDomain(orgDomain_ms) } func QCoreApplication_OrganizationDomain() string { - var _ms *C.struct_miqt_string = C.QCoreApplication_OrganizationDomain() - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCoreApplication_OrganizationDomain() + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QCoreApplication_SetOrganizationName(orgName string) { - orgName_ms := libmiqt.Strdupg(orgName) - defer C.free(orgName_ms) - C.QCoreApplication_SetOrganizationName((*C.struct_miqt_string)(orgName_ms)) + orgName_ms := C.struct_miqt_string{} + orgName_ms.data = C.CString(orgName) + orgName_ms.len = C.size_t(len(orgName)) + defer C.free(unsafe.Pointer(orgName_ms.data)) + C.QCoreApplication_SetOrganizationName(orgName_ms) } func QCoreApplication_OrganizationName() string { - var _ms *C.struct_miqt_string = C.QCoreApplication_OrganizationName() - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCoreApplication_OrganizationName() + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QCoreApplication_SetApplicationName(application string) { - application_ms := libmiqt.Strdupg(application) - defer C.free(application_ms) - C.QCoreApplication_SetApplicationName((*C.struct_miqt_string)(application_ms)) + application_ms := C.struct_miqt_string{} + application_ms.data = C.CString(application) + application_ms.len = C.size_t(len(application)) + defer C.free(unsafe.Pointer(application_ms.data)) + C.QCoreApplication_SetApplicationName(application_ms) } func QCoreApplication_ApplicationName() string { - var _ms *C.struct_miqt_string = C.QCoreApplication_ApplicationName() - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCoreApplication_ApplicationName() + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QCoreApplication_SetApplicationVersion(version string) { - version_ms := libmiqt.Strdupg(version) - defer C.free(version_ms) - C.QCoreApplication_SetApplicationVersion((*C.struct_miqt_string)(version_ms)) + version_ms := C.struct_miqt_string{} + version_ms.data = C.CString(version) + version_ms.len = C.size_t(len(version)) + defer C.free(unsafe.Pointer(version_ms.data)) + C.QCoreApplication_SetApplicationVersion(version_ms) } func QCoreApplication_ApplicationVersion() string { - var _ms *C.struct_miqt_string = C.QCoreApplication_ApplicationVersion() - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCoreApplication_ApplicationVersion() + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -248,16 +255,16 @@ func QCoreApplication_ClosingDown() bool { } func QCoreApplication_ApplicationDirPath() string { - var _ms *C.struct_miqt_string = C.QCoreApplication_ApplicationDirPath() - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCoreApplication_ApplicationDirPath() + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QCoreApplication_ApplicationFilePath() string { - var _ms *C.struct_miqt_string = C.QCoreApplication_ApplicationFilePath() - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCoreApplication_ApplicationFilePath() + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -267,12 +274,14 @@ func QCoreApplication_ApplicationPid() int64 { func QCoreApplication_SetLibraryPaths(libraryPaths []string) { // For the C ABI, malloc a C array of raw pointers - libraryPaths_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(libraryPaths)))) + libraryPaths_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(libraryPaths)))) defer C.free(unsafe.Pointer(libraryPaths_CArray)) for i := range libraryPaths { - libraryPaths_i_ms := libmiqt.Strdupg(libraryPaths[i]) - defer C.free(libraryPaths_i_ms) - libraryPaths_CArray[i] = (*C.struct_miqt_string)(libraryPaths_i_ms) + libraryPaths_i_ms := C.struct_miqt_string{} + libraryPaths_i_ms.data = C.CString(libraryPaths[i]) + libraryPaths_i_ms.len = C.size_t(len(libraryPaths[i])) + defer C.free(unsafe.Pointer(libraryPaths_i_ms.data)) + libraryPaths_CArray[i] = libraryPaths_i_ms } libraryPaths_ma := &C.struct_miqt_array{len: C.size_t(len(libraryPaths)), data: unsafe.Pointer(libraryPaths_CArray)} defer runtime.KeepAlive(unsafe.Pointer(libraryPaths_ma)) @@ -282,11 +291,11 @@ func QCoreApplication_SetLibraryPaths(libraryPaths []string) { func QCoreApplication_LibraryPaths() []string { var _ma *C.struct_miqt_array = C.QCoreApplication_LibraryPaths() _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -294,15 +303,19 @@ func QCoreApplication_LibraryPaths() []string { } func QCoreApplication_AddLibraryPath(param1 string) { - param1_ms := libmiqt.Strdupg(param1) - defer C.free(param1_ms) - C.QCoreApplication_AddLibraryPath((*C.struct_miqt_string)(param1_ms)) + param1_ms := C.struct_miqt_string{} + param1_ms.data = C.CString(param1) + param1_ms.len = C.size_t(len(param1)) + defer C.free(unsafe.Pointer(param1_ms.data)) + C.QCoreApplication_AddLibraryPath(param1_ms) } func QCoreApplication_RemoveLibraryPath(param1 string) { - param1_ms := libmiqt.Strdupg(param1) - defer C.free(param1_ms) - C.QCoreApplication_RemoveLibraryPath((*C.struct_miqt_string)(param1_ms)) + param1_ms := C.struct_miqt_string{} + param1_ms.data = C.CString(param1) + param1_ms.len = C.size_t(len(param1)) + defer C.free(unsafe.Pointer(param1_ms.data)) + C.QCoreApplication_RemoveLibraryPath(param1_ms) } func QCoreApplication_InstallTranslator(messageFile *QTranslator) bool { @@ -318,9 +331,9 @@ func QCoreApplication_Translate(context string, key string) string { defer C.free(unsafe.Pointer(context_Cstring)) key_Cstring := C.CString(key) defer C.free(unsafe.Pointer(key_Cstring)) - var _ms *C.struct_miqt_string = C.QCoreApplication_Translate(context_Cstring, key_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCoreApplication_Translate(context_Cstring, key_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -421,9 +434,9 @@ func QCoreApplication_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QCoreApplication_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCoreApplication_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -432,9 +445,9 @@ func QCoreApplication_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QCoreApplication_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCoreApplication_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -443,9 +456,9 @@ func QCoreApplication_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QCoreApplication_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCoreApplication_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -454,9 +467,9 @@ func QCoreApplication_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QCoreApplication_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCoreApplication_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -495,9 +508,9 @@ func QCoreApplication_Translate3(context string, key string, disambiguation stri defer C.free(unsafe.Pointer(key_Cstring)) disambiguation_Cstring := C.CString(disambiguation) defer C.free(unsafe.Pointer(disambiguation_Cstring)) - var _ms *C.struct_miqt_string = C.QCoreApplication_Translate3(context_Cstring, key_Cstring, disambiguation_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCoreApplication_Translate3(context_Cstring, key_Cstring, disambiguation_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -508,9 +521,9 @@ func QCoreApplication_Translate4(context string, key string, disambiguation stri defer C.free(unsafe.Pointer(key_Cstring)) disambiguation_Cstring := C.CString(disambiguation) defer C.free(unsafe.Pointer(disambiguation_Cstring)) - var _ms *C.struct_miqt_string = C.QCoreApplication_Translate4(context_Cstring, key_Cstring, disambiguation_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QCoreApplication_Translate4(context_Cstring, key_Cstring, disambiguation_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qcoreapplication.h b/qt/gen_qcoreapplication.h index 4acfa967..0bfbd7e4 100644 --- a/qt/gen_qcoreapplication.h +++ b/qt/gen_qcoreapplication.h @@ -35,19 +35,19 @@ QCoreApplication* QCoreApplication_new(int* argc, char** argv); QCoreApplication* QCoreApplication_new2(int* argc, char** argv, int param3); QMetaObject* QCoreApplication_MetaObject(const QCoreApplication* self); void* QCoreApplication_Metacast(QCoreApplication* self, const char* param1); -struct miqt_string* QCoreApplication_Tr(const char* s); -struct miqt_string* QCoreApplication_TrUtf8(const char* s); +struct miqt_string QCoreApplication_Tr(const char* s); +struct miqt_string QCoreApplication_TrUtf8(const char* s); struct miqt_array* QCoreApplication_Arguments(); void QCoreApplication_SetAttribute(int attribute); bool QCoreApplication_TestAttribute(int attribute); -void QCoreApplication_SetOrganizationDomain(struct miqt_string* orgDomain); -struct miqt_string* QCoreApplication_OrganizationDomain(); -void QCoreApplication_SetOrganizationName(struct miqt_string* orgName); -struct miqt_string* QCoreApplication_OrganizationName(); -void QCoreApplication_SetApplicationName(struct miqt_string* application); -struct miqt_string* QCoreApplication_ApplicationName(); -void QCoreApplication_SetApplicationVersion(struct miqt_string* version); -struct miqt_string* QCoreApplication_ApplicationVersion(); +void QCoreApplication_SetOrganizationDomain(struct miqt_string orgDomain); +struct miqt_string QCoreApplication_OrganizationDomain(); +void QCoreApplication_SetOrganizationName(struct miqt_string orgName); +struct miqt_string QCoreApplication_OrganizationName(); +void QCoreApplication_SetApplicationName(struct miqt_string application); +struct miqt_string QCoreApplication_ApplicationName(); +void QCoreApplication_SetApplicationVersion(struct miqt_string version); +struct miqt_string QCoreApplication_ApplicationVersion(); void QCoreApplication_SetSetuidAllowed(bool allow); bool QCoreApplication_IsSetuidAllowed(); QCoreApplication* QCoreApplication_Instance(); @@ -65,16 +65,16 @@ void QCoreApplication_SetEventDispatcher(QAbstractEventDispatcher* eventDispatch bool QCoreApplication_Notify(QCoreApplication* self, QObject* param1, QEvent* param2); bool QCoreApplication_StartingUp(); bool QCoreApplication_ClosingDown(); -struct miqt_string* QCoreApplication_ApplicationDirPath(); -struct miqt_string* QCoreApplication_ApplicationFilePath(); +struct miqt_string QCoreApplication_ApplicationDirPath(); +struct miqt_string QCoreApplication_ApplicationFilePath(); long long QCoreApplication_ApplicationPid(); -void QCoreApplication_SetLibraryPaths(struct miqt_array* /* of struct miqt_string* */ libraryPaths); +void QCoreApplication_SetLibraryPaths(struct miqt_array* /* of struct miqt_string */ libraryPaths); struct miqt_array* QCoreApplication_LibraryPaths(); -void QCoreApplication_AddLibraryPath(struct miqt_string* param1); -void QCoreApplication_RemoveLibraryPath(struct miqt_string* param1); +void QCoreApplication_AddLibraryPath(struct miqt_string param1); +void QCoreApplication_RemoveLibraryPath(struct miqt_string param1); bool QCoreApplication_InstallTranslator(QTranslator* messageFile); bool QCoreApplication_RemoveTranslator(QTranslator* messageFile); -struct miqt_string* QCoreApplication_Translate(const char* context, const char* key); +struct miqt_string QCoreApplication_Translate(const char* context, const char* key); void QCoreApplication_Flush(); void QCoreApplication_InstallNativeEventFilter(QCoreApplication* self, QAbstractNativeEventFilter* filterObj); void QCoreApplication_RemoveNativeEventFilter(QCoreApplication* self, QAbstractNativeEventFilter* filterObj); @@ -89,10 +89,10 @@ void QCoreApplication_ApplicationNameChanged(QCoreApplication* self); void QCoreApplication_connect_ApplicationNameChanged(QCoreApplication* self, intptr_t slot); void QCoreApplication_ApplicationVersionChanged(QCoreApplication* self); void QCoreApplication_connect_ApplicationVersionChanged(QCoreApplication* self, intptr_t slot); -struct miqt_string* QCoreApplication_Tr2(const char* s, const char* c); -struct miqt_string* QCoreApplication_Tr3(const char* s, const char* c, int n); -struct miqt_string* QCoreApplication_TrUtf82(const char* s, const char* c); -struct miqt_string* QCoreApplication_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QCoreApplication_Tr2(const char* s, const char* c); +struct miqt_string QCoreApplication_Tr3(const char* s, const char* c, int n); +struct miqt_string QCoreApplication_TrUtf82(const char* s, const char* c); +struct miqt_string QCoreApplication_TrUtf83(const char* s, const char* c, int n); void QCoreApplication_SetAttribute2(int attribute, bool on); void QCoreApplication_ProcessEvents1(int flags); void QCoreApplication_Exit1(int retcode); @@ -100,8 +100,8 @@ void QCoreApplication_PostEvent3(QObject* receiver, QEvent* event, int priority) void QCoreApplication_SendPostedEvents1(QObject* receiver); void QCoreApplication_SendPostedEvents2(QObject* receiver, int event_type); void QCoreApplication_RemovePostedEvents2(QObject* receiver, int eventType); -struct miqt_string* QCoreApplication_Translate3(const char* context, const char* key, const char* disambiguation); -struct miqt_string* QCoreApplication_Translate4(const char* context, const char* key, const char* disambiguation, int n); +struct miqt_string QCoreApplication_Translate3(const char* context, const char* key, const char* disambiguation); +struct miqt_string QCoreApplication_Translate4(const char* context, const char* key, const char* disambiguation, int n); void QCoreApplication_Delete(QCoreApplication* self); #ifdef __cplusplus diff --git a/qt/gen_qcoreevent.cpp b/qt/gen_qcoreevent.cpp index 3f2bf751..6c705148 100644 --- a/qt/gen_qcoreevent.cpp +++ b/qt/gen_qcoreevent.cpp @@ -102,16 +102,22 @@ void QChildEvent_Delete(QChildEvent* self) { delete self; } -QDynamicPropertyChangeEvent* QDynamicPropertyChangeEvent_new(QByteArray* name) { - return new QDynamicPropertyChangeEvent(*name); +QDynamicPropertyChangeEvent* QDynamicPropertyChangeEvent_new(struct miqt_string name) { + QByteArray name_QByteArray(name.data, name.len); + return new QDynamicPropertyChangeEvent(name_QByteArray); } QDynamicPropertyChangeEvent* QDynamicPropertyChangeEvent_new2(QDynamicPropertyChangeEvent* param1) { return new QDynamicPropertyChangeEvent(*param1); } -QByteArray* QDynamicPropertyChangeEvent_PropertyName(const QDynamicPropertyChangeEvent* self) { - return new QByteArray(self->propertyName()); +struct miqt_string QDynamicPropertyChangeEvent_PropertyName(const QDynamicPropertyChangeEvent* self) { + QByteArray _qb = self->propertyName(); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } void QDynamicPropertyChangeEvent_Delete(QDynamicPropertyChangeEvent* self) { diff --git a/qt/gen_qcoreevent.go b/qt/gen_qcoreevent.go index 47bf0856..7bf652e4 100644 --- a/qt/gen_qcoreevent.go +++ b/qt/gen_qcoreevent.go @@ -444,8 +444,11 @@ func UnsafeNewQDynamicPropertyChangeEvent(h unsafe.Pointer) *QDynamicPropertyCha } // NewQDynamicPropertyChangeEvent constructs a new QDynamicPropertyChangeEvent object. -func NewQDynamicPropertyChangeEvent(name *QByteArray) *QDynamicPropertyChangeEvent { - ret := C.QDynamicPropertyChangeEvent_new(name.cPointer()) +func NewQDynamicPropertyChangeEvent(name []byte) *QDynamicPropertyChangeEvent { + name_alias := C.struct_miqt_string{} + name_alias.data = (*C.char)(unsafe.Pointer(&name[0])) + name_alias.len = C.size_t(len(name)) + ret := C.QDynamicPropertyChangeEvent_new(name_alias) return newQDynamicPropertyChangeEvent(ret) } @@ -455,11 +458,11 @@ func NewQDynamicPropertyChangeEvent2(param1 *QDynamicPropertyChangeEvent) *QDyna return newQDynamicPropertyChangeEvent(ret) } -func (this *QDynamicPropertyChangeEvent) PropertyName() *QByteArray { - _ret := C.QDynamicPropertyChangeEvent_PropertyName(this.h) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QDynamicPropertyChangeEvent) PropertyName() []byte { + var _bytearray C.struct_miqt_string = C.QDynamicPropertyChangeEvent_PropertyName(this.h) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } // Delete this object from C++ memory. diff --git a/qt/gen_qcoreevent.h b/qt/gen_qcoreevent.h index dc98051c..f767a56c 100644 --- a/qt/gen_qcoreevent.h +++ b/qt/gen_qcoreevent.h @@ -57,9 +57,9 @@ bool QChildEvent_Polished(const QChildEvent* self); bool QChildEvent_Removed(const QChildEvent* self); void QChildEvent_Delete(QChildEvent* self); -QDynamicPropertyChangeEvent* QDynamicPropertyChangeEvent_new(QByteArray* name); +QDynamicPropertyChangeEvent* QDynamicPropertyChangeEvent_new(struct miqt_string name); QDynamicPropertyChangeEvent* QDynamicPropertyChangeEvent_new2(QDynamicPropertyChangeEvent* param1); -QByteArray* QDynamicPropertyChangeEvent_PropertyName(const QDynamicPropertyChangeEvent* self); +struct miqt_string QDynamicPropertyChangeEvent_PropertyName(const QDynamicPropertyChangeEvent* self); void QDynamicPropertyChangeEvent_Delete(QDynamicPropertyChangeEvent* self); QDeferredDeleteEvent* QDeferredDeleteEvent_new(); diff --git a/qt/gen_qcryptographichash.cpp b/qt/gen_qcryptographichash.cpp index c9ab3a2e..b2e5bb6b 100644 --- a/qt/gen_qcryptographichash.cpp +++ b/qt/gen_qcryptographichash.cpp @@ -17,20 +17,32 @@ void QCryptographicHash_AddData(QCryptographicHash* self, const char* data, int self->addData(data, static_cast(length)); } -void QCryptographicHash_AddDataWithData(QCryptographicHash* self, QByteArray* data) { - self->addData(*data); +void QCryptographicHash_AddDataWithData(QCryptographicHash* self, struct miqt_string data) { + QByteArray data_QByteArray(data.data, data.len); + self->addData(data_QByteArray); } bool QCryptographicHash_AddDataWithDevice(QCryptographicHash* self, QIODevice* device) { return self->addData(device); } -QByteArray* QCryptographicHash_Result(const QCryptographicHash* self) { - return new QByteArray(self->result()); +struct miqt_string QCryptographicHash_Result(const QCryptographicHash* self) { + QByteArray _qb = self->result(); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } -QByteArray* QCryptographicHash_Hash(QByteArray* data, int method) { - return new QByteArray(QCryptographicHash::hash(*data, static_cast(method))); +struct miqt_string QCryptographicHash_Hash(struct miqt_string data, int method) { + QByteArray data_QByteArray(data.data, data.len); + QByteArray _qb = QCryptographicHash::hash(data_QByteArray, static_cast(method)); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } int QCryptographicHash_HashLength(int method) { diff --git a/qt/gen_qcryptographichash.go b/qt/gen_qcryptographichash.go index 43e8de34..9d1d0248 100644 --- a/qt/gen_qcryptographichash.go +++ b/qt/gen_qcryptographichash.go @@ -82,26 +82,32 @@ func (this *QCryptographicHash) AddData(data string, length int) { C.QCryptographicHash_AddData(this.h, data_Cstring, (C.int)(length)) } -func (this *QCryptographicHash) AddDataWithData(data *QByteArray) { - C.QCryptographicHash_AddDataWithData(this.h, data.cPointer()) +func (this *QCryptographicHash) AddDataWithData(data []byte) { + data_alias := C.struct_miqt_string{} + data_alias.data = (*C.char)(unsafe.Pointer(&data[0])) + data_alias.len = C.size_t(len(data)) + C.QCryptographicHash_AddDataWithData(this.h, data_alias) } func (this *QCryptographicHash) AddDataWithDevice(device *QIODevice) bool { return (bool)(C.QCryptographicHash_AddDataWithDevice(this.h, device.cPointer())) } -func (this *QCryptographicHash) Result() *QByteArray { - _ret := C.QCryptographicHash_Result(this.h) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QCryptographicHash) Result() []byte { + var _bytearray C.struct_miqt_string = C.QCryptographicHash_Result(this.h) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } -func QCryptographicHash_Hash(data *QByteArray, method QCryptographicHash__Algorithm) *QByteArray { - _ret := C.QCryptographicHash_Hash(data.cPointer(), (C.int)(method)) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func QCryptographicHash_Hash(data []byte, method QCryptographicHash__Algorithm) []byte { + data_alias := C.struct_miqt_string{} + data_alias.data = (*C.char)(unsafe.Pointer(&data[0])) + data_alias.len = C.size_t(len(data)) + var _bytearray C.struct_miqt_string = C.QCryptographicHash_Hash(data_alias, (C.int)(method)) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } func QCryptographicHash_HashLength(method QCryptographicHash__Algorithm) int { diff --git a/qt/gen_qcryptographichash.h b/qt/gen_qcryptographichash.h index d5194089..d6da8778 100644 --- a/qt/gen_qcryptographichash.h +++ b/qt/gen_qcryptographichash.h @@ -26,10 +26,10 @@ typedef struct QIODevice QIODevice; QCryptographicHash* QCryptographicHash_new(int method); void QCryptographicHash_Reset(QCryptographicHash* self); void QCryptographicHash_AddData(QCryptographicHash* self, const char* data, int length); -void QCryptographicHash_AddDataWithData(QCryptographicHash* self, QByteArray* data); +void QCryptographicHash_AddDataWithData(QCryptographicHash* self, struct miqt_string data); bool QCryptographicHash_AddDataWithDevice(QCryptographicHash* self, QIODevice* device); -QByteArray* QCryptographicHash_Result(const QCryptographicHash* self); -QByteArray* QCryptographicHash_Hash(QByteArray* data, int method); +struct miqt_string QCryptographicHash_Result(const QCryptographicHash* self); +struct miqt_string QCryptographicHash_Hash(struct miqt_string data, int method); int QCryptographicHash_HashLength(int method); void QCryptographicHash_Delete(QCryptographicHash* self); diff --git a/qt/gen_qdatastream.cpp b/qt/gen_qdatastream.cpp index fa1369de..fcbeb905 100644 --- a/qt/gen_qdatastream.cpp +++ b/qt/gen_qdatastream.cpp @@ -14,12 +14,9 @@ QDataStream* QDataStream_new2(QIODevice* param1) { return new QDataStream(param1); } -QDataStream* QDataStream_new3(QByteArray* param1, int flags) { - return new QDataStream(param1, static_cast(flags)); -} - -QDataStream* QDataStream_new4(QByteArray* param1) { - return new QDataStream(*param1); +QDataStream* QDataStream_new3(struct miqt_string param1) { + QByteArray param1_QByteArray(param1.data, param1.len); + return new QDataStream(param1_QByteArray); } QIODevice* QDataStream_Device(const QDataStream* self) { diff --git a/qt/gen_qdatastream.go b/qt/gen_qdatastream.go index 32aacdb5..11b86d88 100644 --- a/qt/gen_qdatastream.go +++ b/qt/gen_qdatastream.go @@ -116,14 +116,11 @@ func NewQDataStream2(param1 *QIODevice) *QDataStream { } // NewQDataStream3 constructs a new QDataStream object. -func NewQDataStream3(param1 *QByteArray, flags QIODevice__OpenModeFlag) *QDataStream { - ret := C.QDataStream_new3(param1.cPointer(), (C.int)(flags)) - return newQDataStream(ret) -} - -// NewQDataStream4 constructs a new QDataStream object. -func NewQDataStream4(param1 *QByteArray) *QDataStream { - ret := C.QDataStream_new4(param1.cPointer()) +func NewQDataStream3(param1 []byte) *QDataStream { + param1_alias := C.struct_miqt_string{} + param1_alias.data = (*C.char)(unsafe.Pointer(¶m1[0])) + param1_alias.len = C.size_t(len(param1)) + ret := C.QDataStream_new3(param1_alias) return newQDataStream(ret) } diff --git a/qt/gen_qdatastream.h b/qt/gen_qdatastream.h index 932dd137..fe932fae 100644 --- a/qt/gen_qdatastream.h +++ b/qt/gen_qdatastream.h @@ -31,8 +31,7 @@ typedef struct QtPrivate__StreamStateSaver QtPrivate__StreamStateSaver; QDataStream* QDataStream_new(); QDataStream* QDataStream_new2(QIODevice* param1); -QDataStream* QDataStream_new3(QByteArray* param1, int flags); -QDataStream* QDataStream_new4(QByteArray* param1); +QDataStream* QDataStream_new3(struct miqt_string param1); QIODevice* QDataStream_Device(const QDataStream* self); void QDataStream_SetDevice(QDataStream* self, QIODevice* device); void QDataStream_UnsetDevice(QDataStream* self); diff --git a/qt/gen_qdatawidgetmapper.cpp b/qt/gen_qdatawidgetmapper.cpp index fdb0eb99..107c3cba 100644 --- a/qt/gen_qdatawidgetmapper.cpp +++ b/qt/gen_qdatawidgetmapper.cpp @@ -29,18 +29,26 @@ void* QDataWidgetMapper_Metacast(QDataWidgetMapper* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QDataWidgetMapper_Tr(const char* s) { +struct miqt_string QDataWidgetMapper_Tr(const char* s) { QString _ret = QDataWidgetMapper::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDataWidgetMapper_TrUtf8(const char* s) { +struct miqt_string QDataWidgetMapper_TrUtf8(const char* s) { QString _ret = QDataWidgetMapper::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QDataWidgetMapper_SetModel(QDataWidgetMapper* self, QAbstractItemModel* model) { @@ -89,8 +97,9 @@ void QDataWidgetMapper_AddMapping(QDataWidgetMapper* self, QWidget* widget, int self->addMapping(widget, static_cast(section)); } -void QDataWidgetMapper_AddMapping2(QDataWidgetMapper* self, QWidget* widget, int section, QByteArray* propertyName) { - self->addMapping(widget, static_cast(section), *propertyName); +void QDataWidgetMapper_AddMapping2(QDataWidgetMapper* self, QWidget* widget, int section, struct miqt_string propertyName) { + QByteArray propertyName_QByteArray(propertyName.data, propertyName.len); + self->addMapping(widget, static_cast(section), propertyName_QByteArray); } void QDataWidgetMapper_RemoveMapping(QDataWidgetMapper* self, QWidget* widget) { @@ -101,8 +110,13 @@ int QDataWidgetMapper_MappedSection(const QDataWidgetMapper* self, QWidget* widg return self->mappedSection(widget); } -QByteArray* QDataWidgetMapper_MappedPropertyName(const QDataWidgetMapper* self, QWidget* widget) { - return new QByteArray(self->mappedPropertyName(widget)); +struct miqt_string QDataWidgetMapper_MappedPropertyName(const QDataWidgetMapper* self, QWidget* widget) { + QByteArray _qb = self->mappedPropertyName(widget); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } QWidget* QDataWidgetMapper_MappedWidgetAt(const QDataWidgetMapper* self, int section) { @@ -160,32 +174,48 @@ void QDataWidgetMapper_connect_CurrentIndexChanged(QDataWidgetMapper* self, intp }); } -struct miqt_string* QDataWidgetMapper_Tr2(const char* s, const char* c) { +struct miqt_string QDataWidgetMapper_Tr2(const char* s, const char* c) { QString _ret = QDataWidgetMapper::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDataWidgetMapper_Tr3(const char* s, const char* c, int n) { +struct miqt_string QDataWidgetMapper_Tr3(const char* s, const char* c, int n) { QString _ret = QDataWidgetMapper::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDataWidgetMapper_TrUtf82(const char* s, const char* c) { +struct miqt_string QDataWidgetMapper_TrUtf82(const char* s, const char* c) { QString _ret = QDataWidgetMapper::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDataWidgetMapper_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QDataWidgetMapper_TrUtf83(const char* s, const char* c, int n) { QString _ret = QDataWidgetMapper::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QDataWidgetMapper_Delete(QDataWidgetMapper* self) { diff --git a/qt/gen_qdatawidgetmapper.go b/qt/gen_qdatawidgetmapper.go index aa95bd07..58453e4f 100644 --- a/qt/gen_qdatawidgetmapper.go +++ b/qt/gen_qdatawidgetmapper.go @@ -70,24 +70,24 @@ func (this *QDataWidgetMapper) MetaObject() *QMetaObject { func (this *QDataWidgetMapper) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QDataWidgetMapper_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QDataWidgetMapper_Metacast(this.h, param1_Cstring)) } func QDataWidgetMapper_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QDataWidgetMapper_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDataWidgetMapper_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QDataWidgetMapper_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QDataWidgetMapper_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDataWidgetMapper_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -138,8 +138,11 @@ func (this *QDataWidgetMapper) AddMapping(widget *QWidget, section int) { C.QDataWidgetMapper_AddMapping(this.h, widget.cPointer(), (C.int)(section)) } -func (this *QDataWidgetMapper) AddMapping2(widget *QWidget, section int, propertyName *QByteArray) { - C.QDataWidgetMapper_AddMapping2(this.h, widget.cPointer(), (C.int)(section), propertyName.cPointer()) +func (this *QDataWidgetMapper) AddMapping2(widget *QWidget, section int, propertyName []byte) { + propertyName_alias := C.struct_miqt_string{} + propertyName_alias.data = (*C.char)(unsafe.Pointer(&propertyName[0])) + propertyName_alias.len = C.size_t(len(propertyName)) + C.QDataWidgetMapper_AddMapping2(this.h, widget.cPointer(), (C.int)(section), propertyName_alias) } func (this *QDataWidgetMapper) RemoveMapping(widget *QWidget) { @@ -150,11 +153,11 @@ func (this *QDataWidgetMapper) MappedSection(widget *QWidget) int { return (int)(C.QDataWidgetMapper_MappedSection(this.h, widget.cPointer())) } -func (this *QDataWidgetMapper) MappedPropertyName(widget *QWidget) *QByteArray { - _ret := C.QDataWidgetMapper_MappedPropertyName(this.h, widget.cPointer()) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QDataWidgetMapper) MappedPropertyName(widget *QWidget) []byte { + var _bytearray C.struct_miqt_string = C.QDataWidgetMapper_MappedPropertyName(this.h, widget.cPointer()) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } func (this *QDataWidgetMapper) MappedWidgetAt(section int) *QWidget { @@ -226,9 +229,9 @@ func QDataWidgetMapper_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDataWidgetMapper_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDataWidgetMapper_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -237,9 +240,9 @@ func QDataWidgetMapper_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDataWidgetMapper_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDataWidgetMapper_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -248,9 +251,9 @@ func QDataWidgetMapper_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDataWidgetMapper_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDataWidgetMapper_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -259,9 +262,9 @@ func QDataWidgetMapper_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDataWidgetMapper_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDataWidgetMapper_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qdatawidgetmapper.h b/qt/gen_qdatawidgetmapper.h index db84f927..fce289a8 100644 --- a/qt/gen_qdatawidgetmapper.h +++ b/qt/gen_qdatawidgetmapper.h @@ -37,8 +37,8 @@ QDataWidgetMapper* QDataWidgetMapper_new(); QDataWidgetMapper* QDataWidgetMapper_new2(QObject* parent); QMetaObject* QDataWidgetMapper_MetaObject(const QDataWidgetMapper* self); void* QDataWidgetMapper_Metacast(QDataWidgetMapper* self, const char* param1); -struct miqt_string* QDataWidgetMapper_Tr(const char* s); -struct miqt_string* QDataWidgetMapper_TrUtf8(const char* s); +struct miqt_string QDataWidgetMapper_Tr(const char* s); +struct miqt_string QDataWidgetMapper_TrUtf8(const char* s); void QDataWidgetMapper_SetModel(QDataWidgetMapper* self, QAbstractItemModel* model); QAbstractItemModel* QDataWidgetMapper_Model(const QDataWidgetMapper* self); void QDataWidgetMapper_SetItemDelegate(QDataWidgetMapper* self, QAbstractItemDelegate* delegate); @@ -50,10 +50,10 @@ int QDataWidgetMapper_Orientation(const QDataWidgetMapper* self); void QDataWidgetMapper_SetSubmitPolicy(QDataWidgetMapper* self, int policy); int QDataWidgetMapper_SubmitPolicy(const QDataWidgetMapper* self); void QDataWidgetMapper_AddMapping(QDataWidgetMapper* self, QWidget* widget, int section); -void QDataWidgetMapper_AddMapping2(QDataWidgetMapper* self, QWidget* widget, int section, QByteArray* propertyName); +void QDataWidgetMapper_AddMapping2(QDataWidgetMapper* self, QWidget* widget, int section, struct miqt_string propertyName); void QDataWidgetMapper_RemoveMapping(QDataWidgetMapper* self, QWidget* widget); int QDataWidgetMapper_MappedSection(const QDataWidgetMapper* self, QWidget* widget); -QByteArray* QDataWidgetMapper_MappedPropertyName(const QDataWidgetMapper* self, QWidget* widget); +struct miqt_string QDataWidgetMapper_MappedPropertyName(const QDataWidgetMapper* self, QWidget* widget); QWidget* QDataWidgetMapper_MappedWidgetAt(const QDataWidgetMapper* self, int section); void QDataWidgetMapper_ClearMapping(QDataWidgetMapper* self); int QDataWidgetMapper_CurrentIndex(const QDataWidgetMapper* self); @@ -67,10 +67,10 @@ void QDataWidgetMapper_SetCurrentIndex(QDataWidgetMapper* self, int index); void QDataWidgetMapper_SetCurrentModelIndex(QDataWidgetMapper* self, QModelIndex* index); void QDataWidgetMapper_CurrentIndexChanged(QDataWidgetMapper* self, int index); void QDataWidgetMapper_connect_CurrentIndexChanged(QDataWidgetMapper* self, intptr_t slot); -struct miqt_string* QDataWidgetMapper_Tr2(const char* s, const char* c); -struct miqt_string* QDataWidgetMapper_Tr3(const char* s, const char* c, int n); -struct miqt_string* QDataWidgetMapper_TrUtf82(const char* s, const char* c); -struct miqt_string* QDataWidgetMapper_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QDataWidgetMapper_Tr2(const char* s, const char* c); +struct miqt_string QDataWidgetMapper_Tr3(const char* s, const char* c, int n); +struct miqt_string QDataWidgetMapper_TrUtf82(const char* s, const char* c); +struct miqt_string QDataWidgetMapper_TrUtf83(const char* s, const char* c, int n); void QDataWidgetMapper_Delete(QDataWidgetMapper* self); #ifdef __cplusplus diff --git a/qt/gen_qdatetime.cpp b/qt/gen_qdatetime.cpp index aabc96bf..b96999df 100644 --- a/qt/gen_qdatetime.cpp +++ b/qt/gen_qdatetime.cpp @@ -110,62 +110,94 @@ QDateTime* QDate_EndOfDayWithZone(const QDate* self, QTimeZone* zone) { return new QDateTime(self->endOfDay(*zone)); } -struct miqt_string* QDate_ShortMonthName(int month) { +struct miqt_string QDate_ShortMonthName(int month) { QString _ret = QDate::shortMonthName(static_cast(month)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDate_ShortDayName(int weekday) { +struct miqt_string QDate_ShortDayName(int weekday) { QString _ret = QDate::shortDayName(static_cast(weekday)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDate_LongMonthName(int month) { +struct miqt_string QDate_LongMonthName(int month) { QString _ret = QDate::longMonthName(static_cast(month)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDate_LongDayName(int weekday) { +struct miqt_string QDate_LongDayName(int weekday) { QString _ret = QDate::longDayName(static_cast(weekday)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDate_ToString(const QDate* self) { +struct miqt_string QDate_ToString(const QDate* self) { QString _ret = self->toString(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDate_ToString2(const QDate* self, int format, QCalendar* cal) { +struct miqt_string QDate_ToString2(const QDate* self, int format, QCalendar* cal) { QString _ret = self->toString(static_cast(format), *cal); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDate_ToStringWithFormat(const QDate* self, struct miqt_string* format) { - QString format_QString = QString::fromUtf8(&format->data, format->len); +struct miqt_string QDate_ToStringWithFormat(const QDate* self, struct miqt_string format) { + QString format_QString = QString::fromUtf8(format.data, format.len); QString _ret = self->toString(format_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDate_ToString3(const QDate* self, struct miqt_string* format, QCalendar* cal) { - QString format_QString = QString::fromUtf8(&format->data, format->len); +struct miqt_string QDate_ToString3(const QDate* self, struct miqt_string format, QCalendar* cal) { + QString format_QString = QString::fromUtf8(format.data, format.len); QString _ret = self->toString(format_QString, *cal); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } bool QDate_SetDate(QDate* self, int year, int month, int day) { @@ -237,20 +269,20 @@ QDate* QDate_CurrentDate() { return new QDate(QDate::currentDate()); } -QDate* QDate_FromString(struct miqt_string* s) { - QString s_QString = QString::fromUtf8(&s->data, s->len); +QDate* QDate_FromString(struct miqt_string s) { + QString s_QString = QString::fromUtf8(s.data, s.len); return new QDate(QDate::fromString(s_QString)); } -QDate* QDate_FromString2(struct miqt_string* s, struct miqt_string* format) { - QString s_QString = QString::fromUtf8(&s->data, s->len); - QString format_QString = QString::fromUtf8(&format->data, format->len); +QDate* QDate_FromString2(struct miqt_string s, struct miqt_string format) { + QString s_QString = QString::fromUtf8(s.data, s.len); + QString format_QString = QString::fromUtf8(format.data, format.len); return new QDate(QDate::fromString(s_QString, format_QString)); } -QDate* QDate_FromString3(struct miqt_string* s, struct miqt_string* format, QCalendar* cal) { - QString s_QString = QString::fromUtf8(&s->data, s->len); - QString format_QString = QString::fromUtf8(&format->data, format->len); +QDate* QDate_FromString3(struct miqt_string s, struct miqt_string format, QCalendar* cal) { + QString s_QString = QString::fromUtf8(s.data, s.len); + QString format_QString = QString::fromUtf8(format.data, format.len); return new QDate(QDate::fromString(s_QString, format_QString, *cal)); } @@ -291,43 +323,63 @@ QDateTime* QDate_EndOfDay2(const QDate* self, int spec, int offsetSeconds) { return new QDateTime(self->endOfDay(static_cast(spec), static_cast(offsetSeconds))); } -struct miqt_string* QDate_ShortMonthName2(int month, int typeVal) { +struct miqt_string QDate_ShortMonthName2(int month, int typeVal) { QString _ret = QDate::shortMonthName(static_cast(month), static_cast(typeVal)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDate_ShortDayName2(int weekday, int typeVal) { +struct miqt_string QDate_ShortDayName2(int weekday, int typeVal) { QString _ret = QDate::shortDayName(static_cast(weekday), static_cast(typeVal)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDate_LongMonthName2(int month, int typeVal) { +struct miqt_string QDate_LongMonthName2(int month, int typeVal) { QString _ret = QDate::longMonthName(static_cast(month), static_cast(typeVal)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDate_LongDayName2(int weekday, int typeVal) { +struct miqt_string QDate_LongDayName2(int weekday, int typeVal) { QString _ret = QDate::longDayName(static_cast(weekday), static_cast(typeVal)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDate_ToString1(const QDate* self, int format) { +struct miqt_string QDate_ToString1(const QDate* self, int format) { QString _ret = self->toString(static_cast(format)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -QDate* QDate_FromString22(struct miqt_string* s, int f) { - QString s_QString = QString::fromUtf8(&s->data, s->len); +QDate* QDate_FromString22(struct miqt_string s, int f) { + QString s_QString = QString::fromUtf8(s.data, s.len); return new QDate(QDate::fromString(s_QString, static_cast(f))); } @@ -379,19 +431,27 @@ int QTime_Msec(const QTime* self) { return self->msec(); } -struct miqt_string* QTime_ToString(const QTime* self) { +struct miqt_string QTime_ToString(const QTime* self) { QString _ret = self->toString(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTime_ToStringWithFormat(const QTime* self, struct miqt_string* format) { - QString format_QString = QString::fromUtf8(&format->data, format->len); +struct miqt_string QTime_ToStringWithFormat(const QTime* self, struct miqt_string format) { + QString format_QString = QString::fromUtf8(format.data, format.len); QString _ret = self->toString(format_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } bool QTime_SetHMS(QTime* self, int h, int m, int s) { @@ -450,14 +510,14 @@ QTime* QTime_CurrentTime() { return new QTime(QTime::currentTime()); } -QTime* QTime_FromString(struct miqt_string* s) { - QString s_QString = QString::fromUtf8(&s->data, s->len); +QTime* QTime_FromString(struct miqt_string s) { + QString s_QString = QString::fromUtf8(s.data, s.len); return new QTime(QTime::fromString(s_QString)); } -QTime* QTime_FromString2(struct miqt_string* s, struct miqt_string* format) { - QString s_QString = QString::fromUtf8(&s->data, s->len); - QString format_QString = QString::fromUtf8(&format->data, format->len); +QTime* QTime_FromString2(struct miqt_string s, struct miqt_string format) { + QString s_QString = QString::fromUtf8(s.data, s.len); + QString format_QString = QString::fromUtf8(format.data, format.len); return new QTime(QTime::fromString(s_QString, format_QString)); } @@ -477,19 +537,23 @@ int QTime_Elapsed(const QTime* self) { return self->elapsed(); } -struct miqt_string* QTime_ToString1(const QTime* self, int f) { +struct miqt_string QTime_ToString1(const QTime* self, int f) { QString _ret = self->toString(static_cast(f)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } bool QTime_SetHMS4(QTime* self, int h, int m, int s, int ms) { return self->setHMS(static_cast(h), static_cast(m), static_cast(s), static_cast(ms)); } -QTime* QTime_FromString22(struct miqt_string* s, int f) { - QString s_QString = QString::fromUtf8(&s->data, s->len); +QTime* QTime_FromString22(struct miqt_string s, int f) { + QString s_QString = QString::fromUtf8(s.data, s.len); return new QTime(QTime::fromString(s_QString, static_cast(f))); } @@ -562,11 +626,15 @@ QTimeZone* QDateTime_TimeZone(const QDateTime* self) { return new QTimeZone(self->timeZone()); } -struct miqt_string* QDateTime_TimeZoneAbbreviation(const QDateTime* self) { +struct miqt_string QDateTime_TimeZoneAbbreviation(const QDateTime* self) { QString _ret = self->timeZoneAbbreviation(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } bool QDateTime_IsDaylightTime(const QDateTime* self) { @@ -611,27 +679,39 @@ void QDateTime_SetSecsSinceEpoch(QDateTime* self, long long secs) { self->setSecsSinceEpoch(static_cast(secs)); } -struct miqt_string* QDateTime_ToString(const QDateTime* self) { +struct miqt_string QDateTime_ToString(const QDateTime* self) { QString _ret = self->toString(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDateTime_ToStringWithFormat(const QDateTime* self, struct miqt_string* format) { - QString format_QString = QString::fromUtf8(&format->data, format->len); +struct miqt_string QDateTime_ToStringWithFormat(const QDateTime* self, struct miqt_string format) { + QString format_QString = QString::fromUtf8(format.data, format.len); QString _ret = self->toString(format_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDateTime_ToString2(const QDateTime* self, struct miqt_string* format, QCalendar* cal) { - QString format_QString = QString::fromUtf8(&format->data, format->len); +struct miqt_string QDateTime_ToString2(const QDateTime* self, struct miqt_string format, QCalendar* cal) { + QString format_QString = QString::fromUtf8(format.data, format.len); QString _ret = self->toString(format_QString, *cal); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QDateTime* QDateTime_AddDays(const QDateTime* self, long long days) { @@ -729,20 +809,20 @@ QDateTime* QDateTime_CurrentDateTimeUtc() { return new QDateTime(QDateTime::currentDateTimeUtc()); } -QDateTime* QDateTime_FromString(struct miqt_string* s) { - QString s_QString = QString::fromUtf8(&s->data, s->len); +QDateTime* QDateTime_FromString(struct miqt_string s) { + QString s_QString = QString::fromUtf8(s.data, s.len); return new QDateTime(QDateTime::fromString(s_QString)); } -QDateTime* QDateTime_FromString2(struct miqt_string* s, struct miqt_string* format) { - QString s_QString = QString::fromUtf8(&s->data, s->len); - QString format_QString = QString::fromUtf8(&format->data, format->len); +QDateTime* QDateTime_FromString2(struct miqt_string s, struct miqt_string format) { + QString s_QString = QString::fromUtf8(s.data, s.len); + QString format_QString = QString::fromUtf8(format.data, format.len); return new QDateTime(QDateTime::fromString(s_QString, format_QString)); } -QDateTime* QDateTime_FromString3(struct miqt_string* s, struct miqt_string* format, QCalendar* cal) { - QString s_QString = QString::fromUtf8(&s->data, s->len); - QString format_QString = QString::fromUtf8(&format->data, format->len); +QDateTime* QDateTime_FromString3(struct miqt_string s, struct miqt_string format, QCalendar* cal) { + QString s_QString = QString::fromUtf8(s.data, s.len); + QString format_QString = QString::fromUtf8(format.data, format.len); return new QDateTime(QDateTime::fromString(s_QString, format_QString, *cal)); } @@ -797,15 +877,19 @@ long long QDateTime_CurrentSecsSinceEpoch() { return static_cast(_ret); } -struct miqt_string* QDateTime_ToString1(const QDateTime* self, int format) { +struct miqt_string QDateTime_ToString1(const QDateTime* self, int format) { QString _ret = self->toString(static_cast(format)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -QDateTime* QDateTime_FromString22(struct miqt_string* s, int f) { - QString s_QString = QString::fromUtf8(&s->data, s->len); +QDateTime* QDateTime_FromString22(struct miqt_string s, int f) { + QString s_QString = QString::fromUtf8(s.data, s.len); return new QDateTime(QDateTime::fromString(s_QString, static_cast(f))); } diff --git a/qt/gen_qdatetime.go b/qt/gen_qdatetime.go index 0ca2aa82..93e0acf4 100644 --- a/qt/gen_qdatetime.go +++ b/qt/gen_qdatetime.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -178,62 +177,66 @@ func (this *QDate) EndOfDayWithZone(zone *QTimeZone) *QDateTime { } func QDate_ShortMonthName(month int) string { - var _ms *C.struct_miqt_string = C.QDate_ShortMonthName((C.int)(month)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDate_ShortMonthName((C.int)(month)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QDate_ShortDayName(weekday int) string { - var _ms *C.struct_miqt_string = C.QDate_ShortDayName((C.int)(weekday)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDate_ShortDayName((C.int)(weekday)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QDate_LongMonthName(month int) string { - var _ms *C.struct_miqt_string = C.QDate_LongMonthName((C.int)(month)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDate_LongMonthName((C.int)(month)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QDate_LongDayName(weekday int) string { - var _ms *C.struct_miqt_string = C.QDate_LongDayName((C.int)(weekday)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDate_LongDayName((C.int)(weekday)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QDate) ToString() string { - var _ms *C.struct_miqt_string = C.QDate_ToString(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDate_ToString(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QDate) ToString2(format DateFormat, cal QCalendar) string { - var _ms *C.struct_miqt_string = C.QDate_ToString2(this.h, (C.int)(format), cal.cPointer()) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDate_ToString2(this.h, (C.int)(format), cal.cPointer()) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QDate) ToStringWithFormat(format string) string { - format_ms := libmiqt.Strdupg(format) - defer C.free(format_ms) - var _ms *C.struct_miqt_string = C.QDate_ToStringWithFormat(this.h, (*C.struct_miqt_string)(format_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + format_ms := C.struct_miqt_string{} + format_ms.data = C.CString(format) + format_ms.len = C.size_t(len(format)) + defer C.free(unsafe.Pointer(format_ms.data)) + var _ms C.struct_miqt_string = C.QDate_ToStringWithFormat(this.h, format_ms) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QDate) ToString3(format string, cal QCalendar) string { - format_ms := libmiqt.Strdupg(format) - defer C.free(format_ms) - var _ms *C.struct_miqt_string = C.QDate_ToString3(this.h, (*C.struct_miqt_string)(format_ms), cal.cPointer()) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + format_ms := C.struct_miqt_string{} + format_ms.data = C.CString(format) + format_ms.len = C.size_t(len(format)) + defer C.free(unsafe.Pointer(format_ms.data)) + var _ms C.struct_miqt_string = C.QDate_ToString3(this.h, format_ms, cal.cPointer()) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -324,31 +327,41 @@ func QDate_CurrentDate() *QDate { } func QDate_FromString(s string) *QDate { - s_ms := libmiqt.Strdupg(s) - defer C.free(s_ms) - _ret := C.QDate_FromString((*C.struct_miqt_string)(s_ms)) + s_ms := C.struct_miqt_string{} + s_ms.data = C.CString(s) + s_ms.len = C.size_t(len(s)) + defer C.free(unsafe.Pointer(s_ms.data)) + _ret := C.QDate_FromString(s_ms) _goptr := newQDate(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func QDate_FromString2(s string, format string) *QDate { - s_ms := libmiqt.Strdupg(s) - defer C.free(s_ms) - format_ms := libmiqt.Strdupg(format) - defer C.free(format_ms) - _ret := C.QDate_FromString2((*C.struct_miqt_string)(s_ms), (*C.struct_miqt_string)(format_ms)) + s_ms := C.struct_miqt_string{} + s_ms.data = C.CString(s) + s_ms.len = C.size_t(len(s)) + defer C.free(unsafe.Pointer(s_ms.data)) + format_ms := C.struct_miqt_string{} + format_ms.data = C.CString(format) + format_ms.len = C.size_t(len(format)) + defer C.free(unsafe.Pointer(format_ms.data)) + _ret := C.QDate_FromString2(s_ms, format_ms) _goptr := newQDate(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func QDate_FromString3(s string, format string, cal QCalendar) *QDate { - s_ms := libmiqt.Strdupg(s) - defer C.free(s_ms) - format_ms := libmiqt.Strdupg(format) - defer C.free(format_ms) - _ret := C.QDate_FromString3((*C.struct_miqt_string)(s_ms), (*C.struct_miqt_string)(format_ms), cal.cPointer()) + s_ms := C.struct_miqt_string{} + s_ms.data = C.CString(s) + s_ms.len = C.size_t(len(s)) + defer C.free(unsafe.Pointer(s_ms.data)) + format_ms := C.struct_miqt_string{} + format_ms.data = C.CString(format) + format_ms.len = C.size_t(len(format)) + defer C.free(unsafe.Pointer(format_ms.data)) + _ret := C.QDate_FromString3(s_ms, format_ms, cal.cPointer()) _goptr := newQDate(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -406,44 +419,46 @@ func (this *QDate) EndOfDay2(spec TimeSpec, offsetSeconds int) *QDateTime { } func QDate_ShortMonthName2(month int, typeVal QDate__MonthNameType) string { - var _ms *C.struct_miqt_string = C.QDate_ShortMonthName2((C.int)(month), (C.int)(typeVal)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDate_ShortMonthName2((C.int)(month), (C.int)(typeVal)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QDate_ShortDayName2(weekday int, typeVal QDate__MonthNameType) string { - var _ms *C.struct_miqt_string = C.QDate_ShortDayName2((C.int)(weekday), (C.int)(typeVal)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDate_ShortDayName2((C.int)(weekday), (C.int)(typeVal)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QDate_LongMonthName2(month int, typeVal QDate__MonthNameType) string { - var _ms *C.struct_miqt_string = C.QDate_LongMonthName2((C.int)(month), (C.int)(typeVal)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDate_LongMonthName2((C.int)(month), (C.int)(typeVal)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QDate_LongDayName2(weekday int, typeVal QDate__MonthNameType) string { - var _ms *C.struct_miqt_string = C.QDate_LongDayName2((C.int)(weekday), (C.int)(typeVal)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDate_LongDayName2((C.int)(weekday), (C.int)(typeVal)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QDate) ToString1(format DateFormat) string { - var _ms *C.struct_miqt_string = C.QDate_ToString1(this.h, (C.int)(format)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDate_ToString1(this.h, (C.int)(format)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QDate_FromString22(s string, f DateFormat) *QDate { - s_ms := libmiqt.Strdupg(s) - defer C.free(s_ms) - _ret := C.QDate_FromString22((*C.struct_miqt_string)(s_ms), (C.int)(f)) + s_ms := C.struct_miqt_string{} + s_ms.data = C.CString(s) + s_ms.len = C.size_t(len(s)) + defer C.free(unsafe.Pointer(s_ms.data)) + _ret := C.QDate_FromString22(s_ms, (C.int)(f)) _goptr := newQDate(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -547,18 +562,20 @@ func (this *QTime) Msec() int { } func (this *QTime) ToString() string { - var _ms *C.struct_miqt_string = C.QTime_ToString(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTime_ToString(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QTime) ToStringWithFormat(format string) string { - format_ms := libmiqt.Strdupg(format) - defer C.free(format_ms) - var _ms *C.struct_miqt_string = C.QTime_ToStringWithFormat(this.h, (*C.struct_miqt_string)(format_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + format_ms := C.struct_miqt_string{} + format_ms.data = C.CString(format) + format_ms.len = C.size_t(len(format)) + defer C.free(unsafe.Pointer(format_ms.data)) + var _ms C.struct_miqt_string = C.QTime_ToStringWithFormat(this.h, format_ms) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -631,20 +648,26 @@ func QTime_CurrentTime() *QTime { } func QTime_FromString(s string) *QTime { - s_ms := libmiqt.Strdupg(s) - defer C.free(s_ms) - _ret := C.QTime_FromString((*C.struct_miqt_string)(s_ms)) + s_ms := C.struct_miqt_string{} + s_ms.data = C.CString(s) + s_ms.len = C.size_t(len(s)) + defer C.free(unsafe.Pointer(s_ms.data)) + _ret := C.QTime_FromString(s_ms) _goptr := newQTime(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func QTime_FromString2(s string, format string) *QTime { - s_ms := libmiqt.Strdupg(s) - defer C.free(s_ms) - format_ms := libmiqt.Strdupg(format) - defer C.free(format_ms) - _ret := C.QTime_FromString2((*C.struct_miqt_string)(s_ms), (*C.struct_miqt_string)(format_ms)) + s_ms := C.struct_miqt_string{} + s_ms.data = C.CString(s) + s_ms.len = C.size_t(len(s)) + defer C.free(unsafe.Pointer(s_ms.data)) + format_ms := C.struct_miqt_string{} + format_ms.data = C.CString(format) + format_ms.len = C.size_t(len(format)) + defer C.free(unsafe.Pointer(format_ms.data)) + _ret := C.QTime_FromString2(s_ms, format_ms) _goptr := newQTime(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -667,9 +690,9 @@ func (this *QTime) Elapsed() int { } func (this *QTime) ToString1(f DateFormat) string { - var _ms *C.struct_miqt_string = C.QTime_ToString1(this.h, (C.int)(f)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTime_ToString1(this.h, (C.int)(f)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -678,9 +701,11 @@ func (this *QTime) SetHMS4(h int, m int, s int, ms int) bool { } func QTime_FromString22(s string, f DateFormat) *QTime { - s_ms := libmiqt.Strdupg(s) - defer C.free(s_ms) - _ret := C.QTime_FromString22((*C.struct_miqt_string)(s_ms), (C.int)(f)) + s_ms := C.struct_miqt_string{} + s_ms.data = C.CString(s) + s_ms.len = C.size_t(len(s)) + defer C.free(unsafe.Pointer(s_ms.data)) + _ret := C.QTime_FromString22(s_ms, (C.int)(f)) _goptr := newQTime(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -815,9 +840,9 @@ func (this *QDateTime) TimeZone() *QTimeZone { } func (this *QDateTime) TimeZoneAbbreviation() string { - var _ms *C.struct_miqt_string = C.QDateTime_TimeZoneAbbreviation(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDateTime_TimeZoneAbbreviation(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -862,27 +887,31 @@ func (this *QDateTime) SetSecsSinceEpoch(secs int64) { } func (this *QDateTime) ToString() string { - var _ms *C.struct_miqt_string = C.QDateTime_ToString(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDateTime_ToString(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QDateTime) ToStringWithFormat(format string) string { - format_ms := libmiqt.Strdupg(format) - defer C.free(format_ms) - var _ms *C.struct_miqt_string = C.QDateTime_ToStringWithFormat(this.h, (*C.struct_miqt_string)(format_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + format_ms := C.struct_miqt_string{} + format_ms.data = C.CString(format) + format_ms.len = C.size_t(len(format)) + defer C.free(unsafe.Pointer(format_ms.data)) + var _ms C.struct_miqt_string = C.QDateTime_ToStringWithFormat(this.h, format_ms) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QDateTime) ToString2(format string, cal QCalendar) string { - format_ms := libmiqt.Strdupg(format) - defer C.free(format_ms) - var _ms *C.struct_miqt_string = C.QDateTime_ToString2(this.h, (*C.struct_miqt_string)(format_ms), cal.cPointer()) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + format_ms := C.struct_miqt_string{} + format_ms.data = C.CString(format) + format_ms.len = C.size_t(len(format)) + defer C.free(unsafe.Pointer(format_ms.data)) + var _ms C.struct_miqt_string = C.QDateTime_ToString2(this.h, format_ms, cal.cPointer()) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -1015,31 +1044,41 @@ func QDateTime_CurrentDateTimeUtc() *QDateTime { } func QDateTime_FromString(s string) *QDateTime { - s_ms := libmiqt.Strdupg(s) - defer C.free(s_ms) - _ret := C.QDateTime_FromString((*C.struct_miqt_string)(s_ms)) + s_ms := C.struct_miqt_string{} + s_ms.data = C.CString(s) + s_ms.len = C.size_t(len(s)) + defer C.free(unsafe.Pointer(s_ms.data)) + _ret := C.QDateTime_FromString(s_ms) _goptr := newQDateTime(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func QDateTime_FromString2(s string, format string) *QDateTime { - s_ms := libmiqt.Strdupg(s) - defer C.free(s_ms) - format_ms := libmiqt.Strdupg(format) - defer C.free(format_ms) - _ret := C.QDateTime_FromString2((*C.struct_miqt_string)(s_ms), (*C.struct_miqt_string)(format_ms)) + s_ms := C.struct_miqt_string{} + s_ms.data = C.CString(s) + s_ms.len = C.size_t(len(s)) + defer C.free(unsafe.Pointer(s_ms.data)) + format_ms := C.struct_miqt_string{} + format_ms.data = C.CString(format) + format_ms.len = C.size_t(len(format)) + defer C.free(unsafe.Pointer(format_ms.data)) + _ret := C.QDateTime_FromString2(s_ms, format_ms) _goptr := newQDateTime(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func QDateTime_FromString3(s string, format string, cal QCalendar) *QDateTime { - s_ms := libmiqt.Strdupg(s) - defer C.free(s_ms) - format_ms := libmiqt.Strdupg(format) - defer C.free(format_ms) - _ret := C.QDateTime_FromString3((*C.struct_miqt_string)(s_ms), (*C.struct_miqt_string)(format_ms), cal.cPointer()) + s_ms := C.struct_miqt_string{} + s_ms.data = C.CString(s) + s_ms.len = C.size_t(len(s)) + defer C.free(unsafe.Pointer(s_ms.data)) + format_ms := C.struct_miqt_string{} + format_ms.data = C.CString(format) + format_ms.len = C.size_t(len(format)) + defer C.free(unsafe.Pointer(format_ms.data)) + _ret := C.QDateTime_FromString3(s_ms, format_ms, cal.cPointer()) _goptr := newQDateTime(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -1118,16 +1157,18 @@ func QDateTime_CurrentSecsSinceEpoch() int64 { } func (this *QDateTime) ToString1(format DateFormat) string { - var _ms *C.struct_miqt_string = C.QDateTime_ToString1(this.h, (C.int)(format)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDateTime_ToString1(this.h, (C.int)(format)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QDateTime_FromString22(s string, f DateFormat) *QDateTime { - s_ms := libmiqt.Strdupg(s) - defer C.free(s_ms) - _ret := C.QDateTime_FromString22((*C.struct_miqt_string)(s_ms), (C.int)(f)) + s_ms := C.struct_miqt_string{} + s_ms.data = C.CString(s) + s_ms.len = C.size_t(len(s)) + defer C.free(unsafe.Pointer(s_ms.data)) + _ret := C.QDateTime_FromString22(s_ms, (C.int)(f)) _goptr := newQDateTime(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr diff --git a/qt/gen_qdatetime.h b/qt/gen_qdatetime.h index 7b097f27..897055a7 100644 --- a/qt/gen_qdatetime.h +++ b/qt/gen_qdatetime.h @@ -52,14 +52,14 @@ QDateTime* QDate_StartOfDay(const QDate* self); QDateTime* QDate_EndOfDay(const QDate* self); QDateTime* QDate_StartOfDayWithZone(const QDate* self, QTimeZone* zone); QDateTime* QDate_EndOfDayWithZone(const QDate* self, QTimeZone* zone); -struct miqt_string* QDate_ShortMonthName(int month); -struct miqt_string* QDate_ShortDayName(int weekday); -struct miqt_string* QDate_LongMonthName(int month); -struct miqt_string* QDate_LongDayName(int weekday); -struct miqt_string* QDate_ToString(const QDate* self); -struct miqt_string* QDate_ToString2(const QDate* self, int format, QCalendar* cal); -struct miqt_string* QDate_ToStringWithFormat(const QDate* self, struct miqt_string* format); -struct miqt_string* QDate_ToString3(const QDate* self, struct miqt_string* format, QCalendar* cal); +struct miqt_string QDate_ShortMonthName(int month); +struct miqt_string QDate_ShortDayName(int weekday); +struct miqt_string QDate_LongMonthName(int month); +struct miqt_string QDate_LongDayName(int weekday); +struct miqt_string QDate_ToString(const QDate* self); +struct miqt_string QDate_ToString2(const QDate* self, int format, QCalendar* cal); +struct miqt_string QDate_ToStringWithFormat(const QDate* self, struct miqt_string format); +struct miqt_string QDate_ToString3(const QDate* self, struct miqt_string format, QCalendar* cal); bool QDate_SetDate(QDate* self, int year, int month, int day); bool QDate_SetDate2(QDate* self, int year, int month, int day, QCalendar* cal); void QDate_GetDate(QDate* self, int* year, int* month, int* day); @@ -77,9 +77,9 @@ bool QDate_OperatorLesserOrEqual(const QDate* self, QDate* other); bool QDate_OperatorGreater(const QDate* self, QDate* other); bool QDate_OperatorGreaterOrEqual(const QDate* self, QDate* other); QDate* QDate_CurrentDate(); -QDate* QDate_FromString(struct miqt_string* s); -QDate* QDate_FromString2(struct miqt_string* s, struct miqt_string* format); -QDate* QDate_FromString3(struct miqt_string* s, struct miqt_string* format, QCalendar* cal); +QDate* QDate_FromString(struct miqt_string s); +QDate* QDate_FromString2(struct miqt_string s, struct miqt_string format); +QDate* QDate_FromString3(struct miqt_string s, struct miqt_string format, QCalendar* cal); bool QDate_IsValid2(int y, int m, int d); bool QDate_IsLeapYear(int year); QDate* QDate_FromJulianDay(long long jd_); @@ -89,12 +89,12 @@ QDateTime* QDate_StartOfDay1(const QDate* self, int spec); QDateTime* QDate_StartOfDay2(const QDate* self, int spec, int offsetSeconds); QDateTime* QDate_EndOfDay1(const QDate* self, int spec); QDateTime* QDate_EndOfDay2(const QDate* self, int spec, int offsetSeconds); -struct miqt_string* QDate_ShortMonthName2(int month, int typeVal); -struct miqt_string* QDate_ShortDayName2(int weekday, int typeVal); -struct miqt_string* QDate_LongMonthName2(int month, int typeVal); -struct miqt_string* QDate_LongDayName2(int weekday, int typeVal); -struct miqt_string* QDate_ToString1(const QDate* self, int format); -QDate* QDate_FromString22(struct miqt_string* s, int f); +struct miqt_string QDate_ShortMonthName2(int month, int typeVal); +struct miqt_string QDate_ShortDayName2(int weekday, int typeVal); +struct miqt_string QDate_LongMonthName2(int month, int typeVal); +struct miqt_string QDate_LongDayName2(int weekday, int typeVal); +struct miqt_string QDate_ToString1(const QDate* self, int format); +QDate* QDate_FromString22(struct miqt_string s, int f); void QDate_Delete(QDate* self); QTime* QTime_new(); @@ -108,8 +108,8 @@ int QTime_Hour(const QTime* self); int QTime_Minute(const QTime* self); int QTime_Second(const QTime* self); int QTime_Msec(const QTime* self); -struct miqt_string* QTime_ToString(const QTime* self); -struct miqt_string* QTime_ToStringWithFormat(const QTime* self, struct miqt_string* format); +struct miqt_string QTime_ToString(const QTime* self); +struct miqt_string QTime_ToStringWithFormat(const QTime* self, struct miqt_string format); bool QTime_SetHMS(QTime* self, int h, int m, int s); QTime* QTime_AddSecs(const QTime* self, int secs); int QTime_SecsTo(const QTime* self, QTime* param1); @@ -124,15 +124,15 @@ bool QTime_OperatorGreaterOrEqual(const QTime* self, QTime* other); QTime* QTime_FromMSecsSinceStartOfDay(int msecs); int QTime_MsecsSinceStartOfDay(const QTime* self); QTime* QTime_CurrentTime(); -QTime* QTime_FromString(struct miqt_string* s); -QTime* QTime_FromString2(struct miqt_string* s, struct miqt_string* format); +QTime* QTime_FromString(struct miqt_string s); +QTime* QTime_FromString2(struct miqt_string s, struct miqt_string format); bool QTime_IsValid2(int h, int m, int s); void QTime_Start(QTime* self); int QTime_Restart(QTime* self); int QTime_Elapsed(const QTime* self); -struct miqt_string* QTime_ToString1(const QTime* self, int f); +struct miqt_string QTime_ToString1(const QTime* self, int f); bool QTime_SetHMS4(QTime* self, int h, int m, int s, int ms); -QTime* QTime_FromString22(struct miqt_string* s, int f); +QTime* QTime_FromString22(struct miqt_string s, int f); bool QTime_IsValid4(int h, int m, int s, int ms); void QTime_Delete(QTime* self); @@ -151,7 +151,7 @@ QTime* QDateTime_Time(const QDateTime* self); int QDateTime_TimeSpec(const QDateTime* self); int QDateTime_OffsetFromUtc(const QDateTime* self); QTimeZone* QDateTime_TimeZone(const QDateTime* self); -struct miqt_string* QDateTime_TimeZoneAbbreviation(const QDateTime* self); +struct miqt_string QDateTime_TimeZoneAbbreviation(const QDateTime* self); bool QDateTime_IsDaylightTime(const QDateTime* self); long long QDateTime_ToMSecsSinceEpoch(const QDateTime* self); long long QDateTime_ToSecsSinceEpoch(const QDateTime* self); @@ -162,9 +162,9 @@ void QDateTime_SetOffsetFromUtc(QDateTime* self, int offsetSeconds); void QDateTime_SetTimeZone(QDateTime* self, QTimeZone* toZone); void QDateTime_SetMSecsSinceEpoch(QDateTime* self, long long msecs); void QDateTime_SetSecsSinceEpoch(QDateTime* self, long long secs); -struct miqt_string* QDateTime_ToString(const QDateTime* self); -struct miqt_string* QDateTime_ToStringWithFormat(const QDateTime* self, struct miqt_string* format); -struct miqt_string* QDateTime_ToString2(const QDateTime* self, struct miqt_string* format, QCalendar* cal); +struct miqt_string QDateTime_ToString(const QDateTime* self); +struct miqt_string QDateTime_ToStringWithFormat(const QDateTime* self, struct miqt_string format); +struct miqt_string QDateTime_ToString2(const QDateTime* self, struct miqt_string format, QCalendar* cal); QDateTime* QDateTime_AddDays(const QDateTime* self, long long days); QDateTime* QDateTime_AddMonths(const QDateTime* self, int months); QDateTime* QDateTime_AddYears(const QDateTime* self, int years); @@ -188,9 +188,9 @@ void QDateTime_SetUtcOffset(QDateTime* self, int seconds); int QDateTime_UtcOffset(const QDateTime* self); QDateTime* QDateTime_CurrentDateTime(); QDateTime* QDateTime_CurrentDateTimeUtc(); -QDateTime* QDateTime_FromString(struct miqt_string* s); -QDateTime* QDateTime_FromString2(struct miqt_string* s, struct miqt_string* format); -QDateTime* QDateTime_FromString3(struct miqt_string* s, struct miqt_string* format, QCalendar* cal); +QDateTime* QDateTime_FromString(struct miqt_string s); +QDateTime* QDateTime_FromString2(struct miqt_string s, struct miqt_string format); +QDateTime* QDateTime_FromString3(struct miqt_string s, struct miqt_string format, QCalendar* cal); unsigned int QDateTime_ToTimeT(const QDateTime* self); void QDateTime_SetTimeT(QDateTime* self, unsigned int secsSince1Jan1970UTC); QDateTime* QDateTime_FromTimeT(unsigned int secsSince1Jan1970UTC); @@ -203,8 +203,8 @@ QDateTime* QDateTime_FromMSecsSinceEpoch3(long long msecs, QTimeZone* timeZone); QDateTime* QDateTime_FromSecsSinceEpoch2(long long secs, QTimeZone* timeZone); long long QDateTime_CurrentMSecsSinceEpoch(); long long QDateTime_CurrentSecsSinceEpoch(); -struct miqt_string* QDateTime_ToString1(const QDateTime* self, int format); -QDateTime* QDateTime_FromString22(struct miqt_string* s, int f); +struct miqt_string QDateTime_ToString1(const QDateTime* self, int format); +QDateTime* QDateTime_FromString22(struct miqt_string s, int f); QDateTime* QDateTime_FromTimeT32(unsigned int secsSince1Jan1970UTC, int spec, int offsetFromUtc); QDateTime* QDateTime_FromMSecsSinceEpoch32(long long msecs, int spec, int offsetFromUtc); QDateTime* QDateTime_FromSecsSinceEpoch22(long long secs, int spe); diff --git a/qt/gen_qdatetimeedit.cpp b/qt/gen_qdatetimeedit.cpp index 896d77db..c7c0f069 100644 --- a/qt/gen_qdatetimeedit.cpp +++ b/qt/gen_qdatetimeedit.cpp @@ -57,18 +57,26 @@ void* QDateTimeEdit_Metacast(QDateTimeEdit* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QDateTimeEdit_Tr(const char* s) { +struct miqt_string QDateTimeEdit_Tr(const char* s) { QString _ret = QDateTimeEdit::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDateTimeEdit_TrUtf8(const char* s) { +struct miqt_string QDateTimeEdit_TrUtf8(const char* s) { QString _ret = QDateTimeEdit::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QDateTime* QDateTimeEdit_DateTime(const QDateTimeEdit* self) { @@ -218,22 +226,30 @@ void QDateTimeEdit_SetSelectedSection(QDateTimeEdit* self, int section) { self->setSelectedSection(static_cast(section)); } -struct miqt_string* QDateTimeEdit_SectionText(const QDateTimeEdit* self, int section) { +struct miqt_string QDateTimeEdit_SectionText(const QDateTimeEdit* self, int section) { QString _ret = self->sectionText(static_cast(section)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDateTimeEdit_DisplayFormat(const QDateTimeEdit* self) { +struct miqt_string QDateTimeEdit_DisplayFormat(const QDateTimeEdit* self) { QString _ret = self->displayFormat(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QDateTimeEdit_SetDisplayFormat(QDateTimeEdit* self, struct miqt_string* format) { - QString format_QString = QString::fromUtf8(&format->data, format->len); +void QDateTimeEdit_SetDisplayFormat(QDateTimeEdit* self, struct miqt_string format) { + QString format_QString = QString::fromUtf8(format.data, format.len); self->setDisplayFormat(format_QString); } @@ -321,32 +337,48 @@ void QDateTimeEdit_SetTime(QDateTimeEdit* self, QTime* time) { self->setTime(*time); } -struct miqt_string* QDateTimeEdit_Tr2(const char* s, const char* c) { +struct miqt_string QDateTimeEdit_Tr2(const char* s, const char* c) { QString _ret = QDateTimeEdit::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDateTimeEdit_Tr3(const char* s, const char* c, int n) { +struct miqt_string QDateTimeEdit_Tr3(const char* s, const char* c, int n) { QString _ret = QDateTimeEdit::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDateTimeEdit_TrUtf82(const char* s, const char* c) { +struct miqt_string QDateTimeEdit_TrUtf82(const char* s, const char* c) { QString _ret = QDateTimeEdit::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDateTimeEdit_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QDateTimeEdit_TrUtf83(const char* s, const char* c, int n) { QString _ret = QDateTimeEdit::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QDateTimeEdit_Delete(QDateTimeEdit* self) { @@ -377,18 +409,26 @@ void* QTimeEdit_Metacast(QTimeEdit* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QTimeEdit_Tr(const char* s) { +struct miqt_string QTimeEdit_Tr(const char* s) { QString _ret = QTimeEdit::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTimeEdit_TrUtf8(const char* s) { +struct miqt_string QTimeEdit_TrUtf8(const char* s) { QString _ret = QTimeEdit::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QTimeEdit_UserTimeChanged(QTimeEdit* self, QTime* time) { @@ -404,32 +444,48 @@ void QTimeEdit_connect_UserTimeChanged(QTimeEdit* self, intptr_t slot) { }); } -struct miqt_string* QTimeEdit_Tr2(const char* s, const char* c) { +struct miqt_string QTimeEdit_Tr2(const char* s, const char* c) { QString _ret = QTimeEdit::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTimeEdit_Tr3(const char* s, const char* c, int n) { +struct miqt_string QTimeEdit_Tr3(const char* s, const char* c, int n) { QString _ret = QTimeEdit::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTimeEdit_TrUtf82(const char* s, const char* c) { +struct miqt_string QTimeEdit_TrUtf82(const char* s, const char* c) { QString _ret = QTimeEdit::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTimeEdit_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QTimeEdit_TrUtf83(const char* s, const char* c, int n) { QString _ret = QTimeEdit::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QTimeEdit_Delete(QTimeEdit* self) { @@ -460,18 +516,26 @@ void* QDateEdit_Metacast(QDateEdit* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QDateEdit_Tr(const char* s) { +struct miqt_string QDateEdit_Tr(const char* s) { QString _ret = QDateEdit::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDateEdit_TrUtf8(const char* s) { +struct miqt_string QDateEdit_TrUtf8(const char* s) { QString _ret = QDateEdit::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QDateEdit_UserDateChanged(QDateEdit* self, QDate* date) { @@ -487,32 +551,48 @@ void QDateEdit_connect_UserDateChanged(QDateEdit* self, intptr_t slot) { }); } -struct miqt_string* QDateEdit_Tr2(const char* s, const char* c) { +struct miqt_string QDateEdit_Tr2(const char* s, const char* c) { QString _ret = QDateEdit::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDateEdit_Tr3(const char* s, const char* c, int n) { +struct miqt_string QDateEdit_Tr3(const char* s, const char* c, int n) { QString _ret = QDateEdit::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDateEdit_TrUtf82(const char* s, const char* c) { +struct miqt_string QDateEdit_TrUtf82(const char* s, const char* c) { QString _ret = QDateEdit::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDateEdit_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QDateEdit_TrUtf83(const char* s, const char* c, int n) { QString _ret = QDateEdit::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QDateEdit_Delete(QDateEdit* self) { diff --git a/qt/gen_qdatetimeedit.go b/qt/gen_qdatetimeedit.go index bf6707cd..c04b712a 100644 --- a/qt/gen_qdatetimeedit.go +++ b/qt/gen_qdatetimeedit.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "runtime/cgo" "unsafe" @@ -116,24 +115,24 @@ func (this *QDateTimeEdit) MetaObject() *QMetaObject { func (this *QDateTimeEdit) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QDateTimeEdit_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QDateTimeEdit_Metacast(this.h, param1_Cstring)) } func QDateTimeEdit_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QDateTimeEdit_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDateTimeEdit_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QDateTimeEdit_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QDateTimeEdit_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDateTimeEdit_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -312,23 +311,25 @@ func (this *QDateTimeEdit) SetSelectedSection(section QDateTimeEdit__Section) { } func (this *QDateTimeEdit) SectionText(section QDateTimeEdit__Section) string { - var _ms *C.struct_miqt_string = C.QDateTimeEdit_SectionText(this.h, (C.int)(section)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDateTimeEdit_SectionText(this.h, (C.int)(section)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QDateTimeEdit) DisplayFormat() string { - var _ms *C.struct_miqt_string = C.QDateTimeEdit_DisplayFormat(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDateTimeEdit_DisplayFormat(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QDateTimeEdit) SetDisplayFormat(format string) { - format_ms := libmiqt.Strdupg(format) - defer C.free(format_ms) - C.QDateTimeEdit_SetDisplayFormat(this.h, (*C.struct_miqt_string)(format_ms)) + format_ms := C.struct_miqt_string{} + format_ms.data = C.CString(format) + format_ms.len = C.size_t(len(format)) + defer C.free(unsafe.Pointer(format_ms.data)) + C.QDateTimeEdit_SetDisplayFormat(this.h, format_ms) } func (this *QDateTimeEdit) CalendarPopup() bool { @@ -443,9 +444,9 @@ func QDateTimeEdit_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDateTimeEdit_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDateTimeEdit_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -454,9 +455,9 @@ func QDateTimeEdit_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDateTimeEdit_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDateTimeEdit_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -465,9 +466,9 @@ func QDateTimeEdit_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDateTimeEdit_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDateTimeEdit_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -476,9 +477,9 @@ func QDateTimeEdit_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDateTimeEdit_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDateTimeEdit_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -557,24 +558,24 @@ func (this *QTimeEdit) MetaObject() *QMetaObject { func (this *QTimeEdit) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QTimeEdit_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QTimeEdit_Metacast(this.h, param1_Cstring)) } func QTimeEdit_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTimeEdit_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTimeEdit_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QTimeEdit_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTimeEdit_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTimeEdit_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -603,9 +604,9 @@ func QTimeEdit_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTimeEdit_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTimeEdit_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -614,9 +615,9 @@ func QTimeEdit_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTimeEdit_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTimeEdit_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -625,9 +626,9 @@ func QTimeEdit_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTimeEdit_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTimeEdit_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -636,9 +637,9 @@ func QTimeEdit_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTimeEdit_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTimeEdit_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -717,24 +718,24 @@ func (this *QDateEdit) MetaObject() *QMetaObject { func (this *QDateEdit) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QDateEdit_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QDateEdit_Metacast(this.h, param1_Cstring)) } func QDateEdit_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QDateEdit_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDateEdit_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QDateEdit_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QDateEdit_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDateEdit_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -763,9 +764,9 @@ func QDateEdit_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDateEdit_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDateEdit_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -774,9 +775,9 @@ func QDateEdit_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDateEdit_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDateEdit_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -785,9 +786,9 @@ func QDateEdit_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDateEdit_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDateEdit_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -796,9 +797,9 @@ func QDateEdit_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDateEdit_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDateEdit_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qdatetimeedit.h b/qt/gen_qdatetimeedit.h index 39f34a68..859e0cd7 100644 --- a/qt/gen_qdatetimeedit.h +++ b/qt/gen_qdatetimeedit.h @@ -51,8 +51,8 @@ QDateTimeEdit* QDateTimeEdit_new7(QDate* d, QWidget* parent); QDateTimeEdit* QDateTimeEdit_new8(QTime* t, QWidget* parent); QMetaObject* QDateTimeEdit_MetaObject(const QDateTimeEdit* self); void* QDateTimeEdit_Metacast(QDateTimeEdit* self, const char* param1); -struct miqt_string* QDateTimeEdit_Tr(const char* s); -struct miqt_string* QDateTimeEdit_TrUtf8(const char* s); +struct miqt_string QDateTimeEdit_Tr(const char* s); +struct miqt_string QDateTimeEdit_TrUtf8(const char* s); QDateTime* QDateTimeEdit_DateTime(const QDateTimeEdit* self); QDate* QDateTimeEdit_Date(const QDateTimeEdit* self); QTime* QDateTimeEdit_Time(const QDateTimeEdit* self); @@ -89,9 +89,9 @@ QCalendarWidget* QDateTimeEdit_CalendarWidget(const QDateTimeEdit* self); void QDateTimeEdit_SetCalendarWidget(QDateTimeEdit* self, QCalendarWidget* calendarWidget); int QDateTimeEdit_SectionCount(const QDateTimeEdit* self); void QDateTimeEdit_SetSelectedSection(QDateTimeEdit* self, int section); -struct miqt_string* QDateTimeEdit_SectionText(const QDateTimeEdit* self, int section); -struct miqt_string* QDateTimeEdit_DisplayFormat(const QDateTimeEdit* self); -void QDateTimeEdit_SetDisplayFormat(QDateTimeEdit* self, struct miqt_string* format); +struct miqt_string QDateTimeEdit_SectionText(const QDateTimeEdit* self, int section); +struct miqt_string QDateTimeEdit_DisplayFormat(const QDateTimeEdit* self); +void QDateTimeEdit_SetDisplayFormat(QDateTimeEdit* self, struct miqt_string format); bool QDateTimeEdit_CalendarPopup(const QDateTimeEdit* self); void QDateTimeEdit_SetCalendarPopup(QDateTimeEdit* self, bool enable); int QDateTimeEdit_TimeSpec(const QDateTimeEdit* self); @@ -109,10 +109,10 @@ void QDateTimeEdit_connect_DateChanged(QDateTimeEdit* self, intptr_t slot); void QDateTimeEdit_SetDateTime(QDateTimeEdit* self, QDateTime* dateTime); void QDateTimeEdit_SetDate(QDateTimeEdit* self, QDate* date); void QDateTimeEdit_SetTime(QDateTimeEdit* self, QTime* time); -struct miqt_string* QDateTimeEdit_Tr2(const char* s, const char* c); -struct miqt_string* QDateTimeEdit_Tr3(const char* s, const char* c, int n); -struct miqt_string* QDateTimeEdit_TrUtf82(const char* s, const char* c); -struct miqt_string* QDateTimeEdit_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QDateTimeEdit_Tr2(const char* s, const char* c); +struct miqt_string QDateTimeEdit_Tr3(const char* s, const char* c, int n); +struct miqt_string QDateTimeEdit_TrUtf82(const char* s, const char* c); +struct miqt_string QDateTimeEdit_TrUtf83(const char* s, const char* c, int n); void QDateTimeEdit_Delete(QDateTimeEdit* self); QTimeEdit* QTimeEdit_new(); @@ -121,14 +121,14 @@ QTimeEdit* QTimeEdit_new3(QWidget* parent); QTimeEdit* QTimeEdit_new4(QTime* time, QWidget* parent); QMetaObject* QTimeEdit_MetaObject(const QTimeEdit* self); void* QTimeEdit_Metacast(QTimeEdit* self, const char* param1); -struct miqt_string* QTimeEdit_Tr(const char* s); -struct miqt_string* QTimeEdit_TrUtf8(const char* s); +struct miqt_string QTimeEdit_Tr(const char* s); +struct miqt_string QTimeEdit_TrUtf8(const char* s); void QTimeEdit_UserTimeChanged(QTimeEdit* self, QTime* time); void QTimeEdit_connect_UserTimeChanged(QTimeEdit* self, intptr_t slot); -struct miqt_string* QTimeEdit_Tr2(const char* s, const char* c); -struct miqt_string* QTimeEdit_Tr3(const char* s, const char* c, int n); -struct miqt_string* QTimeEdit_TrUtf82(const char* s, const char* c); -struct miqt_string* QTimeEdit_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QTimeEdit_Tr2(const char* s, const char* c); +struct miqt_string QTimeEdit_Tr3(const char* s, const char* c, int n); +struct miqt_string QTimeEdit_TrUtf82(const char* s, const char* c); +struct miqt_string QTimeEdit_TrUtf83(const char* s, const char* c, int n); void QTimeEdit_Delete(QTimeEdit* self); QDateEdit* QDateEdit_new(); @@ -137,14 +137,14 @@ QDateEdit* QDateEdit_new3(QWidget* parent); QDateEdit* QDateEdit_new4(QDate* date, QWidget* parent); QMetaObject* QDateEdit_MetaObject(const QDateEdit* self); void* QDateEdit_Metacast(QDateEdit* self, const char* param1); -struct miqt_string* QDateEdit_Tr(const char* s); -struct miqt_string* QDateEdit_TrUtf8(const char* s); +struct miqt_string QDateEdit_Tr(const char* s); +struct miqt_string QDateEdit_TrUtf8(const char* s); void QDateEdit_UserDateChanged(QDateEdit* self, QDate* date); void QDateEdit_connect_UserDateChanged(QDateEdit* self, intptr_t slot); -struct miqt_string* QDateEdit_Tr2(const char* s, const char* c); -struct miqt_string* QDateEdit_Tr3(const char* s, const char* c, int n); -struct miqt_string* QDateEdit_TrUtf82(const char* s, const char* c); -struct miqt_string* QDateEdit_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QDateEdit_Tr2(const char* s, const char* c); +struct miqt_string QDateEdit_Tr3(const char* s, const char* c, int n); +struct miqt_string QDateEdit_TrUtf82(const char* s, const char* c); +struct miqt_string QDateEdit_TrUtf83(const char* s, const char* c, int n); void QDateEdit_Delete(QDateEdit* self); #ifdef __cplusplus diff --git a/qt/gen_qdebug.cpp b/qt/gen_qdebug.cpp index f4e88fc6..68fb8c39 100644 --- a/qt/gen_qdebug.cpp +++ b/qt/gen_qdebug.cpp @@ -175,15 +175,16 @@ QDebug* QDebug_OperatorShiftLeft2(QDebug* self, const char* t) { return &_ret; } -QDebug* QDebug_OperatorShiftLeftWithQString(QDebug* self, struct miqt_string* t) { - QString t_QString = QString::fromUtf8(&t->data, t->len); +QDebug* QDebug_OperatorShiftLeftWithQString(QDebug* self, struct miqt_string t) { + QString t_QString = QString::fromUtf8(t.data, t.len); QDebug& _ret = self->operator<<(t_QString); // Cast returned reference into pointer return &_ret; } -QDebug* QDebug_OperatorShiftLeftWithQByteArray(QDebug* self, QByteArray* t) { - QDebug& _ret = self->operator<<(*t); +QDebug* QDebug_OperatorShiftLeftWithQByteArray(QDebug* self, struct miqt_string t) { + QByteArray t_QByteArray(t.data, t.len); + QDebug& _ret = self->operator<<(t_QByteArray); // Cast returned reference into pointer return &_ret; } diff --git a/qt/gen_qdebug.go b/qt/gen_qdebug.go index 6bf405fa..3c059124 100644 --- a/qt/gen_qdebug.go +++ b/qt/gen_qdebug.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -178,13 +177,18 @@ func (this *QDebug) OperatorShiftLeft2(t string) *QDebug { } func (this *QDebug) OperatorShiftLeftWithQString(t string) *QDebug { - t_ms := libmiqt.Strdupg(t) - defer C.free(t_ms) - return UnsafeNewQDebug(unsafe.Pointer(C.QDebug_OperatorShiftLeftWithQString(this.h, (*C.struct_miqt_string)(t_ms)))) + t_ms := C.struct_miqt_string{} + t_ms.data = C.CString(t) + t_ms.len = C.size_t(len(t)) + defer C.free(unsafe.Pointer(t_ms.data)) + return UnsafeNewQDebug(unsafe.Pointer(C.QDebug_OperatorShiftLeftWithQString(this.h, t_ms))) } -func (this *QDebug) OperatorShiftLeftWithQByteArray(t *QByteArray) *QDebug { - return UnsafeNewQDebug(unsafe.Pointer(C.QDebug_OperatorShiftLeftWithQByteArray(this.h, t.cPointer()))) +func (this *QDebug) OperatorShiftLeftWithQByteArray(t []byte) *QDebug { + t_alias := C.struct_miqt_string{} + t_alias.data = (*C.char)(unsafe.Pointer(&t[0])) + t_alias.len = C.size_t(len(t)) + return UnsafeNewQDebug(unsafe.Pointer(C.QDebug_OperatorShiftLeftWithQByteArray(this.h, t_alias))) } func (this *QDebug) OperatorShiftLeftWithVoid(t unsafe.Pointer) *QDebug { diff --git a/qt/gen_qdebug.h b/qt/gen_qdebug.h index e395ffa4..0f5ee94c 100644 --- a/qt/gen_qdebug.h +++ b/qt/gen_qdebug.h @@ -59,8 +59,8 @@ QDebug* QDebug_OperatorShiftLeftWithQuint64(QDebug* self, unsigned long long t); QDebug* QDebug_OperatorShiftLeftWithFloat(QDebug* self, float t); QDebug* QDebug_OperatorShiftLeftWithDouble(QDebug* self, double t); QDebug* QDebug_OperatorShiftLeft2(QDebug* self, const char* t); -QDebug* QDebug_OperatorShiftLeftWithQString(QDebug* self, struct miqt_string* t); -QDebug* QDebug_OperatorShiftLeftWithQByteArray(QDebug* self, QByteArray* t); +QDebug* QDebug_OperatorShiftLeftWithQString(QDebug* self, struct miqt_string t); +QDebug* QDebug_OperatorShiftLeftWithQByteArray(QDebug* self, struct miqt_string t); QDebug* QDebug_OperatorShiftLeftWithVoid(QDebug* self, const void* t); QDebug* QDebug_MaybeQuote1(QDebug* self, char c); void QDebug_Delete(QDebug* self); diff --git a/qt/gen_qdesktopservices.cpp b/qt/gen_qdesktopservices.cpp index 9511f1a8..770279bb 100644 --- a/qt/gen_qdesktopservices.cpp +++ b/qt/gen_qdesktopservices.cpp @@ -12,13 +12,13 @@ bool QDesktopServices_OpenUrl(QUrl* url) { return QDesktopServices::openUrl(*url); } -void QDesktopServices_SetUrlHandler(struct miqt_string* scheme, QObject* receiver, const char* method) { - QString scheme_QString = QString::fromUtf8(&scheme->data, scheme->len); +void QDesktopServices_SetUrlHandler(struct miqt_string scheme, QObject* receiver, const char* method) { + QString scheme_QString = QString::fromUtf8(scheme.data, scheme.len); QDesktopServices::setUrlHandler(scheme_QString, receiver, method); } -void QDesktopServices_UnsetUrlHandler(struct miqt_string* scheme) { - QString scheme_QString = QString::fromUtf8(&scheme->data, scheme->len); +void QDesktopServices_UnsetUrlHandler(struct miqt_string scheme) { + QString scheme_QString = QString::fromUtf8(scheme.data, scheme.len); QDesktopServices::unsetUrlHandler(scheme_QString); } diff --git a/qt/gen_qdesktopservices.go b/qt/gen_qdesktopservices.go index 93ea1b34..cdafe70d 100644 --- a/qt/gen_qdesktopservices.go +++ b/qt/gen_qdesktopservices.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -48,17 +47,21 @@ func QDesktopServices_OpenUrl(url *QUrl) bool { } func QDesktopServices_SetUrlHandler(scheme string, receiver *QObject, method string) { - scheme_ms := libmiqt.Strdupg(scheme) - defer C.free(scheme_ms) + scheme_ms := C.struct_miqt_string{} + scheme_ms.data = C.CString(scheme) + scheme_ms.len = C.size_t(len(scheme)) + defer C.free(unsafe.Pointer(scheme_ms.data)) method_Cstring := C.CString(method) defer C.free(unsafe.Pointer(method_Cstring)) - C.QDesktopServices_SetUrlHandler((*C.struct_miqt_string)(scheme_ms), receiver.cPointer(), method_Cstring) + C.QDesktopServices_SetUrlHandler(scheme_ms, receiver.cPointer(), method_Cstring) } func QDesktopServices_UnsetUrlHandler(scheme string) { - scheme_ms := libmiqt.Strdupg(scheme) - defer C.free(scheme_ms) - C.QDesktopServices_UnsetUrlHandler((*C.struct_miqt_string)(scheme_ms)) + scheme_ms := C.struct_miqt_string{} + scheme_ms.data = C.CString(scheme) + scheme_ms.len = C.size_t(len(scheme)) + defer C.free(unsafe.Pointer(scheme_ms.data)) + C.QDesktopServices_UnsetUrlHandler(scheme_ms) } // Delete this object from C++ memory. diff --git a/qt/gen_qdesktopservices.h b/qt/gen_qdesktopservices.h index b6d00040..af8badb6 100644 --- a/qt/gen_qdesktopservices.h +++ b/qt/gen_qdesktopservices.h @@ -24,8 +24,8 @@ typedef struct QUrl QUrl; #endif bool QDesktopServices_OpenUrl(QUrl* url); -void QDesktopServices_SetUrlHandler(struct miqt_string* scheme, QObject* receiver, const char* method); -void QDesktopServices_UnsetUrlHandler(struct miqt_string* scheme); +void QDesktopServices_SetUrlHandler(struct miqt_string scheme, QObject* receiver, const char* method); +void QDesktopServices_UnsetUrlHandler(struct miqt_string scheme); void QDesktopServices_Delete(QDesktopServices* self); #ifdef __cplusplus diff --git a/qt/gen_qdesktopwidget.cpp b/qt/gen_qdesktopwidget.cpp index 1270d331..20fee169 100644 --- a/qt/gen_qdesktopwidget.cpp +++ b/qt/gen_qdesktopwidget.cpp @@ -22,18 +22,26 @@ void* QDesktopWidget_Metacast(QDesktopWidget* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QDesktopWidget_Tr(const char* s) { +struct miqt_string QDesktopWidget_Tr(const char* s) { QString _ret = QDesktopWidget::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDesktopWidget_TrUtf8(const char* s) { +struct miqt_string QDesktopWidget_TrUtf8(const char* s) { QString _ret = QDesktopWidget::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QDesktopWidget_ScreenNumber(const QDesktopWidget* self) { @@ -131,32 +139,48 @@ void QDesktopWidget_connect_PrimaryScreenChanged(QDesktopWidget* self, intptr_t }); } -struct miqt_string* QDesktopWidget_Tr2(const char* s, const char* c) { +struct miqt_string QDesktopWidget_Tr2(const char* s, const char* c) { QString _ret = QDesktopWidget::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDesktopWidget_Tr3(const char* s, const char* c, int n) { +struct miqt_string QDesktopWidget_Tr3(const char* s, const char* c, int n) { QString _ret = QDesktopWidget::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDesktopWidget_TrUtf82(const char* s, const char* c) { +struct miqt_string QDesktopWidget_TrUtf82(const char* s, const char* c) { QString _ret = QDesktopWidget::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDesktopWidget_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QDesktopWidget_TrUtf83(const char* s, const char* c, int n) { QString _ret = QDesktopWidget::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QDesktopWidget_ScreenNumber1(const QDesktopWidget* self, QWidget* widget) { diff --git a/qt/gen_qdesktopwidget.go b/qt/gen_qdesktopwidget.go index 26ed0051..0514aec4 100644 --- a/qt/gen_qdesktopwidget.go +++ b/qt/gen_qdesktopwidget.go @@ -57,24 +57,24 @@ func (this *QDesktopWidget) MetaObject() *QMetaObject { func (this *QDesktopWidget) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QDesktopWidget_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QDesktopWidget_Metacast(this.h, param1_Cstring)) } func QDesktopWidget_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QDesktopWidget_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDesktopWidget_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QDesktopWidget_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QDesktopWidget_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDesktopWidget_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -230,9 +230,9 @@ func QDesktopWidget_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDesktopWidget_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDesktopWidget_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -241,9 +241,9 @@ func QDesktopWidget_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDesktopWidget_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDesktopWidget_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -252,9 +252,9 @@ func QDesktopWidget_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDesktopWidget_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDesktopWidget_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -263,9 +263,9 @@ func QDesktopWidget_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDesktopWidget_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDesktopWidget_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qdesktopwidget.h b/qt/gen_qdesktopwidget.h index 798240b7..dd143935 100644 --- a/qt/gen_qdesktopwidget.h +++ b/qt/gen_qdesktopwidget.h @@ -30,8 +30,8 @@ typedef struct QWidget QWidget; QDesktopWidget* QDesktopWidget_new(); QMetaObject* QDesktopWidget_MetaObject(const QDesktopWidget* self); void* QDesktopWidget_Metacast(QDesktopWidget* self, const char* param1); -struct miqt_string* QDesktopWidget_Tr(const char* s); -struct miqt_string* QDesktopWidget_TrUtf8(const char* s); +struct miqt_string QDesktopWidget_Tr(const char* s); +struct miqt_string QDesktopWidget_TrUtf8(const char* s); int QDesktopWidget_ScreenNumber(const QDesktopWidget* self); QRect* QDesktopWidget_ScreenGeometry(const QDesktopWidget* self, QWidget* widget); QRect* QDesktopWidget_AvailableGeometry(const QDesktopWidget* self, QWidget* widget); @@ -53,10 +53,10 @@ void QDesktopWidget_ScreenCountChanged(QDesktopWidget* self, int param1); void QDesktopWidget_connect_ScreenCountChanged(QDesktopWidget* self, intptr_t slot); void QDesktopWidget_PrimaryScreenChanged(QDesktopWidget* self); void QDesktopWidget_connect_PrimaryScreenChanged(QDesktopWidget* self, intptr_t slot); -struct miqt_string* QDesktopWidget_Tr2(const char* s, const char* c); -struct miqt_string* QDesktopWidget_Tr3(const char* s, const char* c, int n); -struct miqt_string* QDesktopWidget_TrUtf82(const char* s, const char* c); -struct miqt_string* QDesktopWidget_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QDesktopWidget_Tr2(const char* s, const char* c); +struct miqt_string QDesktopWidget_Tr3(const char* s, const char* c, int n); +struct miqt_string QDesktopWidget_TrUtf82(const char* s, const char* c); +struct miqt_string QDesktopWidget_TrUtf83(const char* s, const char* c, int n); int QDesktopWidget_ScreenNumber1(const QDesktopWidget* self, QWidget* widget); QWidget* QDesktopWidget_Screen1(QDesktopWidget* self, int screen); QRect* QDesktopWidget_ScreenGeometry1(const QDesktopWidget* self, int screen); diff --git a/qt/gen_qdial.cpp b/qt/gen_qdial.cpp index 3963ed90..72ae62ab 100644 --- a/qt/gen_qdial.cpp +++ b/qt/gen_qdial.cpp @@ -25,18 +25,26 @@ void* QDial_Metacast(QDial* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QDial_Tr(const char* s) { +struct miqt_string QDial_Tr(const char* s) { QString _ret = QDial::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDial_TrUtf8(const char* s) { +struct miqt_string QDial_TrUtf8(const char* s) { QString _ret = QDial::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } bool QDial_Wrapping(const QDial* self) { @@ -76,32 +84,48 @@ void QDial_SetWrapping(QDial* self, bool on) { self->setWrapping(on); } -struct miqt_string* QDial_Tr2(const char* s, const char* c) { +struct miqt_string QDial_Tr2(const char* s, const char* c) { QString _ret = QDial::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDial_Tr3(const char* s, const char* c, int n) { +struct miqt_string QDial_Tr3(const char* s, const char* c, int n) { QString _ret = QDial::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDial_TrUtf82(const char* s, const char* c) { +struct miqt_string QDial_TrUtf82(const char* s, const char* c) { QString _ret = QDial::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDial_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QDial_TrUtf83(const char* s, const char* c, int n) { QString _ret = QDial::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QDial_Delete(QDial* self) { diff --git a/qt/gen_qdial.go b/qt/gen_qdial.go index eab42b17..bab4a92f 100644 --- a/qt/gen_qdial.go +++ b/qt/gen_qdial.go @@ -62,24 +62,24 @@ func (this *QDial) MetaObject() *QMetaObject { func (this *QDial) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QDial_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QDial_Metacast(this.h, param1_Cstring)) } func QDial_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QDial_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDial_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QDial_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QDial_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDial_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -130,9 +130,9 @@ func QDial_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDial_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDial_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -141,9 +141,9 @@ func QDial_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDial_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDial_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -152,9 +152,9 @@ func QDial_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDial_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDial_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -163,9 +163,9 @@ func QDial_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDial_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDial_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qdial.h b/qt/gen_qdial.h index 32420240..43a2022b 100644 --- a/qt/gen_qdial.h +++ b/qt/gen_qdial.h @@ -29,8 +29,8 @@ QDial* QDial_new(); QDial* QDial_new2(QWidget* parent); QMetaObject* QDial_MetaObject(const QDial* self); void* QDial_Metacast(QDial* self, const char* param1); -struct miqt_string* QDial_Tr(const char* s); -struct miqt_string* QDial_TrUtf8(const char* s); +struct miqt_string QDial_Tr(const char* s); +struct miqt_string QDial_TrUtf8(const char* s); bool QDial_Wrapping(const QDial* self); int QDial_NotchSize(const QDial* self); void QDial_SetNotchTarget(QDial* self, double target); @@ -40,10 +40,10 @@ QSize* QDial_SizeHint(const QDial* self); QSize* QDial_MinimumSizeHint(const QDial* self); void QDial_SetNotchesVisible(QDial* self, bool visible); void QDial_SetWrapping(QDial* self, bool on); -struct miqt_string* QDial_Tr2(const char* s, const char* c); -struct miqt_string* QDial_Tr3(const char* s, const char* c, int n); -struct miqt_string* QDial_TrUtf82(const char* s, const char* c); -struct miqt_string* QDial_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QDial_Tr2(const char* s, const char* c); +struct miqt_string QDial_Tr3(const char* s, const char* c, int n); +struct miqt_string QDial_TrUtf82(const char* s, const char* c); +struct miqt_string QDial_TrUtf83(const char* s, const char* c, int n); void QDial_Delete(QDial* self); #ifdef __cplusplus diff --git a/qt/gen_qdialog.cpp b/qt/gen_qdialog.cpp index af90afdf..a2fa582f 100644 --- a/qt/gen_qdialog.cpp +++ b/qt/gen_qdialog.cpp @@ -29,18 +29,26 @@ void* QDialog_Metacast(QDialog* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QDialog_Tr(const char* s) { +struct miqt_string QDialog_Tr(const char* s) { QString _ret = QDialog::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDialog_TrUtf8(const char* s) { +struct miqt_string QDialog_TrUtf8(const char* s) { QString _ret = QDialog::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QDialog_Result(const QDialog* self) { @@ -147,32 +155,48 @@ void QDialog_ShowExtension(QDialog* self, bool param1) { self->showExtension(param1); } -struct miqt_string* QDialog_Tr2(const char* s, const char* c) { +struct miqt_string QDialog_Tr2(const char* s, const char* c) { QString _ret = QDialog::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDialog_Tr3(const char* s, const char* c, int n) { +struct miqt_string QDialog_Tr3(const char* s, const char* c, int n) { QString _ret = QDialog::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDialog_TrUtf82(const char* s, const char* c) { +struct miqt_string QDialog_TrUtf82(const char* s, const char* c) { QString _ret = QDialog::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDialog_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QDialog_TrUtf83(const char* s, const char* c, int n) { QString _ret = QDialog::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QDialog_Delete(QDialog* self) { diff --git a/qt/gen_qdialog.go b/qt/gen_qdialog.go index 2330bddb..abd234e3 100644 --- a/qt/gen_qdialog.go +++ b/qt/gen_qdialog.go @@ -76,24 +76,24 @@ func (this *QDialog) MetaObject() *QMetaObject { func (this *QDialog) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QDialog_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QDialog_Metacast(this.h, param1_Cstring)) } func QDialog_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QDialog_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDialog_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QDialog_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QDialog_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDialog_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -234,9 +234,9 @@ func QDialog_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDialog_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDialog_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -245,9 +245,9 @@ func QDialog_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDialog_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDialog_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -256,9 +256,9 @@ func QDialog_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDialog_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDialog_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -267,9 +267,9 @@ func QDialog_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDialog_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDialog_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qdialog.h b/qt/gen_qdialog.h index e4132036..cce9eda3 100644 --- a/qt/gen_qdialog.h +++ b/qt/gen_qdialog.h @@ -30,8 +30,8 @@ QDialog* QDialog_new2(QWidget* parent); QDialog* QDialog_new3(QWidget* parent, int f); QMetaObject* QDialog_MetaObject(const QDialog* self); void* QDialog_Metacast(QDialog* self, const char* param1); -struct miqt_string* QDialog_Tr(const char* s); -struct miqt_string* QDialog_TrUtf8(const char* s); +struct miqt_string QDialog_Tr(const char* s); +struct miqt_string QDialog_TrUtf8(const char* s); int QDialog_Result(const QDialog* self); void QDialog_SetVisible(QDialog* self, bool visible); void QDialog_SetOrientation(QDialog* self, int orientation); @@ -56,10 +56,10 @@ void QDialog_Done(QDialog* self, int param1); void QDialog_Accept(QDialog* self); void QDialog_Reject(QDialog* self); void QDialog_ShowExtension(QDialog* self, bool param1); -struct miqt_string* QDialog_Tr2(const char* s, const char* c); -struct miqt_string* QDialog_Tr3(const char* s, const char* c, int n); -struct miqt_string* QDialog_TrUtf82(const char* s, const char* c); -struct miqt_string* QDialog_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QDialog_Tr2(const char* s, const char* c); +struct miqt_string QDialog_Tr3(const char* s, const char* c, int n); +struct miqt_string QDialog_TrUtf82(const char* s, const char* c); +struct miqt_string QDialog_TrUtf83(const char* s, const char* c, int n); void QDialog_Delete(QDialog* self); #ifdef __cplusplus diff --git a/qt/gen_qdialogbuttonbox.cpp b/qt/gen_qdialogbuttonbox.cpp index a9fc7eab..3df980f1 100644 --- a/qt/gen_qdialogbuttonbox.cpp +++ b/qt/gen_qdialogbuttonbox.cpp @@ -51,18 +51,26 @@ void* QDialogButtonBox_Metacast(QDialogButtonBox* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QDialogButtonBox_Tr(const char* s) { +struct miqt_string QDialogButtonBox_Tr(const char* s) { QString _ret = QDialogButtonBox::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDialogButtonBox_TrUtf8(const char* s) { +struct miqt_string QDialogButtonBox_TrUtf8(const char* s) { QString _ret = QDialogButtonBox::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QDialogButtonBox_SetOrientation(QDialogButtonBox* self, int orientation) { @@ -78,8 +86,8 @@ void QDialogButtonBox_AddButton(QDialogButtonBox* self, QAbstractButton* button, self->addButton(button, static_cast(role)); } -QPushButton* QDialogButtonBox_AddButton2(QDialogButtonBox* self, struct miqt_string* text, int role) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QPushButton* QDialogButtonBox_AddButton2(QDialogButtonBox* self, struct miqt_string text, int role) { + QString text_QString = QString::fromUtf8(text.data, text.len); return self->addButton(text_QString, static_cast(role)); } @@ -180,32 +188,48 @@ void QDialogButtonBox_connect_Rejected(QDialogButtonBox* self, intptr_t slot) { }); } -struct miqt_string* QDialogButtonBox_Tr2(const char* s, const char* c) { +struct miqt_string QDialogButtonBox_Tr2(const char* s, const char* c) { QString _ret = QDialogButtonBox::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDialogButtonBox_Tr3(const char* s, const char* c, int n) { +struct miqt_string QDialogButtonBox_Tr3(const char* s, const char* c, int n) { QString _ret = QDialogButtonBox::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDialogButtonBox_TrUtf82(const char* s, const char* c) { +struct miqt_string QDialogButtonBox_TrUtf82(const char* s, const char* c) { QString _ret = QDialogButtonBox::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDialogButtonBox_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QDialogButtonBox_TrUtf83(const char* s, const char* c, int n) { QString _ret = QDialogButtonBox::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QDialogButtonBox_Delete(QDialogButtonBox* self) { diff --git a/qt/gen_qdialogbuttonbox.go b/qt/gen_qdialogbuttonbox.go index c01e82b4..268c78f5 100644 --- a/qt/gen_qdialogbuttonbox.go +++ b/qt/gen_qdialogbuttonbox.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "runtime/cgo" "unsafe" @@ -152,24 +151,24 @@ func (this *QDialogButtonBox) MetaObject() *QMetaObject { func (this *QDialogButtonBox) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QDialogButtonBox_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QDialogButtonBox_Metacast(this.h, param1_Cstring)) } func QDialogButtonBox_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QDialogButtonBox_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDialogButtonBox_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QDialogButtonBox_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QDialogButtonBox_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDialogButtonBox_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -186,9 +185,11 @@ func (this *QDialogButtonBox) AddButton(button *QAbstractButton, role QDialogBut } func (this *QDialogButtonBox) AddButton2(text string, role QDialogButtonBox__ButtonRole) *QPushButton { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - return UnsafeNewQPushButton(unsafe.Pointer(C.QDialogButtonBox_AddButton2(this.h, (*C.struct_miqt_string)(text_ms), (C.int)(role)))) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + return UnsafeNewQPushButton(unsafe.Pointer(C.QDialogButtonBox_AddButton2(this.h, text_ms, (C.int)(role)))) } func (this *QDialogButtonBox) AddButtonWithButton(button QDialogButtonBox__StandardButton) *QPushButton { @@ -318,9 +319,9 @@ func QDialogButtonBox_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDialogButtonBox_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDialogButtonBox_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -329,9 +330,9 @@ func QDialogButtonBox_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDialogButtonBox_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDialogButtonBox_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -340,9 +341,9 @@ func QDialogButtonBox_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDialogButtonBox_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDialogButtonBox_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -351,9 +352,9 @@ func QDialogButtonBox_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDialogButtonBox_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDialogButtonBox_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qdialogbuttonbox.h b/qt/gen_qdialogbuttonbox.h index b80c48d9..c3312923 100644 --- a/qt/gen_qdialogbuttonbox.h +++ b/qt/gen_qdialogbuttonbox.h @@ -37,12 +37,12 @@ QDialogButtonBox* QDialogButtonBox_new7(int buttons, QWidget* parent); QDialogButtonBox* QDialogButtonBox_new8(int buttons, int orientation, QWidget* parent); QMetaObject* QDialogButtonBox_MetaObject(const QDialogButtonBox* self); void* QDialogButtonBox_Metacast(QDialogButtonBox* self, const char* param1); -struct miqt_string* QDialogButtonBox_Tr(const char* s); -struct miqt_string* QDialogButtonBox_TrUtf8(const char* s); +struct miqt_string QDialogButtonBox_Tr(const char* s); +struct miqt_string QDialogButtonBox_TrUtf8(const char* s); void QDialogButtonBox_SetOrientation(QDialogButtonBox* self, int orientation); int QDialogButtonBox_Orientation(const QDialogButtonBox* self); void QDialogButtonBox_AddButton(QDialogButtonBox* self, QAbstractButton* button, int role); -QPushButton* QDialogButtonBox_AddButton2(QDialogButtonBox* self, struct miqt_string* text, int role); +QPushButton* QDialogButtonBox_AddButton2(QDialogButtonBox* self, struct miqt_string text, int role); QPushButton* QDialogButtonBox_AddButtonWithButton(QDialogButtonBox* self, int button); void QDialogButtonBox_RemoveButton(QDialogButtonBox* self, QAbstractButton* button); void QDialogButtonBox_Clear(QDialogButtonBox* self); @@ -62,10 +62,10 @@ void QDialogButtonBox_HelpRequested(QDialogButtonBox* self); void QDialogButtonBox_connect_HelpRequested(QDialogButtonBox* self, intptr_t slot); void QDialogButtonBox_Rejected(QDialogButtonBox* self); void QDialogButtonBox_connect_Rejected(QDialogButtonBox* self, intptr_t slot); -struct miqt_string* QDialogButtonBox_Tr2(const char* s, const char* c); -struct miqt_string* QDialogButtonBox_Tr3(const char* s, const char* c, int n); -struct miqt_string* QDialogButtonBox_TrUtf82(const char* s, const char* c); -struct miqt_string* QDialogButtonBox_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QDialogButtonBox_Tr2(const char* s, const char* c); +struct miqt_string QDialogButtonBox_Tr3(const char* s, const char* c, int n); +struct miqt_string QDialogButtonBox_TrUtf82(const char* s, const char* c); +struct miqt_string QDialogButtonBox_TrUtf83(const char* s, const char* c, int n); void QDialogButtonBox_Delete(QDialogButtonBox* self); #ifdef __cplusplus diff --git a/qt/gen_qdir.cpp b/qt/gen_qdir.cpp index 5c905afb..ff68f543 100644 --- a/qt/gen_qdir.cpp +++ b/qt/gen_qdir.cpp @@ -17,26 +17,26 @@ QDir* QDir_new2() { return new QDir(); } -QDir* QDir_new3(struct miqt_string* path, struct miqt_string* nameFilter) { - QString path_QString = QString::fromUtf8(&path->data, path->len); - QString nameFilter_QString = QString::fromUtf8(&nameFilter->data, nameFilter->len); +QDir* QDir_new3(struct miqt_string path, struct miqt_string nameFilter) { + QString path_QString = QString::fromUtf8(path.data, path.len); + QString nameFilter_QString = QString::fromUtf8(nameFilter.data, nameFilter.len); return new QDir(path_QString, nameFilter_QString); } -QDir* QDir_new4(struct miqt_string* path) { - QString path_QString = QString::fromUtf8(&path->data, path->len); +QDir* QDir_new4(struct miqt_string path) { + QString path_QString = QString::fromUtf8(path.data, path.len); return new QDir(path_QString); } -QDir* QDir_new5(struct miqt_string* path, struct miqt_string* nameFilter, int sort) { - QString path_QString = QString::fromUtf8(&path->data, path->len); - QString nameFilter_QString = QString::fromUtf8(&nameFilter->data, nameFilter->len); +QDir* QDir_new5(struct miqt_string path, struct miqt_string nameFilter, int sort) { + QString path_QString = QString::fromUtf8(path.data, path.len); + QString nameFilter_QString = QString::fromUtf8(nameFilter.data, nameFilter.len); return new QDir(path_QString, nameFilter_QString, static_cast(sort)); } -QDir* QDir_new6(struct miqt_string* path, struct miqt_string* nameFilter, int sort, int filter) { - QString path_QString = QString::fromUtf8(&path->data, path->len); - QString nameFilter_QString = QString::fromUtf8(&nameFilter->data, nameFilter->len); +QDir* QDir_new6(struct miqt_string path, struct miqt_string nameFilter, int sort, int filter) { + QString path_QString = QString::fromUtf8(path.data, path.len); + QString nameFilter_QString = QString::fromUtf8(nameFilter.data, nameFilter.len); return new QDir(path_QString, nameFilter_QString, static_cast(sort), static_cast(filter)); } @@ -44,8 +44,8 @@ void QDir_OperatorAssign(QDir* self, QDir* param1) { self->operator=(*param1); } -void QDir_OperatorAssignWithPath(QDir* self, struct miqt_string* path) { - QString path_QString = QString::fromUtf8(&path->data, path->len); +void QDir_OperatorAssignWithPath(QDir* self, struct miqt_string path) { + QString path_QString = QString::fromUtf8(path.data, path.len); self->operator=(path_QString); } @@ -53,65 +53,81 @@ void QDir_Swap(QDir* self, QDir* other) { self->swap(*other); } -void QDir_SetPath(QDir* self, struct miqt_string* path) { - QString path_QString = QString::fromUtf8(&path->data, path->len); +void QDir_SetPath(QDir* self, struct miqt_string path) { + QString path_QString = QString::fromUtf8(path.data, path.len); self->setPath(path_QString); } -struct miqt_string* QDir_Path(const QDir* self) { +struct miqt_string QDir_Path(const QDir* self) { QString _ret = self->path(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDir_AbsolutePath(const QDir* self) { +struct miqt_string QDir_AbsolutePath(const QDir* self) { QString _ret = self->absolutePath(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDir_CanonicalPath(const QDir* self) { +struct miqt_string QDir_CanonicalPath(const QDir* self) { QString _ret = self->canonicalPath(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QDir_AddResourceSearchPath(struct miqt_string* path) { - QString path_QString = QString::fromUtf8(&path->data, path->len); +void QDir_AddResourceSearchPath(struct miqt_string path) { + QString path_QString = QString::fromUtf8(path.data, path.len); QDir::addResourceSearchPath(path_QString); } -void QDir_SetSearchPaths(struct miqt_string* prefix, struct miqt_array* /* of struct miqt_string* */ searchPaths) { - QString prefix_QString = QString::fromUtf8(&prefix->data, prefix->len); +void QDir_SetSearchPaths(struct miqt_string prefix, struct miqt_array* /* of struct miqt_string */ searchPaths) { + QString prefix_QString = QString::fromUtf8(prefix.data, prefix.len); QStringList searchPaths_QList; searchPaths_QList.reserve(searchPaths->len); - struct miqt_string** searchPaths_arr = static_cast(searchPaths->data); + struct miqt_string* searchPaths_arr = static_cast(searchPaths->data); for(size_t i = 0; i < searchPaths->len; ++i) { - QString searchPaths_arr_i_QString = QString::fromUtf8(&searchPaths_arr[i]->data, searchPaths_arr[i]->len); + QString searchPaths_arr_i_QString = QString::fromUtf8(searchPaths_arr[i].data, searchPaths_arr[i].len); searchPaths_QList.push_back(searchPaths_arr_i_QString); } QDir::setSearchPaths(prefix_QString, searchPaths_QList); } -void QDir_AddSearchPath(struct miqt_string* prefix, struct miqt_string* path) { - QString prefix_QString = QString::fromUtf8(&prefix->data, prefix->len); - QString path_QString = QString::fromUtf8(&path->data, path->len); +void QDir_AddSearchPath(struct miqt_string prefix, struct miqt_string path) { + QString prefix_QString = QString::fromUtf8(prefix.data, prefix.len); + QString path_QString = QString::fromUtf8(path.data, path.len); QDir::addSearchPath(prefix_QString, path_QString); } -struct miqt_array* QDir_SearchPaths(struct miqt_string* prefix) { - QString prefix_QString = QString::fromUtf8(&prefix->data, prefix->len); +struct miqt_array* QDir_SearchPaths(struct miqt_string prefix) { + QString prefix_QString = QString::fromUtf8(prefix.data, prefix.len); QStringList _ret = QDir::searchPaths(prefix_QString); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -119,55 +135,79 @@ struct miqt_array* QDir_SearchPaths(struct miqt_string* prefix) { return _out; } -struct miqt_string* QDir_DirName(const QDir* self) { +struct miqt_string QDir_DirName(const QDir* self) { QString _ret = self->dirName(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDir_FilePath(const QDir* self, struct miqt_string* fileName) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +struct miqt_string QDir_FilePath(const QDir* self, struct miqt_string fileName) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); QString _ret = self->filePath(fileName_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDir_AbsoluteFilePath(const QDir* self, struct miqt_string* fileName) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +struct miqt_string QDir_AbsoluteFilePath(const QDir* self, struct miqt_string fileName) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); QString _ret = self->absoluteFilePath(fileName_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDir_RelativeFilePath(const QDir* self, struct miqt_string* fileName) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +struct miqt_string QDir_RelativeFilePath(const QDir* self, struct miqt_string fileName) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); QString _ret = self->relativeFilePath(fileName_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDir_ToNativeSeparators(struct miqt_string* pathName) { - QString pathName_QString = QString::fromUtf8(&pathName->data, pathName->len); +struct miqt_string QDir_ToNativeSeparators(struct miqt_string pathName) { + QString pathName_QString = QString::fromUtf8(pathName.data, pathName.len); QString _ret = QDir::toNativeSeparators(pathName_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDir_FromNativeSeparators(struct miqt_string* pathName) { - QString pathName_QString = QString::fromUtf8(&pathName->data, pathName->len); +struct miqt_string QDir_FromNativeSeparators(struct miqt_string pathName) { + QString pathName_QString = QString::fromUtf8(pathName.data, pathName.len); QString _ret = QDir::fromNativeSeparators(pathName_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -bool QDir_Cd(QDir* self, struct miqt_string* dirName) { - QString dirName_QString = QString::fromUtf8(&dirName->data, dirName->len); +bool QDir_Cd(QDir* self, struct miqt_string dirName) { + QString dirName_QString = QString::fromUtf8(dirName.data, dirName.len); return self->cd(dirName_QString); } @@ -178,12 +218,16 @@ bool QDir_CdUp(QDir* self) { struct miqt_array* QDir_NameFilters(const QDir* self) { QStringList _ret = self->nameFilters(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -191,12 +235,12 @@ struct miqt_array* QDir_NameFilters(const QDir* self) { return _out; } -void QDir_SetNameFilters(QDir* self, struct miqt_array* /* of struct miqt_string* */ nameFilters) { +void QDir_SetNameFilters(QDir* self, struct miqt_array* /* of struct miqt_string */ nameFilters) { QStringList nameFilters_QList; nameFilters_QList.reserve(nameFilters->len); - struct miqt_string** nameFilters_arr = static_cast(nameFilters->data); + struct miqt_string* nameFilters_arr = static_cast(nameFilters->data); for(size_t i = 0; i < nameFilters->len; ++i) { - QString nameFilters_arr_i_QString = QString::fromUtf8(&nameFilters_arr[i]->data, nameFilters_arr[i]->len); + QString nameFilters_arr_i_QString = QString::fromUtf8(nameFilters_arr[i].data, nameFilters_arr[i].len); nameFilters_QList.push_back(nameFilters_arr_i_QString); } self->setNameFilters(nameFilters_QList); @@ -229,23 +273,31 @@ bool QDir_IsEmpty(const QDir* self) { return self->isEmpty(); } -struct miqt_string* QDir_OperatorSubscript(const QDir* self, int param1) { +struct miqt_string QDir_OperatorSubscript(const QDir* self, int param1) { QString _ret = self->operator[](static_cast(param1)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_array* QDir_NameFiltersFromString(struct miqt_string* nameFilter) { - QString nameFilter_QString = QString::fromUtf8(&nameFilter->data, nameFilter->len); +struct miqt_array* QDir_NameFiltersFromString(struct miqt_string nameFilter) { + QString nameFilter_QString = QString::fromUtf8(nameFilter.data, nameFilter.len); QStringList _ret = QDir::nameFiltersFromString(nameFilter_QString); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -256,12 +308,16 @@ struct miqt_array* QDir_NameFiltersFromString(struct miqt_string* nameFilter) { struct miqt_array* QDir_EntryList(const QDir* self) { QStringList _ret = self->entryList(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -269,22 +325,26 @@ struct miqt_array* QDir_EntryList(const QDir* self) { return _out; } -struct miqt_array* QDir_EntryListWithNameFilters(const QDir* self, struct miqt_array* /* of struct miqt_string* */ nameFilters) { +struct miqt_array* QDir_EntryListWithNameFilters(const QDir* self, struct miqt_array* /* of struct miqt_string */ nameFilters) { QStringList nameFilters_QList; nameFilters_QList.reserve(nameFilters->len); - struct miqt_string** nameFilters_arr = static_cast(nameFilters->data); + struct miqt_string* nameFilters_arr = static_cast(nameFilters->data); for(size_t i = 0; i < nameFilters->len; ++i) { - QString nameFilters_arr_i_QString = QString::fromUtf8(&nameFilters_arr[i]->data, nameFilters_arr[i]->len); + QString nameFilters_arr_i_QString = QString::fromUtf8(nameFilters_arr[i].data, nameFilters_arr[i].len); nameFilters_QList.push_back(nameFilters_arr_i_QString); } QStringList _ret = self->entryList(nameFilters_QList); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -305,12 +365,12 @@ struct miqt_array* QDir_EntryInfoList(const QDir* self) { return _out; } -struct miqt_array* QDir_EntryInfoListWithNameFilters(const QDir* self, struct miqt_array* /* of struct miqt_string* */ nameFilters) { +struct miqt_array* QDir_EntryInfoListWithNameFilters(const QDir* self, struct miqt_array* /* of struct miqt_string */ nameFilters) { QStringList nameFilters_QList; nameFilters_QList.reserve(nameFilters->len); - struct miqt_string** nameFilters_arr = static_cast(nameFilters->data); + struct miqt_string* nameFilters_arr = static_cast(nameFilters->data); for(size_t i = 0; i < nameFilters->len; ++i) { - QString nameFilters_arr_i_QString = QString::fromUtf8(&nameFilters_arr[i]->data, nameFilters_arr[i]->len); + QString nameFilters_arr_i_QString = QString::fromUtf8(nameFilters_arr[i].data, nameFilters_arr[i].len); nameFilters_QList.push_back(nameFilters_arr_i_QString); } QFileInfoList _ret = self->entryInfoList(nameFilters_QList); @@ -325,23 +385,23 @@ struct miqt_array* QDir_EntryInfoListWithNameFilters(const QDir* self, struct mi return _out; } -bool QDir_Mkdir(const QDir* self, struct miqt_string* dirName) { - QString dirName_QString = QString::fromUtf8(&dirName->data, dirName->len); +bool QDir_Mkdir(const QDir* self, struct miqt_string dirName) { + QString dirName_QString = QString::fromUtf8(dirName.data, dirName.len); return self->mkdir(dirName_QString); } -bool QDir_Rmdir(const QDir* self, struct miqt_string* dirName) { - QString dirName_QString = QString::fromUtf8(&dirName->data, dirName->len); +bool QDir_Rmdir(const QDir* self, struct miqt_string dirName) { + QString dirName_QString = QString::fromUtf8(dirName.data, dirName.len); return self->rmdir(dirName_QString); } -bool QDir_Mkpath(const QDir* self, struct miqt_string* dirPath) { - QString dirPath_QString = QString::fromUtf8(&dirPath->data, dirPath->len); +bool QDir_Mkpath(const QDir* self, struct miqt_string dirPath) { + QString dirPath_QString = QString::fromUtf8(dirPath.data, dirPath.len); return self->mkpath(dirPath_QString); } -bool QDir_Rmpath(const QDir* self, struct miqt_string* dirPath) { - QString dirPath_QString = QString::fromUtf8(&dirPath->data, dirPath->len); +bool QDir_Rmpath(const QDir* self, struct miqt_string dirPath) { + QString dirPath_QString = QString::fromUtf8(dirPath.data, dirPath.len); return self->rmpath(dirPath_QString); } @@ -361,13 +421,13 @@ bool QDir_IsRoot(const QDir* self) { return self->isRoot(); } -bool QDir_IsRelativePath(struct miqt_string* path) { - QString path_QString = QString::fromUtf8(&path->data, path->len); +bool QDir_IsRelativePath(struct miqt_string path) { + QString path_QString = QString::fromUtf8(path.data, path.len); return QDir::isRelativePath(path_QString); } -bool QDir_IsAbsolutePath(struct miqt_string* path) { - QString path_QString = QString::fromUtf8(&path->data, path->len); +bool QDir_IsAbsolutePath(struct miqt_string path) { + QString path_QString = QString::fromUtf8(path.data, path.len); return QDir::isAbsolutePath(path_QString); } @@ -391,19 +451,19 @@ bool QDir_OperatorNotEqual(const QDir* self, QDir* dir) { return self->operator!=(*dir); } -bool QDir_Remove(QDir* self, struct miqt_string* fileName) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +bool QDir_Remove(QDir* self, struct miqt_string fileName) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); return self->remove(fileName_QString); } -bool QDir_Rename(QDir* self, struct miqt_string* oldName, struct miqt_string* newName) { - QString oldName_QString = QString::fromUtf8(&oldName->data, oldName->len); - QString newName_QString = QString::fromUtf8(&newName->data, newName->len); +bool QDir_Rename(QDir* self, struct miqt_string oldName, struct miqt_string newName) { + QString oldName_QString = QString::fromUtf8(oldName.data, oldName.len); + QString newName_QString = QString::fromUtf8(newName.data, newName.len); return self->rename(oldName_QString, newName_QString); } -bool QDir_ExistsWithName(const QDir* self, struct miqt_string* name) { - QString name_QString = QString::fromUtf8(&name->data, name->len); +bool QDir_ExistsWithName(const QDir* self, struct miqt_string name) { + QString name_QString = QString::fromUtf8(name.data, name.len); return self->exists(name_QString); } @@ -428,8 +488,8 @@ QChar* QDir_Separator() { return new QChar(QDir::separator()); } -bool QDir_SetCurrent(struct miqt_string* path) { - QString path_QString = QString::fromUtf8(&path->data, path->len); +bool QDir_SetCurrent(struct miqt_string path) { + QString path_QString = QString::fromUtf8(path.data, path.len); return QDir::setCurrent(path_QString); } @@ -437,70 +497,90 @@ QDir* QDir_Current() { return new QDir(QDir::current()); } -struct miqt_string* QDir_CurrentPath() { +struct miqt_string QDir_CurrentPath() { QString _ret = QDir::currentPath(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QDir* QDir_Home() { return new QDir(QDir::home()); } -struct miqt_string* QDir_HomePath() { +struct miqt_string QDir_HomePath() { QString _ret = QDir::homePath(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QDir* QDir_Root() { return new QDir(QDir::root()); } -struct miqt_string* QDir_RootPath() { +struct miqt_string QDir_RootPath() { QString _ret = QDir::rootPath(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QDir* QDir_Temp() { return new QDir(QDir::temp()); } -struct miqt_string* QDir_TempPath() { +struct miqt_string QDir_TempPath() { QString _ret = QDir::tempPath(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -bool QDir_Match(struct miqt_array* /* of struct miqt_string* */ filters, struct miqt_string* fileName) { +bool QDir_Match(struct miqt_array* /* of struct miqt_string */ filters, struct miqt_string fileName) { QStringList filters_QList; filters_QList.reserve(filters->len); - struct miqt_string** filters_arr = static_cast(filters->data); + struct miqt_string* filters_arr = static_cast(filters->data); for(size_t i = 0; i < filters->len; ++i) { - QString filters_arr_i_QString = QString::fromUtf8(&filters_arr[i]->data, filters_arr[i]->len); + QString filters_arr_i_QString = QString::fromUtf8(filters_arr[i].data, filters_arr[i].len); filters_QList.push_back(filters_arr_i_QString); } - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); return QDir::match(filters_QList, fileName_QString); } -bool QDir_Match2(struct miqt_string* filter, struct miqt_string* fileName) { - QString filter_QString = QString::fromUtf8(&filter->data, filter->len); - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +bool QDir_Match2(struct miqt_string filter, struct miqt_string fileName) { + QString filter_QString = QString::fromUtf8(filter.data, filter.len); + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); return QDir::match(filter_QString, fileName_QString); } -struct miqt_string* QDir_CleanPath(struct miqt_string* path) { - QString path_QString = QString::fromUtf8(&path->data, path->len); +struct miqt_string QDir_CleanPath(struct miqt_string path) { + QString path_QString = QString::fromUtf8(path.data, path.len); QString _ret = QDir::cleanPath(path_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QDir_Refresh(const QDir* self) { @@ -514,12 +594,16 @@ bool QDir_IsEmpty1(const QDir* self, int filters) { struct miqt_array* QDir_EntryList1(const QDir* self, int filters) { QStringList _ret = self->entryList(static_cast(filters)); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -530,12 +614,16 @@ struct miqt_array* QDir_EntryList1(const QDir* self, int filters) { struct miqt_array* QDir_EntryList2(const QDir* self, int filters, int sort) { QStringList _ret = self->entryList(static_cast(filters), static_cast(sort)); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -543,22 +631,26 @@ struct miqt_array* QDir_EntryList2(const QDir* self, int filters, int sort) { return _out; } -struct miqt_array* QDir_EntryList22(const QDir* self, struct miqt_array* /* of struct miqt_string* */ nameFilters, int filters) { +struct miqt_array* QDir_EntryList22(const QDir* self, struct miqt_array* /* of struct miqt_string */ nameFilters, int filters) { QStringList nameFilters_QList; nameFilters_QList.reserve(nameFilters->len); - struct miqt_string** nameFilters_arr = static_cast(nameFilters->data); + struct miqt_string* nameFilters_arr = static_cast(nameFilters->data); for(size_t i = 0; i < nameFilters->len; ++i) { - QString nameFilters_arr_i_QString = QString::fromUtf8(&nameFilters_arr[i]->data, nameFilters_arr[i]->len); + QString nameFilters_arr_i_QString = QString::fromUtf8(nameFilters_arr[i].data, nameFilters_arr[i].len); nameFilters_QList.push_back(nameFilters_arr_i_QString); } QStringList _ret = self->entryList(nameFilters_QList, static_cast(filters)); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -566,22 +658,26 @@ struct miqt_array* QDir_EntryList22(const QDir* self, struct miqt_array* /* of s return _out; } -struct miqt_array* QDir_EntryList3(const QDir* self, struct miqt_array* /* of struct miqt_string* */ nameFilters, int filters, int sort) { +struct miqt_array* QDir_EntryList3(const QDir* self, struct miqt_array* /* of struct miqt_string */ nameFilters, int filters, int sort) { QStringList nameFilters_QList; nameFilters_QList.reserve(nameFilters->len); - struct miqt_string** nameFilters_arr = static_cast(nameFilters->data); + struct miqt_string* nameFilters_arr = static_cast(nameFilters->data); for(size_t i = 0; i < nameFilters->len; ++i) { - QString nameFilters_arr_i_QString = QString::fromUtf8(&nameFilters_arr[i]->data, nameFilters_arr[i]->len); + QString nameFilters_arr_i_QString = QString::fromUtf8(nameFilters_arr[i].data, nameFilters_arr[i].len); nameFilters_QList.push_back(nameFilters_arr_i_QString); } QStringList _ret = self->entryList(nameFilters_QList, static_cast(filters), static_cast(sort)); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -615,12 +711,12 @@ struct miqt_array* QDir_EntryInfoList2(const QDir* self, int filters, int sort) return _out; } -struct miqt_array* QDir_EntryInfoList22(const QDir* self, struct miqt_array* /* of struct miqt_string* */ nameFilters, int filters) { +struct miqt_array* QDir_EntryInfoList22(const QDir* self, struct miqt_array* /* of struct miqt_string */ nameFilters, int filters) { QStringList nameFilters_QList; nameFilters_QList.reserve(nameFilters->len); - struct miqt_string** nameFilters_arr = static_cast(nameFilters->data); + struct miqt_string* nameFilters_arr = static_cast(nameFilters->data); for(size_t i = 0; i < nameFilters->len; ++i) { - QString nameFilters_arr_i_QString = QString::fromUtf8(&nameFilters_arr[i]->data, nameFilters_arr[i]->len); + QString nameFilters_arr_i_QString = QString::fromUtf8(nameFilters_arr[i].data, nameFilters_arr[i].len); nameFilters_QList.push_back(nameFilters_arr_i_QString); } QFileInfoList _ret = self->entryInfoList(nameFilters_QList, static_cast(filters)); @@ -635,12 +731,12 @@ struct miqt_array* QDir_EntryInfoList22(const QDir* self, struct miqt_array* /* return _out; } -struct miqt_array* QDir_EntryInfoList3(const QDir* self, struct miqt_array* /* of struct miqt_string* */ nameFilters, int filters, int sort) { +struct miqt_array* QDir_EntryInfoList3(const QDir* self, struct miqt_array* /* of struct miqt_string */ nameFilters, int filters, int sort) { QStringList nameFilters_QList; nameFilters_QList.reserve(nameFilters->len); - struct miqt_string** nameFilters_arr = static_cast(nameFilters->data); + struct miqt_string* nameFilters_arr = static_cast(nameFilters->data); for(size_t i = 0; i < nameFilters->len; ++i) { - QString nameFilters_arr_i_QString = QString::fromUtf8(&nameFilters_arr[i]->data, nameFilters_arr[i]->len); + QString nameFilters_arr_i_QString = QString::fromUtf8(nameFilters_arr[i].data, nameFilters_arr[i].len); nameFilters_QList.push_back(nameFilters_arr_i_QString); } QFileInfoList _ret = self->entryInfoList(nameFilters_QList, static_cast(filters), static_cast(sort)); diff --git a/qt/gen_qdir.go b/qt/gen_qdir.go index d81104cc..fb63028b 100644 --- a/qt/gen_qdir.go +++ b/qt/gen_qdir.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -99,39 +98,53 @@ func NewQDir2() *QDir { // NewQDir3 constructs a new QDir object. func NewQDir3(path string, nameFilter string) *QDir { - path_ms := libmiqt.Strdupg(path) - defer C.free(path_ms) - nameFilter_ms := libmiqt.Strdupg(nameFilter) - defer C.free(nameFilter_ms) - ret := C.QDir_new3((*C.struct_miqt_string)(path_ms), (*C.struct_miqt_string)(nameFilter_ms)) + path_ms := C.struct_miqt_string{} + path_ms.data = C.CString(path) + path_ms.len = C.size_t(len(path)) + defer C.free(unsafe.Pointer(path_ms.data)) + nameFilter_ms := C.struct_miqt_string{} + nameFilter_ms.data = C.CString(nameFilter) + nameFilter_ms.len = C.size_t(len(nameFilter)) + defer C.free(unsafe.Pointer(nameFilter_ms.data)) + ret := C.QDir_new3(path_ms, nameFilter_ms) return newQDir(ret) } // NewQDir4 constructs a new QDir object. func NewQDir4(path string) *QDir { - path_ms := libmiqt.Strdupg(path) - defer C.free(path_ms) - ret := C.QDir_new4((*C.struct_miqt_string)(path_ms)) + path_ms := C.struct_miqt_string{} + path_ms.data = C.CString(path) + path_ms.len = C.size_t(len(path)) + defer C.free(unsafe.Pointer(path_ms.data)) + ret := C.QDir_new4(path_ms) return newQDir(ret) } // NewQDir5 constructs a new QDir object. func NewQDir5(path string, nameFilter string, sort QDir__SortFlag) *QDir { - path_ms := libmiqt.Strdupg(path) - defer C.free(path_ms) - nameFilter_ms := libmiqt.Strdupg(nameFilter) - defer C.free(nameFilter_ms) - ret := C.QDir_new5((*C.struct_miqt_string)(path_ms), (*C.struct_miqt_string)(nameFilter_ms), (C.int)(sort)) + path_ms := C.struct_miqt_string{} + path_ms.data = C.CString(path) + path_ms.len = C.size_t(len(path)) + defer C.free(unsafe.Pointer(path_ms.data)) + nameFilter_ms := C.struct_miqt_string{} + nameFilter_ms.data = C.CString(nameFilter) + nameFilter_ms.len = C.size_t(len(nameFilter)) + defer C.free(unsafe.Pointer(nameFilter_ms.data)) + ret := C.QDir_new5(path_ms, nameFilter_ms, (C.int)(sort)) return newQDir(ret) } // NewQDir6 constructs a new QDir object. func NewQDir6(path string, nameFilter string, sort QDir__SortFlag, filter QDir__Filter) *QDir { - path_ms := libmiqt.Strdupg(path) - defer C.free(path_ms) - nameFilter_ms := libmiqt.Strdupg(nameFilter) - defer C.free(nameFilter_ms) - ret := C.QDir_new6((*C.struct_miqt_string)(path_ms), (*C.struct_miqt_string)(nameFilter_ms), (C.int)(sort), (C.int)(filter)) + path_ms := C.struct_miqt_string{} + path_ms.data = C.CString(path) + path_ms.len = C.size_t(len(path)) + defer C.free(unsafe.Pointer(path_ms.data)) + nameFilter_ms := C.struct_miqt_string{} + nameFilter_ms.data = C.CString(nameFilter) + nameFilter_ms.len = C.size_t(len(nameFilter)) + defer C.free(unsafe.Pointer(nameFilter_ms.data)) + ret := C.QDir_new6(path_ms, nameFilter_ms, (C.int)(sort), (C.int)(filter)) return newQDir(ret) } @@ -140,9 +153,11 @@ func (this *QDir) OperatorAssign(param1 *QDir) { } func (this *QDir) OperatorAssignWithPath(path string) { - path_ms := libmiqt.Strdupg(path) - defer C.free(path_ms) - C.QDir_OperatorAssignWithPath(this.h, (*C.struct_miqt_string)(path_ms)) + path_ms := C.struct_miqt_string{} + path_ms.data = C.CString(path) + path_ms.len = C.size_t(len(path)) + defer C.free(unsafe.Pointer(path_ms.data)) + C.QDir_OperatorAssignWithPath(this.h, path_ms) } func (this *QDir) Swap(other *QDir) { @@ -150,72 +165,86 @@ func (this *QDir) Swap(other *QDir) { } func (this *QDir) SetPath(path string) { - path_ms := libmiqt.Strdupg(path) - defer C.free(path_ms) - C.QDir_SetPath(this.h, (*C.struct_miqt_string)(path_ms)) + path_ms := C.struct_miqt_string{} + path_ms.data = C.CString(path) + path_ms.len = C.size_t(len(path)) + defer C.free(unsafe.Pointer(path_ms.data)) + C.QDir_SetPath(this.h, path_ms) } func (this *QDir) Path() string { - var _ms *C.struct_miqt_string = C.QDir_Path(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDir_Path(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QDir) AbsolutePath() string { - var _ms *C.struct_miqt_string = C.QDir_AbsolutePath(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDir_AbsolutePath(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QDir) CanonicalPath() string { - var _ms *C.struct_miqt_string = C.QDir_CanonicalPath(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDir_CanonicalPath(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QDir_AddResourceSearchPath(path string) { - path_ms := libmiqt.Strdupg(path) - defer C.free(path_ms) - C.QDir_AddResourceSearchPath((*C.struct_miqt_string)(path_ms)) + path_ms := C.struct_miqt_string{} + path_ms.data = C.CString(path) + path_ms.len = C.size_t(len(path)) + defer C.free(unsafe.Pointer(path_ms.data)) + C.QDir_AddResourceSearchPath(path_ms) } func QDir_SetSearchPaths(prefix string, searchPaths []string) { - prefix_ms := libmiqt.Strdupg(prefix) - defer C.free(prefix_ms) + prefix_ms := C.struct_miqt_string{} + prefix_ms.data = C.CString(prefix) + prefix_ms.len = C.size_t(len(prefix)) + defer C.free(unsafe.Pointer(prefix_ms.data)) // For the C ABI, malloc a C array of raw pointers - searchPaths_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(searchPaths)))) + searchPaths_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(searchPaths)))) defer C.free(unsafe.Pointer(searchPaths_CArray)) for i := range searchPaths { - searchPaths_i_ms := libmiqt.Strdupg(searchPaths[i]) - defer C.free(searchPaths_i_ms) - searchPaths_CArray[i] = (*C.struct_miqt_string)(searchPaths_i_ms) + searchPaths_i_ms := C.struct_miqt_string{} + searchPaths_i_ms.data = C.CString(searchPaths[i]) + searchPaths_i_ms.len = C.size_t(len(searchPaths[i])) + defer C.free(unsafe.Pointer(searchPaths_i_ms.data)) + searchPaths_CArray[i] = searchPaths_i_ms } searchPaths_ma := &C.struct_miqt_array{len: C.size_t(len(searchPaths)), data: unsafe.Pointer(searchPaths_CArray)} defer runtime.KeepAlive(unsafe.Pointer(searchPaths_ma)) - C.QDir_SetSearchPaths((*C.struct_miqt_string)(prefix_ms), searchPaths_ma) + C.QDir_SetSearchPaths(prefix_ms, searchPaths_ma) } func QDir_AddSearchPath(prefix string, path string) { - prefix_ms := libmiqt.Strdupg(prefix) - defer C.free(prefix_ms) - path_ms := libmiqt.Strdupg(path) - defer C.free(path_ms) - C.QDir_AddSearchPath((*C.struct_miqt_string)(prefix_ms), (*C.struct_miqt_string)(path_ms)) + prefix_ms := C.struct_miqt_string{} + prefix_ms.data = C.CString(prefix) + prefix_ms.len = C.size_t(len(prefix)) + defer C.free(unsafe.Pointer(prefix_ms.data)) + path_ms := C.struct_miqt_string{} + path_ms.data = C.CString(path) + path_ms.len = C.size_t(len(path)) + defer C.free(unsafe.Pointer(path_ms.data)) + C.QDir_AddSearchPath(prefix_ms, path_ms) } func QDir_SearchPaths(prefix string) []string { - prefix_ms := libmiqt.Strdupg(prefix) - defer C.free(prefix_ms) - var _ma *C.struct_miqt_array = C.QDir_SearchPaths((*C.struct_miqt_string)(prefix_ms)) + prefix_ms := C.struct_miqt_string{} + prefix_ms.data = C.CString(prefix) + prefix_ms.len = C.size_t(len(prefix)) + defer C.free(unsafe.Pointer(prefix_ms.data)) + var _ma *C.struct_miqt_array = C.QDir_SearchPaths(prefix_ms) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -223,61 +252,73 @@ func QDir_SearchPaths(prefix string) []string { } func (this *QDir) DirName() string { - var _ms *C.struct_miqt_string = C.QDir_DirName(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDir_DirName(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QDir) FilePath(fileName string) string { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - var _ms *C.struct_miqt_string = C.QDir_FilePath(this.h, (*C.struct_miqt_string)(fileName_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + var _ms C.struct_miqt_string = C.QDir_FilePath(this.h, fileName_ms) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QDir) AbsoluteFilePath(fileName string) string { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - var _ms *C.struct_miqt_string = C.QDir_AbsoluteFilePath(this.h, (*C.struct_miqt_string)(fileName_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + var _ms C.struct_miqt_string = C.QDir_AbsoluteFilePath(this.h, fileName_ms) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QDir) RelativeFilePath(fileName string) string { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - var _ms *C.struct_miqt_string = C.QDir_RelativeFilePath(this.h, (*C.struct_miqt_string)(fileName_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + var _ms C.struct_miqt_string = C.QDir_RelativeFilePath(this.h, fileName_ms) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QDir_ToNativeSeparators(pathName string) string { - pathName_ms := libmiqt.Strdupg(pathName) - defer C.free(pathName_ms) - var _ms *C.struct_miqt_string = C.QDir_ToNativeSeparators((*C.struct_miqt_string)(pathName_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + pathName_ms := C.struct_miqt_string{} + pathName_ms.data = C.CString(pathName) + pathName_ms.len = C.size_t(len(pathName)) + defer C.free(unsafe.Pointer(pathName_ms.data)) + var _ms C.struct_miqt_string = C.QDir_ToNativeSeparators(pathName_ms) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QDir_FromNativeSeparators(pathName string) string { - pathName_ms := libmiqt.Strdupg(pathName) - defer C.free(pathName_ms) - var _ms *C.struct_miqt_string = C.QDir_FromNativeSeparators((*C.struct_miqt_string)(pathName_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + pathName_ms := C.struct_miqt_string{} + pathName_ms.data = C.CString(pathName) + pathName_ms.len = C.size_t(len(pathName)) + defer C.free(unsafe.Pointer(pathName_ms.data)) + var _ms C.struct_miqt_string = C.QDir_FromNativeSeparators(pathName_ms) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QDir) Cd(dirName string) bool { - dirName_ms := libmiqt.Strdupg(dirName) - defer C.free(dirName_ms) - return (bool)(C.QDir_Cd(this.h, (*C.struct_miqt_string)(dirName_ms))) + dirName_ms := C.struct_miqt_string{} + dirName_ms.data = C.CString(dirName) + dirName_ms.len = C.size_t(len(dirName)) + defer C.free(unsafe.Pointer(dirName_ms.data)) + return (bool)(C.QDir_Cd(this.h, dirName_ms)) } func (this *QDir) CdUp() bool { @@ -287,11 +328,11 @@ func (this *QDir) CdUp() bool { func (this *QDir) NameFilters() []string { var _ma *C.struct_miqt_array = C.QDir_NameFilters(this.h) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -300,12 +341,14 @@ func (this *QDir) NameFilters() []string { func (this *QDir) SetNameFilters(nameFilters []string) { // For the C ABI, malloc a C array of raw pointers - nameFilters_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(nameFilters)))) + nameFilters_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(nameFilters)))) defer C.free(unsafe.Pointer(nameFilters_CArray)) for i := range nameFilters { - nameFilters_i_ms := libmiqt.Strdupg(nameFilters[i]) - defer C.free(nameFilters_i_ms) - nameFilters_CArray[i] = (*C.struct_miqt_string)(nameFilters_i_ms) + nameFilters_i_ms := C.struct_miqt_string{} + nameFilters_i_ms.data = C.CString(nameFilters[i]) + nameFilters_i_ms.len = C.size_t(len(nameFilters[i])) + defer C.free(unsafe.Pointer(nameFilters_i_ms.data)) + nameFilters_CArray[i] = nameFilters_i_ms } nameFilters_ma := &C.struct_miqt_array{len: C.size_t(len(nameFilters)), data: unsafe.Pointer(nameFilters_CArray)} defer runtime.KeepAlive(unsafe.Pointer(nameFilters_ma)) @@ -337,22 +380,24 @@ func (this *QDir) IsEmpty() bool { } func (this *QDir) OperatorSubscript(param1 int) string { - var _ms *C.struct_miqt_string = C.QDir_OperatorSubscript(this.h, (C.int)(param1)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDir_OperatorSubscript(this.h, (C.int)(param1)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QDir_NameFiltersFromString(nameFilter string) []string { - nameFilter_ms := libmiqt.Strdupg(nameFilter) - defer C.free(nameFilter_ms) - var _ma *C.struct_miqt_array = C.QDir_NameFiltersFromString((*C.struct_miqt_string)(nameFilter_ms)) + nameFilter_ms := C.struct_miqt_string{} + nameFilter_ms.data = C.CString(nameFilter) + nameFilter_ms.len = C.size_t(len(nameFilter)) + defer C.free(unsafe.Pointer(nameFilter_ms.data)) + var _ma *C.struct_miqt_array = C.QDir_NameFiltersFromString(nameFilter_ms) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -362,11 +407,11 @@ func QDir_NameFiltersFromString(nameFilter string) []string { func (this *QDir) EntryList() []string { var _ma *C.struct_miqt_array = C.QDir_EntryList(this.h) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -375,22 +420,24 @@ func (this *QDir) EntryList() []string { func (this *QDir) EntryListWithNameFilters(nameFilters []string) []string { // For the C ABI, malloc a C array of raw pointers - nameFilters_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(nameFilters)))) + nameFilters_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(nameFilters)))) defer C.free(unsafe.Pointer(nameFilters_CArray)) for i := range nameFilters { - nameFilters_i_ms := libmiqt.Strdupg(nameFilters[i]) - defer C.free(nameFilters_i_ms) - nameFilters_CArray[i] = (*C.struct_miqt_string)(nameFilters_i_ms) + nameFilters_i_ms := C.struct_miqt_string{} + nameFilters_i_ms.data = C.CString(nameFilters[i]) + nameFilters_i_ms.len = C.size_t(len(nameFilters[i])) + defer C.free(unsafe.Pointer(nameFilters_i_ms.data)) + nameFilters_CArray[i] = nameFilters_i_ms } nameFilters_ma := &C.struct_miqt_array{len: C.size_t(len(nameFilters)), data: unsafe.Pointer(nameFilters_CArray)} defer runtime.KeepAlive(unsafe.Pointer(nameFilters_ma)) var _ma *C.struct_miqt_array = C.QDir_EntryListWithNameFilters(this.h, nameFilters_ma) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -413,12 +460,14 @@ func (this *QDir) EntryInfoList() []QFileInfo { func (this *QDir) EntryInfoListWithNameFilters(nameFilters []string) []QFileInfo { // For the C ABI, malloc a C array of raw pointers - nameFilters_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(nameFilters)))) + nameFilters_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(nameFilters)))) defer C.free(unsafe.Pointer(nameFilters_CArray)) for i := range nameFilters { - nameFilters_i_ms := libmiqt.Strdupg(nameFilters[i]) - defer C.free(nameFilters_i_ms) - nameFilters_CArray[i] = (*C.struct_miqt_string)(nameFilters_i_ms) + nameFilters_i_ms := C.struct_miqt_string{} + nameFilters_i_ms.data = C.CString(nameFilters[i]) + nameFilters_i_ms.len = C.size_t(len(nameFilters[i])) + defer C.free(unsafe.Pointer(nameFilters_i_ms.data)) + nameFilters_CArray[i] = nameFilters_i_ms } nameFilters_ma := &C.struct_miqt_array{len: C.size_t(len(nameFilters)), data: unsafe.Pointer(nameFilters_CArray)} defer runtime.KeepAlive(unsafe.Pointer(nameFilters_ma)) @@ -436,27 +485,35 @@ func (this *QDir) EntryInfoListWithNameFilters(nameFilters []string) []QFileInfo } func (this *QDir) Mkdir(dirName string) bool { - dirName_ms := libmiqt.Strdupg(dirName) - defer C.free(dirName_ms) - return (bool)(C.QDir_Mkdir(this.h, (*C.struct_miqt_string)(dirName_ms))) + dirName_ms := C.struct_miqt_string{} + dirName_ms.data = C.CString(dirName) + dirName_ms.len = C.size_t(len(dirName)) + defer C.free(unsafe.Pointer(dirName_ms.data)) + return (bool)(C.QDir_Mkdir(this.h, dirName_ms)) } func (this *QDir) Rmdir(dirName string) bool { - dirName_ms := libmiqt.Strdupg(dirName) - defer C.free(dirName_ms) - return (bool)(C.QDir_Rmdir(this.h, (*C.struct_miqt_string)(dirName_ms))) + dirName_ms := C.struct_miqt_string{} + dirName_ms.data = C.CString(dirName) + dirName_ms.len = C.size_t(len(dirName)) + defer C.free(unsafe.Pointer(dirName_ms.data)) + return (bool)(C.QDir_Rmdir(this.h, dirName_ms)) } func (this *QDir) Mkpath(dirPath string) bool { - dirPath_ms := libmiqt.Strdupg(dirPath) - defer C.free(dirPath_ms) - return (bool)(C.QDir_Mkpath(this.h, (*C.struct_miqt_string)(dirPath_ms))) + dirPath_ms := C.struct_miqt_string{} + dirPath_ms.data = C.CString(dirPath) + dirPath_ms.len = C.size_t(len(dirPath)) + defer C.free(unsafe.Pointer(dirPath_ms.data)) + return (bool)(C.QDir_Mkpath(this.h, dirPath_ms)) } func (this *QDir) Rmpath(dirPath string) bool { - dirPath_ms := libmiqt.Strdupg(dirPath) - defer C.free(dirPath_ms) - return (bool)(C.QDir_Rmpath(this.h, (*C.struct_miqt_string)(dirPath_ms))) + dirPath_ms := C.struct_miqt_string{} + dirPath_ms.data = C.CString(dirPath) + dirPath_ms.len = C.size_t(len(dirPath)) + defer C.free(unsafe.Pointer(dirPath_ms.data)) + return (bool)(C.QDir_Rmpath(this.h, dirPath_ms)) } func (this *QDir) RemoveRecursively() bool { @@ -476,15 +533,19 @@ func (this *QDir) IsRoot() bool { } func QDir_IsRelativePath(path string) bool { - path_ms := libmiqt.Strdupg(path) - defer C.free(path_ms) - return (bool)(C.QDir_IsRelativePath((*C.struct_miqt_string)(path_ms))) + path_ms := C.struct_miqt_string{} + path_ms.data = C.CString(path) + path_ms.len = C.size_t(len(path)) + defer C.free(unsafe.Pointer(path_ms.data)) + return (bool)(C.QDir_IsRelativePath(path_ms)) } func QDir_IsAbsolutePath(path string) bool { - path_ms := libmiqt.Strdupg(path) - defer C.free(path_ms) - return (bool)(C.QDir_IsAbsolutePath((*C.struct_miqt_string)(path_ms))) + path_ms := C.struct_miqt_string{} + path_ms.data = C.CString(path) + path_ms.len = C.size_t(len(path)) + defer C.free(unsafe.Pointer(path_ms.data)) + return (bool)(C.QDir_IsAbsolutePath(path_ms)) } func (this *QDir) IsRelative() bool { @@ -508,23 +569,31 @@ func (this *QDir) OperatorNotEqual(dir *QDir) bool { } func (this *QDir) Remove(fileName string) bool { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - return (bool)(C.QDir_Remove(this.h, (*C.struct_miqt_string)(fileName_ms))) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + return (bool)(C.QDir_Remove(this.h, fileName_ms)) } func (this *QDir) Rename(oldName string, newName string) bool { - oldName_ms := libmiqt.Strdupg(oldName) - defer C.free(oldName_ms) - newName_ms := libmiqt.Strdupg(newName) - defer C.free(newName_ms) - return (bool)(C.QDir_Rename(this.h, (*C.struct_miqt_string)(oldName_ms), (*C.struct_miqt_string)(newName_ms))) + oldName_ms := C.struct_miqt_string{} + oldName_ms.data = C.CString(oldName) + oldName_ms.len = C.size_t(len(oldName)) + defer C.free(unsafe.Pointer(oldName_ms.data)) + newName_ms := C.struct_miqt_string{} + newName_ms.data = C.CString(newName) + newName_ms.len = C.size_t(len(newName)) + defer C.free(unsafe.Pointer(newName_ms.data)) + return (bool)(C.QDir_Rename(this.h, oldName_ms, newName_ms)) } func (this *QDir) ExistsWithName(name string) bool { - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - return (bool)(C.QDir_ExistsWithName(this.h, (*C.struct_miqt_string)(name_ms))) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + return (bool)(C.QDir_ExistsWithName(this.h, name_ms)) } func QDir_Drives() []QFileInfo { @@ -556,9 +625,11 @@ func QDir_Separator() *QChar { } func QDir_SetCurrent(path string) bool { - path_ms := libmiqt.Strdupg(path) - defer C.free(path_ms) - return (bool)(C.QDir_SetCurrent((*C.struct_miqt_string)(path_ms))) + path_ms := C.struct_miqt_string{} + path_ms.data = C.CString(path) + path_ms.len = C.size_t(len(path)) + defer C.free(unsafe.Pointer(path_ms.data)) + return (bool)(C.QDir_SetCurrent(path_ms)) } func QDir_Current() *QDir { @@ -569,9 +640,9 @@ func QDir_Current() *QDir { } func QDir_CurrentPath() string { - var _ms *C.struct_miqt_string = C.QDir_CurrentPath() - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDir_CurrentPath() + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -583,9 +654,9 @@ func QDir_Home() *QDir { } func QDir_HomePath() string { - var _ms *C.struct_miqt_string = C.QDir_HomePath() - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDir_HomePath() + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -597,9 +668,9 @@ func QDir_Root() *QDir { } func QDir_RootPath() string { - var _ms *C.struct_miqt_string = C.QDir_RootPath() - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDir_RootPath() + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -611,42 +682,52 @@ func QDir_Temp() *QDir { } func QDir_TempPath() string { - var _ms *C.struct_miqt_string = C.QDir_TempPath() - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDir_TempPath() + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QDir_Match(filters []string, fileName string) bool { // For the C ABI, malloc a C array of raw pointers - filters_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(filters)))) + filters_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(filters)))) defer C.free(unsafe.Pointer(filters_CArray)) for i := range filters { - filters_i_ms := libmiqt.Strdupg(filters[i]) - defer C.free(filters_i_ms) - filters_CArray[i] = (*C.struct_miqt_string)(filters_i_ms) + filters_i_ms := C.struct_miqt_string{} + filters_i_ms.data = C.CString(filters[i]) + filters_i_ms.len = C.size_t(len(filters[i])) + defer C.free(unsafe.Pointer(filters_i_ms.data)) + filters_CArray[i] = filters_i_ms } filters_ma := &C.struct_miqt_array{len: C.size_t(len(filters)), data: unsafe.Pointer(filters_CArray)} defer runtime.KeepAlive(unsafe.Pointer(filters_ma)) - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - return (bool)(C.QDir_Match(filters_ma, (*C.struct_miqt_string)(fileName_ms))) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + return (bool)(C.QDir_Match(filters_ma, fileName_ms)) } func QDir_Match2(filter string, fileName string) bool { - filter_ms := libmiqt.Strdupg(filter) - defer C.free(filter_ms) - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - return (bool)(C.QDir_Match2((*C.struct_miqt_string)(filter_ms), (*C.struct_miqt_string)(fileName_ms))) + filter_ms := C.struct_miqt_string{} + filter_ms.data = C.CString(filter) + filter_ms.len = C.size_t(len(filter)) + defer C.free(unsafe.Pointer(filter_ms.data)) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + return (bool)(C.QDir_Match2(filter_ms, fileName_ms)) } func QDir_CleanPath(path string) string { - path_ms := libmiqt.Strdupg(path) - defer C.free(path_ms) - var _ms *C.struct_miqt_string = C.QDir_CleanPath((*C.struct_miqt_string)(path_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + path_ms := C.struct_miqt_string{} + path_ms.data = C.CString(path) + path_ms.len = C.size_t(len(path)) + defer C.free(unsafe.Pointer(path_ms.data)) + var _ms C.struct_miqt_string = C.QDir_CleanPath(path_ms) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -661,11 +742,11 @@ func (this *QDir) IsEmpty1(filters QDir__Filter) bool { func (this *QDir) EntryList1(filters QDir__Filter) []string { var _ma *C.struct_miqt_array = C.QDir_EntryList1(this.h, (C.int)(filters)) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -675,11 +756,11 @@ func (this *QDir) EntryList1(filters QDir__Filter) []string { func (this *QDir) EntryList2(filters QDir__Filter, sort QDir__SortFlag) []string { var _ma *C.struct_miqt_array = C.QDir_EntryList2(this.h, (C.int)(filters), (C.int)(sort)) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -688,22 +769,24 @@ func (this *QDir) EntryList2(filters QDir__Filter, sort QDir__SortFlag) []string func (this *QDir) EntryList22(nameFilters []string, filters QDir__Filter) []string { // For the C ABI, malloc a C array of raw pointers - nameFilters_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(nameFilters)))) + nameFilters_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(nameFilters)))) defer C.free(unsafe.Pointer(nameFilters_CArray)) for i := range nameFilters { - nameFilters_i_ms := libmiqt.Strdupg(nameFilters[i]) - defer C.free(nameFilters_i_ms) - nameFilters_CArray[i] = (*C.struct_miqt_string)(nameFilters_i_ms) + nameFilters_i_ms := C.struct_miqt_string{} + nameFilters_i_ms.data = C.CString(nameFilters[i]) + nameFilters_i_ms.len = C.size_t(len(nameFilters[i])) + defer C.free(unsafe.Pointer(nameFilters_i_ms.data)) + nameFilters_CArray[i] = nameFilters_i_ms } nameFilters_ma := &C.struct_miqt_array{len: C.size_t(len(nameFilters)), data: unsafe.Pointer(nameFilters_CArray)} defer runtime.KeepAlive(unsafe.Pointer(nameFilters_ma)) var _ma *C.struct_miqt_array = C.QDir_EntryList22(this.h, nameFilters_ma, (C.int)(filters)) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -712,22 +795,24 @@ func (this *QDir) EntryList22(nameFilters []string, filters QDir__Filter) []stri func (this *QDir) EntryList3(nameFilters []string, filters QDir__Filter, sort QDir__SortFlag) []string { // For the C ABI, malloc a C array of raw pointers - nameFilters_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(nameFilters)))) + nameFilters_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(nameFilters)))) defer C.free(unsafe.Pointer(nameFilters_CArray)) for i := range nameFilters { - nameFilters_i_ms := libmiqt.Strdupg(nameFilters[i]) - defer C.free(nameFilters_i_ms) - nameFilters_CArray[i] = (*C.struct_miqt_string)(nameFilters_i_ms) + nameFilters_i_ms := C.struct_miqt_string{} + nameFilters_i_ms.data = C.CString(nameFilters[i]) + nameFilters_i_ms.len = C.size_t(len(nameFilters[i])) + defer C.free(unsafe.Pointer(nameFilters_i_ms.data)) + nameFilters_CArray[i] = nameFilters_i_ms } nameFilters_ma := &C.struct_miqt_array{len: C.size_t(len(nameFilters)), data: unsafe.Pointer(nameFilters_CArray)} defer runtime.KeepAlive(unsafe.Pointer(nameFilters_ma)) var _ma *C.struct_miqt_array = C.QDir_EntryList3(this.h, nameFilters_ma, (C.int)(filters), (C.int)(sort)) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -764,12 +849,14 @@ func (this *QDir) EntryInfoList2(filters QDir__Filter, sort QDir__SortFlag) []QF func (this *QDir) EntryInfoList22(nameFilters []string, filters QDir__Filter) []QFileInfo { // For the C ABI, malloc a C array of raw pointers - nameFilters_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(nameFilters)))) + nameFilters_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(nameFilters)))) defer C.free(unsafe.Pointer(nameFilters_CArray)) for i := range nameFilters { - nameFilters_i_ms := libmiqt.Strdupg(nameFilters[i]) - defer C.free(nameFilters_i_ms) - nameFilters_CArray[i] = (*C.struct_miqt_string)(nameFilters_i_ms) + nameFilters_i_ms := C.struct_miqt_string{} + nameFilters_i_ms.data = C.CString(nameFilters[i]) + nameFilters_i_ms.len = C.size_t(len(nameFilters[i])) + defer C.free(unsafe.Pointer(nameFilters_i_ms.data)) + nameFilters_CArray[i] = nameFilters_i_ms } nameFilters_ma := &C.struct_miqt_array{len: C.size_t(len(nameFilters)), data: unsafe.Pointer(nameFilters_CArray)} defer runtime.KeepAlive(unsafe.Pointer(nameFilters_ma)) @@ -788,12 +875,14 @@ func (this *QDir) EntryInfoList22(nameFilters []string, filters QDir__Filter) [] func (this *QDir) EntryInfoList3(nameFilters []string, filters QDir__Filter, sort QDir__SortFlag) []QFileInfo { // For the C ABI, malloc a C array of raw pointers - nameFilters_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(nameFilters)))) + nameFilters_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(nameFilters)))) defer C.free(unsafe.Pointer(nameFilters_CArray)) for i := range nameFilters { - nameFilters_i_ms := libmiqt.Strdupg(nameFilters[i]) - defer C.free(nameFilters_i_ms) - nameFilters_CArray[i] = (*C.struct_miqt_string)(nameFilters_i_ms) + nameFilters_i_ms := C.struct_miqt_string{} + nameFilters_i_ms.data = C.CString(nameFilters[i]) + nameFilters_i_ms.len = C.size_t(len(nameFilters[i])) + defer C.free(unsafe.Pointer(nameFilters_i_ms.data)) + nameFilters_CArray[i] = nameFilters_i_ms } nameFilters_ma := &C.struct_miqt_array{len: C.size_t(len(nameFilters)), data: unsafe.Pointer(nameFilters_CArray)} defer runtime.KeepAlive(unsafe.Pointer(nameFilters_ma)) diff --git a/qt/gen_qdir.h b/qt/gen_qdir.h index 2668a1dd..9779c3ad 100644 --- a/qt/gen_qdir.h +++ b/qt/gen_qdir.h @@ -25,86 +25,86 @@ typedef struct QFileInfo QFileInfo; QDir* QDir_new(QDir* param1); QDir* QDir_new2(); -QDir* QDir_new3(struct miqt_string* path, struct miqt_string* nameFilter); -QDir* QDir_new4(struct miqt_string* path); -QDir* QDir_new5(struct miqt_string* path, struct miqt_string* nameFilter, int sort); -QDir* QDir_new6(struct miqt_string* path, struct miqt_string* nameFilter, int sort, int filter); +QDir* QDir_new3(struct miqt_string path, struct miqt_string nameFilter); +QDir* QDir_new4(struct miqt_string path); +QDir* QDir_new5(struct miqt_string path, struct miqt_string nameFilter, int sort); +QDir* QDir_new6(struct miqt_string path, struct miqt_string nameFilter, int sort, int filter); void QDir_OperatorAssign(QDir* self, QDir* param1); -void QDir_OperatorAssignWithPath(QDir* self, struct miqt_string* path); +void QDir_OperatorAssignWithPath(QDir* self, struct miqt_string path); void QDir_Swap(QDir* self, QDir* other); -void QDir_SetPath(QDir* self, struct miqt_string* path); -struct miqt_string* QDir_Path(const QDir* self); -struct miqt_string* QDir_AbsolutePath(const QDir* self); -struct miqt_string* QDir_CanonicalPath(const QDir* self); -void QDir_AddResourceSearchPath(struct miqt_string* path); -void QDir_SetSearchPaths(struct miqt_string* prefix, struct miqt_array* /* of struct miqt_string* */ searchPaths); -void QDir_AddSearchPath(struct miqt_string* prefix, struct miqt_string* path); -struct miqt_array* QDir_SearchPaths(struct miqt_string* prefix); -struct miqt_string* QDir_DirName(const QDir* self); -struct miqt_string* QDir_FilePath(const QDir* self, struct miqt_string* fileName); -struct miqt_string* QDir_AbsoluteFilePath(const QDir* self, struct miqt_string* fileName); -struct miqt_string* QDir_RelativeFilePath(const QDir* self, struct miqt_string* fileName); -struct miqt_string* QDir_ToNativeSeparators(struct miqt_string* pathName); -struct miqt_string* QDir_FromNativeSeparators(struct miqt_string* pathName); -bool QDir_Cd(QDir* self, struct miqt_string* dirName); +void QDir_SetPath(QDir* self, struct miqt_string path); +struct miqt_string QDir_Path(const QDir* self); +struct miqt_string QDir_AbsolutePath(const QDir* self); +struct miqt_string QDir_CanonicalPath(const QDir* self); +void QDir_AddResourceSearchPath(struct miqt_string path); +void QDir_SetSearchPaths(struct miqt_string prefix, struct miqt_array* /* of struct miqt_string */ searchPaths); +void QDir_AddSearchPath(struct miqt_string prefix, struct miqt_string path); +struct miqt_array* QDir_SearchPaths(struct miqt_string prefix); +struct miqt_string QDir_DirName(const QDir* self); +struct miqt_string QDir_FilePath(const QDir* self, struct miqt_string fileName); +struct miqt_string QDir_AbsoluteFilePath(const QDir* self, struct miqt_string fileName); +struct miqt_string QDir_RelativeFilePath(const QDir* self, struct miqt_string fileName); +struct miqt_string QDir_ToNativeSeparators(struct miqt_string pathName); +struct miqt_string QDir_FromNativeSeparators(struct miqt_string pathName); +bool QDir_Cd(QDir* self, struct miqt_string dirName); bool QDir_CdUp(QDir* self); struct miqt_array* QDir_NameFilters(const QDir* self); -void QDir_SetNameFilters(QDir* self, struct miqt_array* /* of struct miqt_string* */ nameFilters); +void QDir_SetNameFilters(QDir* self, struct miqt_array* /* of struct miqt_string */ nameFilters); int QDir_Filter(const QDir* self); void QDir_SetFilter(QDir* self, int filter); int QDir_Sorting(const QDir* self); void QDir_SetSorting(QDir* self, int sort); unsigned int QDir_Count(const QDir* self); bool QDir_IsEmpty(const QDir* self); -struct miqt_string* QDir_OperatorSubscript(const QDir* self, int param1); -struct miqt_array* QDir_NameFiltersFromString(struct miqt_string* nameFilter); +struct miqt_string QDir_OperatorSubscript(const QDir* self, int param1); +struct miqt_array* QDir_NameFiltersFromString(struct miqt_string nameFilter); struct miqt_array* QDir_EntryList(const QDir* self); -struct miqt_array* QDir_EntryListWithNameFilters(const QDir* self, struct miqt_array* /* of struct miqt_string* */ nameFilters); +struct miqt_array* QDir_EntryListWithNameFilters(const QDir* self, struct miqt_array* /* of struct miqt_string */ nameFilters); struct miqt_array* QDir_EntryInfoList(const QDir* self); -struct miqt_array* QDir_EntryInfoListWithNameFilters(const QDir* self, struct miqt_array* /* of struct miqt_string* */ nameFilters); -bool QDir_Mkdir(const QDir* self, struct miqt_string* dirName); -bool QDir_Rmdir(const QDir* self, struct miqt_string* dirName); -bool QDir_Mkpath(const QDir* self, struct miqt_string* dirPath); -bool QDir_Rmpath(const QDir* self, struct miqt_string* dirPath); +struct miqt_array* QDir_EntryInfoListWithNameFilters(const QDir* self, struct miqt_array* /* of struct miqt_string */ nameFilters); +bool QDir_Mkdir(const QDir* self, struct miqt_string dirName); +bool QDir_Rmdir(const QDir* self, struct miqt_string dirName); +bool QDir_Mkpath(const QDir* self, struct miqt_string dirPath); +bool QDir_Rmpath(const QDir* self, struct miqt_string dirPath); bool QDir_RemoveRecursively(QDir* self); bool QDir_IsReadable(const QDir* self); bool QDir_Exists(const QDir* self); bool QDir_IsRoot(const QDir* self); -bool QDir_IsRelativePath(struct miqt_string* path); -bool QDir_IsAbsolutePath(struct miqt_string* path); +bool QDir_IsRelativePath(struct miqt_string path); +bool QDir_IsAbsolutePath(struct miqt_string path); bool QDir_IsRelative(const QDir* self); bool QDir_IsAbsolute(const QDir* self); bool QDir_MakeAbsolute(QDir* self); bool QDir_OperatorEqual(const QDir* self, QDir* dir); bool QDir_OperatorNotEqual(const QDir* self, QDir* dir); -bool QDir_Remove(QDir* self, struct miqt_string* fileName); -bool QDir_Rename(QDir* self, struct miqt_string* oldName, struct miqt_string* newName); -bool QDir_ExistsWithName(const QDir* self, struct miqt_string* name); +bool QDir_Remove(QDir* self, struct miqt_string fileName); +bool QDir_Rename(QDir* self, struct miqt_string oldName, struct miqt_string newName); +bool QDir_ExistsWithName(const QDir* self, struct miqt_string name); struct miqt_array* QDir_Drives(); QChar* QDir_ListSeparator(); QChar* QDir_Separator(); -bool QDir_SetCurrent(struct miqt_string* path); +bool QDir_SetCurrent(struct miqt_string path); QDir* QDir_Current(); -struct miqt_string* QDir_CurrentPath(); +struct miqt_string QDir_CurrentPath(); QDir* QDir_Home(); -struct miqt_string* QDir_HomePath(); +struct miqt_string QDir_HomePath(); QDir* QDir_Root(); -struct miqt_string* QDir_RootPath(); +struct miqt_string QDir_RootPath(); QDir* QDir_Temp(); -struct miqt_string* QDir_TempPath(); -bool QDir_Match(struct miqt_array* /* of struct miqt_string* */ filters, struct miqt_string* fileName); -bool QDir_Match2(struct miqt_string* filter, struct miqt_string* fileName); -struct miqt_string* QDir_CleanPath(struct miqt_string* path); +struct miqt_string QDir_TempPath(); +bool QDir_Match(struct miqt_array* /* of struct miqt_string */ filters, struct miqt_string fileName); +bool QDir_Match2(struct miqt_string filter, struct miqt_string fileName); +struct miqt_string QDir_CleanPath(struct miqt_string path); void QDir_Refresh(const QDir* self); bool QDir_IsEmpty1(const QDir* self, int filters); struct miqt_array* QDir_EntryList1(const QDir* self, int filters); struct miqt_array* QDir_EntryList2(const QDir* self, int filters, int sort); -struct miqt_array* QDir_EntryList22(const QDir* self, struct miqt_array* /* of struct miqt_string* */ nameFilters, int filters); -struct miqt_array* QDir_EntryList3(const QDir* self, struct miqt_array* /* of struct miqt_string* */ nameFilters, int filters, int sort); +struct miqt_array* QDir_EntryList22(const QDir* self, struct miqt_array* /* of struct miqt_string */ nameFilters, int filters); +struct miqt_array* QDir_EntryList3(const QDir* self, struct miqt_array* /* of struct miqt_string */ nameFilters, int filters, int sort); struct miqt_array* QDir_EntryInfoList1(const QDir* self, int filters); struct miqt_array* QDir_EntryInfoList2(const QDir* self, int filters, int sort); -struct miqt_array* QDir_EntryInfoList22(const QDir* self, struct miqt_array* /* of struct miqt_string* */ nameFilters, int filters); -struct miqt_array* QDir_EntryInfoList3(const QDir* self, struct miqt_array* /* of struct miqt_string* */ nameFilters, int filters, int sort); +struct miqt_array* QDir_EntryInfoList22(const QDir* self, struct miqt_array* /* of struct miqt_string */ nameFilters, int filters); +struct miqt_array* QDir_EntryInfoList3(const QDir* self, struct miqt_array* /* of struct miqt_string */ nameFilters, int filters, int sort); void QDir_Delete(QDir* self); #ifdef __cplusplus diff --git a/qt/gen_qdiriterator.cpp b/qt/gen_qdiriterator.cpp index 5ff2f05a..5389c0d5 100644 --- a/qt/gen_qdiriterator.cpp +++ b/qt/gen_qdiriterator.cpp @@ -13,23 +13,23 @@ QDirIterator* QDirIterator_new(QDir* dir) { return new QDirIterator(*dir); } -QDirIterator* QDirIterator_new2(struct miqt_string* path) { - QString path_QString = QString::fromUtf8(&path->data, path->len); +QDirIterator* QDirIterator_new2(struct miqt_string path) { + QString path_QString = QString::fromUtf8(path.data, path.len); return new QDirIterator(path_QString); } -QDirIterator* QDirIterator_new3(struct miqt_string* path, int filter) { - QString path_QString = QString::fromUtf8(&path->data, path->len); +QDirIterator* QDirIterator_new3(struct miqt_string path, int filter) { + QString path_QString = QString::fromUtf8(path.data, path.len); return new QDirIterator(path_QString, static_cast(filter)); } -QDirIterator* QDirIterator_new4(struct miqt_string* path, struct miqt_array* /* of struct miqt_string* */ nameFilters) { - QString path_QString = QString::fromUtf8(&path->data, path->len); +QDirIterator* QDirIterator_new4(struct miqt_string path, struct miqt_array* /* of struct miqt_string */ nameFilters) { + QString path_QString = QString::fromUtf8(path.data, path.len); QStringList nameFilters_QList; nameFilters_QList.reserve(nameFilters->len); - struct miqt_string** nameFilters_arr = static_cast(nameFilters->data); + struct miqt_string* nameFilters_arr = static_cast(nameFilters->data); for(size_t i = 0; i < nameFilters->len; ++i) { - QString nameFilters_arr_i_QString = QString::fromUtf8(&nameFilters_arr[i]->data, nameFilters_arr[i]->len); + QString nameFilters_arr_i_QString = QString::fromUtf8(nameFilters_arr[i].data, nameFilters_arr[i].len); nameFilters_QList.push_back(nameFilters_arr_i_QString); } return new QDirIterator(path_QString, nameFilters_QList); @@ -39,74 +39,90 @@ QDirIterator* QDirIterator_new5(QDir* dir, int flags) { return new QDirIterator(*dir, static_cast(flags)); } -QDirIterator* QDirIterator_new6(struct miqt_string* path, int flags) { - QString path_QString = QString::fromUtf8(&path->data, path->len); +QDirIterator* QDirIterator_new6(struct miqt_string path, int flags) { + QString path_QString = QString::fromUtf8(path.data, path.len); return new QDirIterator(path_QString, static_cast(flags)); } -QDirIterator* QDirIterator_new7(struct miqt_string* path, int filter, int flags) { - QString path_QString = QString::fromUtf8(&path->data, path->len); +QDirIterator* QDirIterator_new7(struct miqt_string path, int filter, int flags) { + QString path_QString = QString::fromUtf8(path.data, path.len); return new QDirIterator(path_QString, static_cast(filter), static_cast(flags)); } -QDirIterator* QDirIterator_new8(struct miqt_string* path, struct miqt_array* /* of struct miqt_string* */ nameFilters, int filters) { - QString path_QString = QString::fromUtf8(&path->data, path->len); +QDirIterator* QDirIterator_new8(struct miqt_string path, struct miqt_array* /* of struct miqt_string */ nameFilters, int filters) { + QString path_QString = QString::fromUtf8(path.data, path.len); QStringList nameFilters_QList; nameFilters_QList.reserve(nameFilters->len); - struct miqt_string** nameFilters_arr = static_cast(nameFilters->data); + struct miqt_string* nameFilters_arr = static_cast(nameFilters->data); for(size_t i = 0; i < nameFilters->len; ++i) { - QString nameFilters_arr_i_QString = QString::fromUtf8(&nameFilters_arr[i]->data, nameFilters_arr[i]->len); + QString nameFilters_arr_i_QString = QString::fromUtf8(nameFilters_arr[i].data, nameFilters_arr[i].len); nameFilters_QList.push_back(nameFilters_arr_i_QString); } return new QDirIterator(path_QString, nameFilters_QList, static_cast(filters)); } -QDirIterator* QDirIterator_new9(struct miqt_string* path, struct miqt_array* /* of struct miqt_string* */ nameFilters, int filters, int flags) { - QString path_QString = QString::fromUtf8(&path->data, path->len); +QDirIterator* QDirIterator_new9(struct miqt_string path, struct miqt_array* /* of struct miqt_string */ nameFilters, int filters, int flags) { + QString path_QString = QString::fromUtf8(path.data, path.len); QStringList nameFilters_QList; nameFilters_QList.reserve(nameFilters->len); - struct miqt_string** nameFilters_arr = static_cast(nameFilters->data); + struct miqt_string* nameFilters_arr = static_cast(nameFilters->data); for(size_t i = 0; i < nameFilters->len; ++i) { - QString nameFilters_arr_i_QString = QString::fromUtf8(&nameFilters_arr[i]->data, nameFilters_arr[i]->len); + QString nameFilters_arr_i_QString = QString::fromUtf8(nameFilters_arr[i].data, nameFilters_arr[i].len); nameFilters_QList.push_back(nameFilters_arr_i_QString); } return new QDirIterator(path_QString, nameFilters_QList, static_cast(filters), static_cast(flags)); } -struct miqt_string* QDirIterator_Next(QDirIterator* self) { +struct miqt_string QDirIterator_Next(QDirIterator* self) { QString _ret = self->next(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } bool QDirIterator_HasNext(const QDirIterator* self) { return self->hasNext(); } -struct miqt_string* QDirIterator_FileName(const QDirIterator* self) { +struct miqt_string QDirIterator_FileName(const QDirIterator* self) { QString _ret = self->fileName(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDirIterator_FilePath(const QDirIterator* self) { +struct miqt_string QDirIterator_FilePath(const QDirIterator* self) { QString _ret = self->filePath(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QFileInfo* QDirIterator_FileInfo(const QDirIterator* self) { return new QFileInfo(self->fileInfo()); } -struct miqt_string* QDirIterator_Path(const QDirIterator* self) { +struct miqt_string QDirIterator_Path(const QDirIterator* self) { QString _ret = self->path(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QDirIterator_Delete(QDirIterator* self) { diff --git a/qt/gen_qdiriterator.go b/qt/gen_qdiriterator.go index 248ac1bd..1ebe3086 100644 --- a/qt/gen_qdiriterator.go +++ b/qt/gen_qdiriterator.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -59,35 +58,43 @@ func NewQDirIterator(dir *QDir) *QDirIterator { // NewQDirIterator2 constructs a new QDirIterator object. func NewQDirIterator2(path string) *QDirIterator { - path_ms := libmiqt.Strdupg(path) - defer C.free(path_ms) - ret := C.QDirIterator_new2((*C.struct_miqt_string)(path_ms)) + path_ms := C.struct_miqt_string{} + path_ms.data = C.CString(path) + path_ms.len = C.size_t(len(path)) + defer C.free(unsafe.Pointer(path_ms.data)) + ret := C.QDirIterator_new2(path_ms) return newQDirIterator(ret) } // NewQDirIterator3 constructs a new QDirIterator object. func NewQDirIterator3(path string, filter QDir__Filter) *QDirIterator { - path_ms := libmiqt.Strdupg(path) - defer C.free(path_ms) - ret := C.QDirIterator_new3((*C.struct_miqt_string)(path_ms), (C.int)(filter)) + path_ms := C.struct_miqt_string{} + path_ms.data = C.CString(path) + path_ms.len = C.size_t(len(path)) + defer C.free(unsafe.Pointer(path_ms.data)) + ret := C.QDirIterator_new3(path_ms, (C.int)(filter)) return newQDirIterator(ret) } // NewQDirIterator4 constructs a new QDirIterator object. func NewQDirIterator4(path string, nameFilters []string) *QDirIterator { - path_ms := libmiqt.Strdupg(path) - defer C.free(path_ms) + path_ms := C.struct_miqt_string{} + path_ms.data = C.CString(path) + path_ms.len = C.size_t(len(path)) + defer C.free(unsafe.Pointer(path_ms.data)) // For the C ABI, malloc a C array of raw pointers - nameFilters_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(nameFilters)))) + nameFilters_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(nameFilters)))) defer C.free(unsafe.Pointer(nameFilters_CArray)) for i := range nameFilters { - nameFilters_i_ms := libmiqt.Strdupg(nameFilters[i]) - defer C.free(nameFilters_i_ms) - nameFilters_CArray[i] = (*C.struct_miqt_string)(nameFilters_i_ms) + nameFilters_i_ms := C.struct_miqt_string{} + nameFilters_i_ms.data = C.CString(nameFilters[i]) + nameFilters_i_ms.len = C.size_t(len(nameFilters[i])) + defer C.free(unsafe.Pointer(nameFilters_i_ms.data)) + nameFilters_CArray[i] = nameFilters_i_ms } nameFilters_ma := &C.struct_miqt_array{len: C.size_t(len(nameFilters)), data: unsafe.Pointer(nameFilters_CArray)} defer runtime.KeepAlive(unsafe.Pointer(nameFilters_ma)) - ret := C.QDirIterator_new4((*C.struct_miqt_string)(path_ms), nameFilters_ma) + ret := C.QDirIterator_new4(path_ms, nameFilters_ma) return newQDirIterator(ret) } @@ -99,60 +106,72 @@ func NewQDirIterator5(dir *QDir, flags QDirIterator__IteratorFlag) *QDirIterator // NewQDirIterator6 constructs a new QDirIterator object. func NewQDirIterator6(path string, flags QDirIterator__IteratorFlag) *QDirIterator { - path_ms := libmiqt.Strdupg(path) - defer C.free(path_ms) - ret := C.QDirIterator_new6((*C.struct_miqt_string)(path_ms), (C.int)(flags)) + path_ms := C.struct_miqt_string{} + path_ms.data = C.CString(path) + path_ms.len = C.size_t(len(path)) + defer C.free(unsafe.Pointer(path_ms.data)) + ret := C.QDirIterator_new6(path_ms, (C.int)(flags)) return newQDirIterator(ret) } // NewQDirIterator7 constructs a new QDirIterator object. func NewQDirIterator7(path string, filter QDir__Filter, flags QDirIterator__IteratorFlag) *QDirIterator { - path_ms := libmiqt.Strdupg(path) - defer C.free(path_ms) - ret := C.QDirIterator_new7((*C.struct_miqt_string)(path_ms), (C.int)(filter), (C.int)(flags)) + path_ms := C.struct_miqt_string{} + path_ms.data = C.CString(path) + path_ms.len = C.size_t(len(path)) + defer C.free(unsafe.Pointer(path_ms.data)) + ret := C.QDirIterator_new7(path_ms, (C.int)(filter), (C.int)(flags)) return newQDirIterator(ret) } // NewQDirIterator8 constructs a new QDirIterator object. func NewQDirIterator8(path string, nameFilters []string, filters QDir__Filter) *QDirIterator { - path_ms := libmiqt.Strdupg(path) - defer C.free(path_ms) + path_ms := C.struct_miqt_string{} + path_ms.data = C.CString(path) + path_ms.len = C.size_t(len(path)) + defer C.free(unsafe.Pointer(path_ms.data)) // For the C ABI, malloc a C array of raw pointers - nameFilters_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(nameFilters)))) + nameFilters_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(nameFilters)))) defer C.free(unsafe.Pointer(nameFilters_CArray)) for i := range nameFilters { - nameFilters_i_ms := libmiqt.Strdupg(nameFilters[i]) - defer C.free(nameFilters_i_ms) - nameFilters_CArray[i] = (*C.struct_miqt_string)(nameFilters_i_ms) + nameFilters_i_ms := C.struct_miqt_string{} + nameFilters_i_ms.data = C.CString(nameFilters[i]) + nameFilters_i_ms.len = C.size_t(len(nameFilters[i])) + defer C.free(unsafe.Pointer(nameFilters_i_ms.data)) + nameFilters_CArray[i] = nameFilters_i_ms } nameFilters_ma := &C.struct_miqt_array{len: C.size_t(len(nameFilters)), data: unsafe.Pointer(nameFilters_CArray)} defer runtime.KeepAlive(unsafe.Pointer(nameFilters_ma)) - ret := C.QDirIterator_new8((*C.struct_miqt_string)(path_ms), nameFilters_ma, (C.int)(filters)) + ret := C.QDirIterator_new8(path_ms, nameFilters_ma, (C.int)(filters)) return newQDirIterator(ret) } // NewQDirIterator9 constructs a new QDirIterator object. func NewQDirIterator9(path string, nameFilters []string, filters QDir__Filter, flags QDirIterator__IteratorFlag) *QDirIterator { - path_ms := libmiqt.Strdupg(path) - defer C.free(path_ms) + path_ms := C.struct_miqt_string{} + path_ms.data = C.CString(path) + path_ms.len = C.size_t(len(path)) + defer C.free(unsafe.Pointer(path_ms.data)) // For the C ABI, malloc a C array of raw pointers - nameFilters_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(nameFilters)))) + nameFilters_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(nameFilters)))) defer C.free(unsafe.Pointer(nameFilters_CArray)) for i := range nameFilters { - nameFilters_i_ms := libmiqt.Strdupg(nameFilters[i]) - defer C.free(nameFilters_i_ms) - nameFilters_CArray[i] = (*C.struct_miqt_string)(nameFilters_i_ms) + nameFilters_i_ms := C.struct_miqt_string{} + nameFilters_i_ms.data = C.CString(nameFilters[i]) + nameFilters_i_ms.len = C.size_t(len(nameFilters[i])) + defer C.free(unsafe.Pointer(nameFilters_i_ms.data)) + nameFilters_CArray[i] = nameFilters_i_ms } nameFilters_ma := &C.struct_miqt_array{len: C.size_t(len(nameFilters)), data: unsafe.Pointer(nameFilters_CArray)} defer runtime.KeepAlive(unsafe.Pointer(nameFilters_ma)) - ret := C.QDirIterator_new9((*C.struct_miqt_string)(path_ms), nameFilters_ma, (C.int)(filters), (C.int)(flags)) + ret := C.QDirIterator_new9(path_ms, nameFilters_ma, (C.int)(filters), (C.int)(flags)) return newQDirIterator(ret) } func (this *QDirIterator) Next() string { - var _ms *C.struct_miqt_string = C.QDirIterator_Next(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDirIterator_Next(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -161,16 +180,16 @@ func (this *QDirIterator) HasNext() bool { } func (this *QDirIterator) FileName() string { - var _ms *C.struct_miqt_string = C.QDirIterator_FileName(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDirIterator_FileName(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QDirIterator) FilePath() string { - var _ms *C.struct_miqt_string = C.QDirIterator_FilePath(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDirIterator_FilePath(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -182,9 +201,9 @@ func (this *QDirIterator) FileInfo() *QFileInfo { } func (this *QDirIterator) Path() string { - var _ms *C.struct_miqt_string = C.QDirIterator_Path(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDirIterator_Path(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qdiriterator.h b/qt/gen_qdiriterator.h index 00e093e9..2578f6a5 100644 --- a/qt/gen_qdiriterator.h +++ b/qt/gen_qdiriterator.h @@ -24,20 +24,20 @@ typedef struct QFileInfo QFileInfo; #endif QDirIterator* QDirIterator_new(QDir* dir); -QDirIterator* QDirIterator_new2(struct miqt_string* path); -QDirIterator* QDirIterator_new3(struct miqt_string* path, int filter); -QDirIterator* QDirIterator_new4(struct miqt_string* path, struct miqt_array* /* of struct miqt_string* */ nameFilters); +QDirIterator* QDirIterator_new2(struct miqt_string path); +QDirIterator* QDirIterator_new3(struct miqt_string path, int filter); +QDirIterator* QDirIterator_new4(struct miqt_string path, struct miqt_array* /* of struct miqt_string */ nameFilters); QDirIterator* QDirIterator_new5(QDir* dir, int flags); -QDirIterator* QDirIterator_new6(struct miqt_string* path, int flags); -QDirIterator* QDirIterator_new7(struct miqt_string* path, int filter, int flags); -QDirIterator* QDirIterator_new8(struct miqt_string* path, struct miqt_array* /* of struct miqt_string* */ nameFilters, int filters); -QDirIterator* QDirIterator_new9(struct miqt_string* path, struct miqt_array* /* of struct miqt_string* */ nameFilters, int filters, int flags); -struct miqt_string* QDirIterator_Next(QDirIterator* self); +QDirIterator* QDirIterator_new6(struct miqt_string path, int flags); +QDirIterator* QDirIterator_new7(struct miqt_string path, int filter, int flags); +QDirIterator* QDirIterator_new8(struct miqt_string path, struct miqt_array* /* of struct miqt_string */ nameFilters, int filters); +QDirIterator* QDirIterator_new9(struct miqt_string path, struct miqt_array* /* of struct miqt_string */ nameFilters, int filters, int flags); +struct miqt_string QDirIterator_Next(QDirIterator* self); bool QDirIterator_HasNext(const QDirIterator* self); -struct miqt_string* QDirIterator_FileName(const QDirIterator* self); -struct miqt_string* QDirIterator_FilePath(const QDirIterator* self); +struct miqt_string QDirIterator_FileName(const QDirIterator* self); +struct miqt_string QDirIterator_FilePath(const QDirIterator* self); QFileInfo* QDirIterator_FileInfo(const QDirIterator* self); -struct miqt_string* QDirIterator_Path(const QDirIterator* self); +struct miqt_string QDirIterator_Path(const QDirIterator* self); void QDirIterator_Delete(QDirIterator* self); #ifdef __cplusplus diff --git a/qt/gen_qdirmodel.cpp b/qt/gen_qdirmodel.cpp index a206f180..ff771d81 100644 --- a/qt/gen_qdirmodel.cpp +++ b/qt/gen_qdirmodel.cpp @@ -15,12 +15,12 @@ #include "gen_qdirmodel.h" #include "_cgo_export.h" -QDirModel* QDirModel_new(struct miqt_array* /* of struct miqt_string* */ nameFilters, int filters, int sort) { +QDirModel* QDirModel_new(struct miqt_array* /* of struct miqt_string */ nameFilters, int filters, int sort) { QStringList nameFilters_QList; nameFilters_QList.reserve(nameFilters->len); - struct miqt_string** nameFilters_arr = static_cast(nameFilters->data); + struct miqt_string* nameFilters_arr = static_cast(nameFilters->data); for(size_t i = 0; i < nameFilters->len; ++i) { - QString nameFilters_arr_i_QString = QString::fromUtf8(&nameFilters_arr[i]->data, nameFilters_arr[i]->len); + QString nameFilters_arr_i_QString = QString::fromUtf8(nameFilters_arr[i].data, nameFilters_arr[i].len); nameFilters_QList.push_back(nameFilters_arr_i_QString); } return new QDirModel(nameFilters_QList, static_cast(filters), static_cast(sort)); @@ -30,12 +30,12 @@ QDirModel* QDirModel_new2() { return new QDirModel(); } -QDirModel* QDirModel_new3(struct miqt_array* /* of struct miqt_string* */ nameFilters, int filters, int sort, QObject* parent) { +QDirModel* QDirModel_new3(struct miqt_array* /* of struct miqt_string */ nameFilters, int filters, int sort, QObject* parent) { QStringList nameFilters_QList; nameFilters_QList.reserve(nameFilters->len); - struct miqt_string** nameFilters_arr = static_cast(nameFilters->data); + struct miqt_string* nameFilters_arr = static_cast(nameFilters->data); for(size_t i = 0; i < nameFilters->len; ++i) { - QString nameFilters_arr_i_QString = QString::fromUtf8(&nameFilters_arr[i]->data, nameFilters_arr[i]->len); + QString nameFilters_arr_i_QString = QString::fromUtf8(nameFilters_arr[i].data, nameFilters_arr[i].len); nameFilters_QList.push_back(nameFilters_arr_i_QString); } return new QDirModel(nameFilters_QList, static_cast(filters), static_cast(sort), parent); @@ -53,18 +53,26 @@ void* QDirModel_Metacast(QDirModel* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QDirModel_Tr(const char* s) { +struct miqt_string QDirModel_Tr(const char* s) { QString _ret = QDirModel::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDirModel_TrUtf8(const char* s) { +struct miqt_string QDirModel_TrUtf8(const char* s) { QString _ret = QDirModel::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QModelIndex* QDirModel_Index(const QDirModel* self, int row, int column) { @@ -111,12 +119,16 @@ void QDirModel_Sort(QDirModel* self, int column) { struct miqt_array* QDirModel_MimeTypes(const QDirModel* self) { QStringList _ret = self->mimeTypes(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -151,12 +163,12 @@ QFileIconProvider* QDirModel_IconProvider(const QDirModel* self) { return self->iconProvider(); } -void QDirModel_SetNameFilters(QDirModel* self, struct miqt_array* /* of struct miqt_string* */ filters) { +void QDirModel_SetNameFilters(QDirModel* self, struct miqt_array* /* of struct miqt_string */ filters) { QStringList filters_QList; filters_QList.reserve(filters->len); - struct miqt_string** filters_arr = static_cast(filters->data); + struct miqt_string* filters_arr = static_cast(filters->data); for(size_t i = 0; i < filters->len; ++i) { - QString filters_arr_i_QString = QString::fromUtf8(&filters_arr[i]->data, filters_arr[i]->len); + QString filters_arr_i_QString = QString::fromUtf8(filters_arr[i].data, filters_arr[i].len); filters_QList.push_back(filters_arr_i_QString); } self->setNameFilters(filters_QList); @@ -165,12 +177,16 @@ void QDirModel_SetNameFilters(QDirModel* self, struct miqt_array* /* of struct m struct miqt_array* QDirModel_NameFilters(const QDirModel* self) { QStringList _ret = self->nameFilters(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -220,8 +236,8 @@ bool QDirModel_LazyChildCount(const QDirModel* self) { return self->lazyChildCount(); } -QModelIndex* QDirModel_IndexWithPath(const QDirModel* self, struct miqt_string* path) { - QString path_QString = QString::fromUtf8(&path->data, path->len); +QModelIndex* QDirModel_IndexWithPath(const QDirModel* self, struct miqt_string path) { + QString path_QString = QString::fromUtf8(path.data, path.len); return new QModelIndex(self->index(path_QString)); } @@ -229,8 +245,8 @@ bool QDirModel_IsDir(const QDirModel* self, QModelIndex* index) { return self->isDir(*index); } -QModelIndex* QDirModel_Mkdir(QDirModel* self, QModelIndex* parent, struct miqt_string* name) { - QString name_QString = QString::fromUtf8(&name->data, name->len); +QModelIndex* QDirModel_Mkdir(QDirModel* self, QModelIndex* parent, struct miqt_string name) { + QString name_QString = QString::fromUtf8(name.data, name.len); return new QModelIndex(self->mkdir(*parent, name_QString)); } @@ -242,18 +258,26 @@ bool QDirModel_Remove(QDirModel* self, QModelIndex* index) { return self->remove(*index); } -struct miqt_string* QDirModel_FilePath(const QDirModel* self, QModelIndex* index) { +struct miqt_string QDirModel_FilePath(const QDirModel* self, QModelIndex* index) { QString _ret = self->filePath(*index); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDirModel_FileName(const QDirModel* self, QModelIndex* index) { +struct miqt_string QDirModel_FileName(const QDirModel* self, QModelIndex* index) { QString _ret = self->fileName(*index); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QIcon* QDirModel_FileIcon(const QDirModel* self, QModelIndex* index) { @@ -268,32 +292,48 @@ void QDirModel_Refresh(QDirModel* self) { self->refresh(); } -struct miqt_string* QDirModel_Tr2(const char* s, const char* c) { +struct miqt_string QDirModel_Tr2(const char* s, const char* c) { QString _ret = QDirModel::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDirModel_Tr3(const char* s, const char* c, int n) { +struct miqt_string QDirModel_Tr3(const char* s, const char* c, int n) { QString _ret = QDirModel::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDirModel_TrUtf82(const char* s, const char* c) { +struct miqt_string QDirModel_TrUtf82(const char* s, const char* c) { QString _ret = QDirModel::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDirModel_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QDirModel_TrUtf83(const char* s, const char* c, int n) { QString _ret = QDirModel::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QModelIndex* QDirModel_Index3(const QDirModel* self, int row, int column, QModelIndex* parent) { @@ -328,8 +368,8 @@ void QDirModel_Sort2(QDirModel* self, int column, int order) { self->sort(static_cast(column), static_cast(order)); } -QModelIndex* QDirModel_Index2(const QDirModel* self, struct miqt_string* path, int column) { - QString path_QString = QString::fromUtf8(&path->data, path->len); +QModelIndex* QDirModel_Index2(const QDirModel* self, struct miqt_string path, int column) { + QString path_QString = QString::fromUtf8(path.data, path.len); return new QModelIndex(self->index(path_QString, static_cast(column))); } diff --git a/qt/gen_qdirmodel.go b/qt/gen_qdirmodel.go index 9c0ef9fa..d96f8b66 100644 --- a/qt/gen_qdirmodel.go +++ b/qt/gen_qdirmodel.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -55,12 +54,14 @@ func UnsafeNewQDirModel(h unsafe.Pointer) *QDirModel { // NewQDirModel constructs a new QDirModel object. func NewQDirModel(nameFilters []string, filters QDir__Filter, sort QDir__SortFlag) *QDirModel { // For the C ABI, malloc a C array of raw pointers - nameFilters_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(nameFilters)))) + nameFilters_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(nameFilters)))) defer C.free(unsafe.Pointer(nameFilters_CArray)) for i := range nameFilters { - nameFilters_i_ms := libmiqt.Strdupg(nameFilters[i]) - defer C.free(nameFilters_i_ms) - nameFilters_CArray[i] = (*C.struct_miqt_string)(nameFilters_i_ms) + nameFilters_i_ms := C.struct_miqt_string{} + nameFilters_i_ms.data = C.CString(nameFilters[i]) + nameFilters_i_ms.len = C.size_t(len(nameFilters[i])) + defer C.free(unsafe.Pointer(nameFilters_i_ms.data)) + nameFilters_CArray[i] = nameFilters_i_ms } nameFilters_ma := &C.struct_miqt_array{len: C.size_t(len(nameFilters)), data: unsafe.Pointer(nameFilters_CArray)} defer runtime.KeepAlive(unsafe.Pointer(nameFilters_ma)) @@ -77,12 +78,14 @@ func NewQDirModel2() *QDirModel { // NewQDirModel3 constructs a new QDirModel object. func NewQDirModel3(nameFilters []string, filters QDir__Filter, sort QDir__SortFlag, parent *QObject) *QDirModel { // For the C ABI, malloc a C array of raw pointers - nameFilters_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(nameFilters)))) + nameFilters_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(nameFilters)))) defer C.free(unsafe.Pointer(nameFilters_CArray)) for i := range nameFilters { - nameFilters_i_ms := libmiqt.Strdupg(nameFilters[i]) - defer C.free(nameFilters_i_ms) - nameFilters_CArray[i] = (*C.struct_miqt_string)(nameFilters_i_ms) + nameFilters_i_ms := C.struct_miqt_string{} + nameFilters_i_ms.data = C.CString(nameFilters[i]) + nameFilters_i_ms.len = C.size_t(len(nameFilters[i])) + defer C.free(unsafe.Pointer(nameFilters_i_ms.data)) + nameFilters_CArray[i] = nameFilters_i_ms } nameFilters_ma := &C.struct_miqt_array{len: C.size_t(len(nameFilters)), data: unsafe.Pointer(nameFilters_CArray)} defer runtime.KeepAlive(unsafe.Pointer(nameFilters_ma)) @@ -103,24 +106,24 @@ func (this *QDirModel) MetaObject() *QMetaObject { func (this *QDirModel) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QDirModel_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QDirModel_Metacast(this.h, param1_Cstring)) } func QDirModel_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QDirModel_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDirModel_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QDirModel_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QDirModel_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDirModel_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -179,11 +182,11 @@ func (this *QDirModel) Sort(column int) { func (this *QDirModel) MimeTypes() []string { var _ma *C.struct_miqt_array = C.QDirModel_MimeTypes(this.h) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -220,12 +223,14 @@ func (this *QDirModel) IconProvider() *QFileIconProvider { func (this *QDirModel) SetNameFilters(filters []string) { // For the C ABI, malloc a C array of raw pointers - filters_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(filters)))) + filters_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(filters)))) defer C.free(unsafe.Pointer(filters_CArray)) for i := range filters { - filters_i_ms := libmiqt.Strdupg(filters[i]) - defer C.free(filters_i_ms) - filters_CArray[i] = (*C.struct_miqt_string)(filters_i_ms) + filters_i_ms := C.struct_miqt_string{} + filters_i_ms.data = C.CString(filters[i]) + filters_i_ms.len = C.size_t(len(filters[i])) + defer C.free(unsafe.Pointer(filters_i_ms.data)) + filters_CArray[i] = filters_i_ms } filters_ma := &C.struct_miqt_array{len: C.size_t(len(filters)), data: unsafe.Pointer(filters_CArray)} defer runtime.KeepAlive(unsafe.Pointer(filters_ma)) @@ -235,11 +240,11 @@ func (this *QDirModel) SetNameFilters(filters []string) { func (this *QDirModel) NameFilters() []string { var _ma *C.struct_miqt_array = C.QDirModel_NameFilters(this.h) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -287,9 +292,11 @@ func (this *QDirModel) LazyChildCount() bool { } func (this *QDirModel) IndexWithPath(path string) *QModelIndex { - path_ms := libmiqt.Strdupg(path) - defer C.free(path_ms) - _ret := C.QDirModel_IndexWithPath(this.h, (*C.struct_miqt_string)(path_ms)) + path_ms := C.struct_miqt_string{} + path_ms.data = C.CString(path) + path_ms.len = C.size_t(len(path)) + defer C.free(unsafe.Pointer(path_ms.data)) + _ret := C.QDirModel_IndexWithPath(this.h, path_ms) _goptr := newQModelIndex(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -300,9 +307,11 @@ func (this *QDirModel) IsDir(index *QModelIndex) bool { } func (this *QDirModel) Mkdir(parent *QModelIndex, name string) *QModelIndex { - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - _ret := C.QDirModel_Mkdir(this.h, parent.cPointer(), (*C.struct_miqt_string)(name_ms)) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + _ret := C.QDirModel_Mkdir(this.h, parent.cPointer(), name_ms) _goptr := newQModelIndex(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -317,16 +326,16 @@ func (this *QDirModel) Remove(index *QModelIndex) bool { } func (this *QDirModel) FilePath(index *QModelIndex) string { - var _ms *C.struct_miqt_string = C.QDirModel_FilePath(this.h, index.cPointer()) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDirModel_FilePath(this.h, index.cPointer()) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QDirModel) FileName(index *QModelIndex) string { - var _ms *C.struct_miqt_string = C.QDirModel_FileName(this.h, index.cPointer()) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDirModel_FileName(this.h, index.cPointer()) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -353,9 +362,9 @@ func QDirModel_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDirModel_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDirModel_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -364,9 +373,9 @@ func QDirModel_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDirModel_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDirModel_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -375,9 +384,9 @@ func QDirModel_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDirModel_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDirModel_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -386,9 +395,9 @@ func QDirModel_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDirModel_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDirModel_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -434,9 +443,11 @@ func (this *QDirModel) Sort2(column int, order SortOrder) { } func (this *QDirModel) Index2(path string, column int) *QModelIndex { - path_ms := libmiqt.Strdupg(path) - defer C.free(path_ms) - _ret := C.QDirModel_Index2(this.h, (*C.struct_miqt_string)(path_ms), (C.int)(column)) + path_ms := C.struct_miqt_string{} + path_ms.data = C.CString(path) + path_ms.len = C.size_t(len(path)) + defer C.free(unsafe.Pointer(path_ms.data)) + _ret := C.QDirModel_Index2(this.h, path_ms, (C.int)(column)) _goptr := newQModelIndex(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr diff --git a/qt/gen_qdirmodel.h b/qt/gen_qdirmodel.h index 209f83b9..8ab27b8c 100644 --- a/qt/gen_qdirmodel.h +++ b/qt/gen_qdirmodel.h @@ -35,14 +35,14 @@ typedef struct QObject QObject; typedef struct QVariant QVariant; #endif -QDirModel* QDirModel_new(struct miqt_array* /* of struct miqt_string* */ nameFilters, int filters, int sort); +QDirModel* QDirModel_new(struct miqt_array* /* of struct miqt_string */ nameFilters, int filters, int sort); QDirModel* QDirModel_new2(); -QDirModel* QDirModel_new3(struct miqt_array* /* of struct miqt_string* */ nameFilters, int filters, int sort, QObject* parent); +QDirModel* QDirModel_new3(struct miqt_array* /* of struct miqt_string */ nameFilters, int filters, int sort, QObject* parent); QDirModel* QDirModel_new4(QObject* parent); QMetaObject* QDirModel_MetaObject(const QDirModel* self); void* QDirModel_Metacast(QDirModel* self, const char* param1); -struct miqt_string* QDirModel_Tr(const char* s); -struct miqt_string* QDirModel_TrUtf8(const char* s); +struct miqt_string QDirModel_Tr(const char* s); +struct miqt_string QDirModel_TrUtf8(const char* s); QModelIndex* QDirModel_Index(const QDirModel* self, int row, int column); QModelIndex* QDirModel_Parent(const QDirModel* self, QModelIndex* child); int QDirModel_RowCount(const QDirModel* self); @@ -59,7 +59,7 @@ bool QDirModel_DropMimeData(QDirModel* self, QMimeData* data, int action, int ro int QDirModel_SupportedDropActions(const QDirModel* self); void QDirModel_SetIconProvider(QDirModel* self, QFileIconProvider* provider); QFileIconProvider* QDirModel_IconProvider(const QDirModel* self); -void QDirModel_SetNameFilters(QDirModel* self, struct miqt_array* /* of struct miqt_string* */ filters); +void QDirModel_SetNameFilters(QDirModel* self, struct miqt_array* /* of struct miqt_string */ filters); struct miqt_array* QDirModel_NameFilters(const QDirModel* self); void QDirModel_SetFilter(QDirModel* self, int filters); int QDirModel_Filter(const QDirModel* self); @@ -71,20 +71,20 @@ void QDirModel_SetReadOnly(QDirModel* self, bool enable); bool QDirModel_IsReadOnly(const QDirModel* self); void QDirModel_SetLazyChildCount(QDirModel* self, bool enable); bool QDirModel_LazyChildCount(const QDirModel* self); -QModelIndex* QDirModel_IndexWithPath(const QDirModel* self, struct miqt_string* path); +QModelIndex* QDirModel_IndexWithPath(const QDirModel* self, struct miqt_string path); bool QDirModel_IsDir(const QDirModel* self, QModelIndex* index); -QModelIndex* QDirModel_Mkdir(QDirModel* self, QModelIndex* parent, struct miqt_string* name); +QModelIndex* QDirModel_Mkdir(QDirModel* self, QModelIndex* parent, struct miqt_string name); bool QDirModel_Rmdir(QDirModel* self, QModelIndex* index); bool QDirModel_Remove(QDirModel* self, QModelIndex* index); -struct miqt_string* QDirModel_FilePath(const QDirModel* self, QModelIndex* index); -struct miqt_string* QDirModel_FileName(const QDirModel* self, QModelIndex* index); +struct miqt_string QDirModel_FilePath(const QDirModel* self, QModelIndex* index); +struct miqt_string QDirModel_FileName(const QDirModel* self, QModelIndex* index); QIcon* QDirModel_FileIcon(const QDirModel* self, QModelIndex* index); QFileInfo* QDirModel_FileInfo(const QDirModel* self, QModelIndex* index); void QDirModel_Refresh(QDirModel* self); -struct miqt_string* QDirModel_Tr2(const char* s, const char* c); -struct miqt_string* QDirModel_Tr3(const char* s, const char* c, int n); -struct miqt_string* QDirModel_TrUtf82(const char* s, const char* c); -struct miqt_string* QDirModel_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QDirModel_Tr2(const char* s, const char* c); +struct miqt_string QDirModel_Tr3(const char* s, const char* c, int n); +struct miqt_string QDirModel_TrUtf82(const char* s, const char* c); +struct miqt_string QDirModel_TrUtf83(const char* s, const char* c, int n); QModelIndex* QDirModel_Index3(const QDirModel* self, int row, int column, QModelIndex* parent); int QDirModel_RowCount1(const QDirModel* self, QModelIndex* parent); int QDirModel_ColumnCount1(const QDirModel* self, QModelIndex* parent); @@ -93,7 +93,7 @@ bool QDirModel_SetData3(QDirModel* self, QModelIndex* index, QVariant* value, in QVariant* QDirModel_HeaderData3(const QDirModel* self, int section, int orientation, int role); bool QDirModel_HasChildren1(const QDirModel* self, QModelIndex* index); void QDirModel_Sort2(QDirModel* self, int column, int order); -QModelIndex* QDirModel_Index2(const QDirModel* self, struct miqt_string* path, int column); +QModelIndex* QDirModel_Index2(const QDirModel* self, struct miqt_string path, int column); void QDirModel_Refresh1(QDirModel* self, QModelIndex* parent); void QDirModel_Delete(QDirModel* self); diff --git a/qt/gen_qdockwidget.cpp b/qt/gen_qdockwidget.cpp index ef46043a..058f9035 100644 --- a/qt/gen_qdockwidget.cpp +++ b/qt/gen_qdockwidget.cpp @@ -9,8 +9,8 @@ #include "gen_qdockwidget.h" #include "_cgo_export.h" -QDockWidget* QDockWidget_new(struct miqt_string* title) { - QString title_QString = QString::fromUtf8(&title->data, title->len); +QDockWidget* QDockWidget_new(struct miqt_string title) { + QString title_QString = QString::fromUtf8(title.data, title.len); return new QDockWidget(title_QString); } @@ -18,13 +18,13 @@ QDockWidget* QDockWidget_new2() { return new QDockWidget(); } -QDockWidget* QDockWidget_new3(struct miqt_string* title, QWidget* parent) { - QString title_QString = QString::fromUtf8(&title->data, title->len); +QDockWidget* QDockWidget_new3(struct miqt_string title, QWidget* parent) { + QString title_QString = QString::fromUtf8(title.data, title.len); return new QDockWidget(title_QString, parent); } -QDockWidget* QDockWidget_new4(struct miqt_string* title, QWidget* parent, int flags) { - QString title_QString = QString::fromUtf8(&title->data, title->len); +QDockWidget* QDockWidget_new4(struct miqt_string title, QWidget* parent, int flags) { + QString title_QString = QString::fromUtf8(title.data, title.len); return new QDockWidget(title_QString, parent, static_cast(flags)); } @@ -44,18 +44,26 @@ void* QDockWidget_Metacast(QDockWidget* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QDockWidget_Tr(const char* s) { +struct miqt_string QDockWidget_Tr(const char* s) { QString _ret = QDockWidget::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDockWidget_TrUtf8(const char* s) { +struct miqt_string QDockWidget_TrUtf8(const char* s) { QString _ret = QDockWidget::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QWidget* QDockWidget_Widget(const QDockWidget* self) { @@ -166,32 +174,48 @@ void QDockWidget_connect_DockLocationChanged(QDockWidget* self, intptr_t slot) { }); } -struct miqt_string* QDockWidget_Tr2(const char* s, const char* c) { +struct miqt_string QDockWidget_Tr2(const char* s, const char* c) { QString _ret = QDockWidget::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDockWidget_Tr3(const char* s, const char* c, int n) { +struct miqt_string QDockWidget_Tr3(const char* s, const char* c, int n) { QString _ret = QDockWidget::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDockWidget_TrUtf82(const char* s, const char* c) { +struct miqt_string QDockWidget_TrUtf82(const char* s, const char* c) { QString _ret = QDockWidget::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDockWidget_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QDockWidget_TrUtf83(const char* s, const char* c, int n) { QString _ret = QDockWidget::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QDockWidget_Delete(QDockWidget* self) { diff --git a/qt/gen_qdockwidget.go b/qt/gen_qdockwidget.go index 706b77fd..7889cba4 100644 --- a/qt/gen_qdockwidget.go +++ b/qt/gen_qdockwidget.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "runtime/cgo" "unsafe" @@ -60,9 +59,11 @@ func UnsafeNewQDockWidget(h unsafe.Pointer) *QDockWidget { // NewQDockWidget constructs a new QDockWidget object. func NewQDockWidget(title string) *QDockWidget { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - ret := C.QDockWidget_new((*C.struct_miqt_string)(title_ms)) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + ret := C.QDockWidget_new(title_ms) return newQDockWidget(ret) } @@ -74,17 +75,21 @@ func NewQDockWidget2() *QDockWidget { // NewQDockWidget3 constructs a new QDockWidget object. func NewQDockWidget3(title string, parent *QWidget) *QDockWidget { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - ret := C.QDockWidget_new3((*C.struct_miqt_string)(title_ms), parent.cPointer()) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + ret := C.QDockWidget_new3(title_ms, parent.cPointer()) return newQDockWidget(ret) } // NewQDockWidget4 constructs a new QDockWidget object. func NewQDockWidget4(title string, parent *QWidget, flags WindowType) *QDockWidget { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - ret := C.QDockWidget_new4((*C.struct_miqt_string)(title_ms), parent.cPointer(), (C.int)(flags)) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + ret := C.QDockWidget_new4(title_ms, parent.cPointer(), (C.int)(flags)) return newQDockWidget(ret) } @@ -107,24 +112,24 @@ func (this *QDockWidget) MetaObject() *QMetaObject { func (this *QDockWidget) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QDockWidget_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QDockWidget_Metacast(this.h, param1_Cstring)) } func QDockWidget_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QDockWidget_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDockWidget_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QDockWidget_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QDockWidget_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDockWidget_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -281,9 +286,9 @@ func QDockWidget_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDockWidget_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDockWidget_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -292,9 +297,9 @@ func QDockWidget_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDockWidget_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDockWidget_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -303,9 +308,9 @@ func QDockWidget_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDockWidget_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDockWidget_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -314,9 +319,9 @@ func QDockWidget_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDockWidget_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDockWidget_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qdockwidget.h b/qt/gen_qdockwidget.h index 7472aca9..7f71cb54 100644 --- a/qt/gen_qdockwidget.h +++ b/qt/gen_qdockwidget.h @@ -25,16 +25,16 @@ typedef struct QMetaObject QMetaObject; typedef struct QWidget QWidget; #endif -QDockWidget* QDockWidget_new(struct miqt_string* title); +QDockWidget* QDockWidget_new(struct miqt_string title); QDockWidget* QDockWidget_new2(); -QDockWidget* QDockWidget_new3(struct miqt_string* title, QWidget* parent); -QDockWidget* QDockWidget_new4(struct miqt_string* title, QWidget* parent, int flags); +QDockWidget* QDockWidget_new3(struct miqt_string title, QWidget* parent); +QDockWidget* QDockWidget_new4(struct miqt_string title, QWidget* parent, int flags); QDockWidget* QDockWidget_new5(QWidget* parent); QDockWidget* QDockWidget_new6(QWidget* parent, int flags); QMetaObject* QDockWidget_MetaObject(const QDockWidget* self); void* QDockWidget_Metacast(QDockWidget* self, const char* param1); -struct miqt_string* QDockWidget_Tr(const char* s); -struct miqt_string* QDockWidget_TrUtf8(const char* s); +struct miqt_string QDockWidget_Tr(const char* s); +struct miqt_string QDockWidget_TrUtf8(const char* s); QWidget* QDockWidget_Widget(const QDockWidget* self); void QDockWidget_SetWidget(QDockWidget* self, QWidget* widget); void QDockWidget_SetFeatures(QDockWidget* self, int features); @@ -57,10 +57,10 @@ void QDockWidget_VisibilityChanged(QDockWidget* self, bool visible); void QDockWidget_connect_VisibilityChanged(QDockWidget* self, intptr_t slot); void QDockWidget_DockLocationChanged(QDockWidget* self, int area); void QDockWidget_connect_DockLocationChanged(QDockWidget* self, intptr_t slot); -struct miqt_string* QDockWidget_Tr2(const char* s, const char* c); -struct miqt_string* QDockWidget_Tr3(const char* s, const char* c, int n); -struct miqt_string* QDockWidget_TrUtf82(const char* s, const char* c); -struct miqt_string* QDockWidget_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QDockWidget_Tr2(const char* s, const char* c); +struct miqt_string QDockWidget_Tr3(const char* s, const char* c, int n); +struct miqt_string QDockWidget_TrUtf82(const char* s, const char* c); +struct miqt_string QDockWidget_TrUtf83(const char* s, const char* c, int n); void QDockWidget_Delete(QDockWidget* self); #ifdef __cplusplus diff --git a/qt/gen_qdrag.cpp b/qt/gen_qdrag.cpp index a0c1ebe9..88c529c8 100644 --- a/qt/gen_qdrag.cpp +++ b/qt/gen_qdrag.cpp @@ -23,18 +23,26 @@ void* QDrag_Metacast(QDrag* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QDrag_Tr(const char* s) { +struct miqt_string QDrag_Tr(const char* s) { QString _ret = QDrag::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDrag_TrUtf8(const char* s) { +struct miqt_string QDrag_TrUtf8(const char* s) { QString _ret = QDrag::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QDrag_SetMimeData(QDrag* self, QMimeData* data) { @@ -129,32 +137,48 @@ void QDrag_connect_TargetChanged(QDrag* self, intptr_t slot) { }); } -struct miqt_string* QDrag_Tr2(const char* s, const char* c) { +struct miqt_string QDrag_Tr2(const char* s, const char* c) { QString _ret = QDrag::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDrag_Tr3(const char* s, const char* c, int n) { +struct miqt_string QDrag_Tr3(const char* s, const char* c, int n) { QString _ret = QDrag::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDrag_TrUtf82(const char* s, const char* c) { +struct miqt_string QDrag_TrUtf82(const char* s, const char* c) { QString _ret = QDrag::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDrag_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QDrag_TrUtf83(const char* s, const char* c, int n) { QString _ret = QDrag::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QDrag_Start1(QDrag* self, int supportedActions) { diff --git a/qt/gen_qdrag.go b/qt/gen_qdrag.go index 8e8530bd..5425ac1c 100644 --- a/qt/gen_qdrag.go +++ b/qt/gen_qdrag.go @@ -57,24 +57,24 @@ func (this *QDrag) MetaObject() *QMetaObject { func (this *QDrag) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QDrag_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QDrag_Metacast(this.h, param1_Cstring)) } func QDrag_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QDrag_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDrag_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QDrag_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QDrag_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDrag_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -196,9 +196,9 @@ func QDrag_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDrag_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDrag_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -207,9 +207,9 @@ func QDrag_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDrag_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDrag_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -218,9 +218,9 @@ func QDrag_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDrag_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDrag_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -229,9 +229,9 @@ func QDrag_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDrag_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDrag_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qdrag.h b/qt/gen_qdrag.h index 3f633880..9e66f73e 100644 --- a/qt/gen_qdrag.h +++ b/qt/gen_qdrag.h @@ -32,8 +32,8 @@ typedef struct QPoint QPoint; QDrag* QDrag_new(QObject* dragSource); QMetaObject* QDrag_MetaObject(const QDrag* self); void* QDrag_Metacast(QDrag* self, const char* param1); -struct miqt_string* QDrag_Tr(const char* s); -struct miqt_string* QDrag_TrUtf8(const char* s); +struct miqt_string QDrag_Tr(const char* s); +struct miqt_string QDrag_TrUtf8(const char* s); void QDrag_SetMimeData(QDrag* self, QMimeData* data); QMimeData* QDrag_MimeData(const QDrag* self); void QDrag_SetPixmap(QDrag* self, QPixmap* pixmap); @@ -54,10 +54,10 @@ void QDrag_ActionChanged(QDrag* self, int action); void QDrag_connect_ActionChanged(QDrag* self, intptr_t slot); void QDrag_TargetChanged(QDrag* self, QObject* newTarget); void QDrag_connect_TargetChanged(QDrag* self, intptr_t slot); -struct miqt_string* QDrag_Tr2(const char* s, const char* c); -struct miqt_string* QDrag_Tr3(const char* s, const char* c, int n); -struct miqt_string* QDrag_TrUtf82(const char* s, const char* c); -struct miqt_string* QDrag_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QDrag_Tr2(const char* s, const char* c); +struct miqt_string QDrag_Tr3(const char* s, const char* c, int n); +struct miqt_string QDrag_TrUtf82(const char* s, const char* c); +struct miqt_string QDrag_TrUtf83(const char* s, const char* c, int n); int QDrag_Start1(QDrag* self, int supportedActions); int QDrag_Exec1(QDrag* self, int supportedActions); void QDrag_Delete(QDrag* self); diff --git a/qt/gen_qerrormessage.cpp b/qt/gen_qerrormessage.cpp index b750da0e..207edbbd 100644 --- a/qt/gen_qerrormessage.cpp +++ b/qt/gen_qerrormessage.cpp @@ -24,61 +24,85 @@ void* QErrorMessage_Metacast(QErrorMessage* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QErrorMessage_Tr(const char* s) { +struct miqt_string QErrorMessage_Tr(const char* s) { QString _ret = QErrorMessage::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QErrorMessage_TrUtf8(const char* s) { +struct miqt_string QErrorMessage_TrUtf8(const char* s) { QString _ret = QErrorMessage::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QErrorMessage* QErrorMessage_QtHandler() { return QErrorMessage::qtHandler(); } -void QErrorMessage_ShowMessage(QErrorMessage* self, struct miqt_string* message) { - QString message_QString = QString::fromUtf8(&message->data, message->len); +void QErrorMessage_ShowMessage(QErrorMessage* self, struct miqt_string message) { + QString message_QString = QString::fromUtf8(message.data, message.len); self->showMessage(message_QString); } -void QErrorMessage_ShowMessage2(QErrorMessage* self, struct miqt_string* message, struct miqt_string* typeVal) { - QString message_QString = QString::fromUtf8(&message->data, message->len); - QString typeVal_QString = QString::fromUtf8(&typeVal->data, typeVal->len); +void QErrorMessage_ShowMessage2(QErrorMessage* self, struct miqt_string message, struct miqt_string typeVal) { + QString message_QString = QString::fromUtf8(message.data, message.len); + QString typeVal_QString = QString::fromUtf8(typeVal.data, typeVal.len); self->showMessage(message_QString, typeVal_QString); } -struct miqt_string* QErrorMessage_Tr2(const char* s, const char* c) { +struct miqt_string QErrorMessage_Tr2(const char* s, const char* c) { QString _ret = QErrorMessage::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QErrorMessage_Tr3(const char* s, const char* c, int n) { +struct miqt_string QErrorMessage_Tr3(const char* s, const char* c, int n) { QString _ret = QErrorMessage::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QErrorMessage_TrUtf82(const char* s, const char* c) { +struct miqt_string QErrorMessage_TrUtf82(const char* s, const char* c) { QString _ret = QErrorMessage::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QErrorMessage_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QErrorMessage_TrUtf83(const char* s, const char* c, int n) { QString _ret = QErrorMessage::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QErrorMessage_Delete(QErrorMessage* self) { diff --git a/qt/gen_qerrormessage.go b/qt/gen_qerrormessage.go index 5d32f1c7..a2467c1e 100644 --- a/qt/gen_qerrormessage.go +++ b/qt/gen_qerrormessage.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -63,24 +62,24 @@ func (this *QErrorMessage) MetaObject() *QMetaObject { func (this *QErrorMessage) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QErrorMessage_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QErrorMessage_Metacast(this.h, param1_Cstring)) } func QErrorMessage_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QErrorMessage_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QErrorMessage_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QErrorMessage_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QErrorMessage_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QErrorMessage_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -89,17 +88,23 @@ func QErrorMessage_QtHandler() *QErrorMessage { } func (this *QErrorMessage) ShowMessage(message string) { - message_ms := libmiqt.Strdupg(message) - defer C.free(message_ms) - C.QErrorMessage_ShowMessage(this.h, (*C.struct_miqt_string)(message_ms)) + message_ms := C.struct_miqt_string{} + message_ms.data = C.CString(message) + message_ms.len = C.size_t(len(message)) + defer C.free(unsafe.Pointer(message_ms.data)) + C.QErrorMessage_ShowMessage(this.h, message_ms) } func (this *QErrorMessage) ShowMessage2(message string, typeVal string) { - message_ms := libmiqt.Strdupg(message) - defer C.free(message_ms) - typeVal_ms := libmiqt.Strdupg(typeVal) - defer C.free(typeVal_ms) - C.QErrorMessage_ShowMessage2(this.h, (*C.struct_miqt_string)(message_ms), (*C.struct_miqt_string)(typeVal_ms)) + message_ms := C.struct_miqt_string{} + message_ms.data = C.CString(message) + message_ms.len = C.size_t(len(message)) + defer C.free(unsafe.Pointer(message_ms.data)) + typeVal_ms := C.struct_miqt_string{} + typeVal_ms.data = C.CString(typeVal) + typeVal_ms.len = C.size_t(len(typeVal)) + defer C.free(unsafe.Pointer(typeVal_ms.data)) + C.QErrorMessage_ShowMessage2(this.h, message_ms, typeVal_ms) } func QErrorMessage_Tr2(s string, c string) string { @@ -107,9 +112,9 @@ func QErrorMessage_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QErrorMessage_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QErrorMessage_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -118,9 +123,9 @@ func QErrorMessage_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QErrorMessage_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QErrorMessage_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -129,9 +134,9 @@ func QErrorMessage_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QErrorMessage_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QErrorMessage_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -140,9 +145,9 @@ func QErrorMessage_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QErrorMessage_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QErrorMessage_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qerrormessage.h b/qt/gen_qerrormessage.h index 9704e41e..4f7356d6 100644 --- a/qt/gen_qerrormessage.h +++ b/qt/gen_qerrormessage.h @@ -27,15 +27,15 @@ QErrorMessage* QErrorMessage_new(); QErrorMessage* QErrorMessage_new2(QWidget* parent); QMetaObject* QErrorMessage_MetaObject(const QErrorMessage* self); void* QErrorMessage_Metacast(QErrorMessage* self, const char* param1); -struct miqt_string* QErrorMessage_Tr(const char* s); -struct miqt_string* QErrorMessage_TrUtf8(const char* s); +struct miqt_string QErrorMessage_Tr(const char* s); +struct miqt_string QErrorMessage_TrUtf8(const char* s); QErrorMessage* QErrorMessage_QtHandler(); -void QErrorMessage_ShowMessage(QErrorMessage* self, struct miqt_string* message); -void QErrorMessage_ShowMessage2(QErrorMessage* self, struct miqt_string* message, struct miqt_string* typeVal); -struct miqt_string* QErrorMessage_Tr2(const char* s, const char* c); -struct miqt_string* QErrorMessage_Tr3(const char* s, const char* c, int n); -struct miqt_string* QErrorMessage_TrUtf82(const char* s, const char* c); -struct miqt_string* QErrorMessage_TrUtf83(const char* s, const char* c, int n); +void QErrorMessage_ShowMessage(QErrorMessage* self, struct miqt_string message); +void QErrorMessage_ShowMessage2(QErrorMessage* self, struct miqt_string message, struct miqt_string typeVal); +struct miqt_string QErrorMessage_Tr2(const char* s, const char* c); +struct miqt_string QErrorMessage_Tr3(const char* s, const char* c, int n); +struct miqt_string QErrorMessage_TrUtf82(const char* s, const char* c); +struct miqt_string QErrorMessage_TrUtf83(const char* s, const char* c, int n); void QErrorMessage_Delete(QErrorMessage* self); #ifdef __cplusplus diff --git a/qt/gen_qevent.cpp b/qt/gen_qevent.cpp index 0ebca36a..13dd1872 100644 --- a/qt/gen_qevent.cpp +++ b/qt/gen_qevent.cpp @@ -593,33 +593,33 @@ QKeyEvent* QKeyEvent_new3(QKeyEvent* param1) { return new QKeyEvent(*param1); } -QKeyEvent* QKeyEvent_new4(int typeVal, int key, int modifiers, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QKeyEvent* QKeyEvent_new4(int typeVal, int key, int modifiers, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QKeyEvent(static_cast(typeVal), static_cast(key), static_cast(modifiers), text_QString); } -QKeyEvent* QKeyEvent_new5(int typeVal, int key, int modifiers, struct miqt_string* text, bool autorep) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QKeyEvent* QKeyEvent_new5(int typeVal, int key, int modifiers, struct miqt_string text, bool autorep) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QKeyEvent(static_cast(typeVal), static_cast(key), static_cast(modifiers), text_QString, autorep); } -QKeyEvent* QKeyEvent_new6(int typeVal, int key, int modifiers, struct miqt_string* text, bool autorep, uint16_t count) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QKeyEvent* QKeyEvent_new6(int typeVal, int key, int modifiers, struct miqt_string text, bool autorep, uint16_t count) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QKeyEvent(static_cast(typeVal), static_cast(key), static_cast(modifiers), text_QString, autorep, static_cast(count)); } -QKeyEvent* QKeyEvent_new7(int typeVal, int key, int modifiers, unsigned int nativeScanCode, unsigned int nativeVirtualKey, unsigned int nativeModifiers, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QKeyEvent* QKeyEvent_new7(int typeVal, int key, int modifiers, unsigned int nativeScanCode, unsigned int nativeVirtualKey, unsigned int nativeModifiers, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QKeyEvent(static_cast(typeVal), static_cast(key), static_cast(modifiers), static_cast(nativeScanCode), static_cast(nativeVirtualKey), static_cast(nativeModifiers), text_QString); } -QKeyEvent* QKeyEvent_new8(int typeVal, int key, int modifiers, unsigned int nativeScanCode, unsigned int nativeVirtualKey, unsigned int nativeModifiers, struct miqt_string* text, bool autorep) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QKeyEvent* QKeyEvent_new8(int typeVal, int key, int modifiers, unsigned int nativeScanCode, unsigned int nativeVirtualKey, unsigned int nativeModifiers, struct miqt_string text, bool autorep) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QKeyEvent(static_cast(typeVal), static_cast(key), static_cast(modifiers), static_cast(nativeScanCode), static_cast(nativeVirtualKey), static_cast(nativeModifiers), text_QString, autorep); } -QKeyEvent* QKeyEvent_new9(int typeVal, int key, int modifiers, unsigned int nativeScanCode, unsigned int nativeVirtualKey, unsigned int nativeModifiers, struct miqt_string* text, bool autorep, uint16_t count) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QKeyEvent* QKeyEvent_new9(int typeVal, int key, int modifiers, unsigned int nativeScanCode, unsigned int nativeVirtualKey, unsigned int nativeModifiers, struct miqt_string text, bool autorep, uint16_t count) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QKeyEvent(static_cast(typeVal), static_cast(key), static_cast(modifiers), static_cast(nativeScanCode), static_cast(nativeVirtualKey), static_cast(nativeModifiers), text_QString, autorep, static_cast(count)); } @@ -636,11 +636,15 @@ int QKeyEvent_Modifiers(const QKeyEvent* self) { return static_cast(_ret); } -struct miqt_string* QKeyEvent_Text(const QKeyEvent* self) { +struct miqt_string QKeyEvent_Text(const QKeyEvent* self) { QString _ret = self->text(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } bool QKeyEvent_IsAutoRepeat(const QKeyEvent* self) { @@ -931,8 +935,8 @@ QInputMethodEvent* QInputMethodEvent_new() { return new QInputMethodEvent(); } -QInputMethodEvent* QInputMethodEvent_new2(struct miqt_string* preeditText, struct miqt_array* /* of QInputMethodEvent__Attribute* */ attributes) { - QString preeditText_QString = QString::fromUtf8(&preeditText->data, preeditText->len); +QInputMethodEvent* QInputMethodEvent_new2(struct miqt_string preeditText, struct miqt_array* /* of QInputMethodEvent__Attribute* */ attributes) { + QString preeditText_QString = QString::fromUtf8(preeditText.data, preeditText.len); QList attributes_QList; attributes_QList.reserve(attributes->len); QInputMethodEvent__Attribute** attributes_arr = static_cast(attributes->data); @@ -946,8 +950,8 @@ QInputMethodEvent* QInputMethodEvent_new3(QInputMethodEvent* other) { return new QInputMethodEvent(*other); } -void QInputMethodEvent_SetCommitString(QInputMethodEvent* self, struct miqt_string* commitString) { - QString commitString_QString = QString::fromUtf8(&commitString->data, commitString->len); +void QInputMethodEvent_SetCommitString(QInputMethodEvent* self, struct miqt_string commitString) { + QString commitString_QString = QString::fromUtf8(commitString.data, commitString.len); self->setCommitString(commitString_QString); } @@ -964,18 +968,26 @@ struct miqt_array* QInputMethodEvent_Attributes(const QInputMethodEvent* self) { return _out; } -struct miqt_string* QInputMethodEvent_PreeditString(const QInputMethodEvent* self) { +struct miqt_string QInputMethodEvent_PreeditString(const QInputMethodEvent* self) { const QString _ret = self->preeditString(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QInputMethodEvent_CommitString(const QInputMethodEvent* self) { +struct miqt_string QInputMethodEvent_CommitString(const QInputMethodEvent* self) { const QString _ret = self->commitString(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QInputMethodEvent_ReplacementStart(const QInputMethodEvent* self) { @@ -986,13 +998,13 @@ int QInputMethodEvent_ReplacementLength(const QInputMethodEvent* self) { return self->replacementLength(); } -void QInputMethodEvent_SetCommitString2(QInputMethodEvent* self, struct miqt_string* commitString, int replaceFrom) { - QString commitString_QString = QString::fromUtf8(&commitString->data, commitString->len); +void QInputMethodEvent_SetCommitString2(QInputMethodEvent* self, struct miqt_string commitString, int replaceFrom) { + QString commitString_QString = QString::fromUtf8(commitString.data, commitString.len); self->setCommitString(commitString_QString, static_cast(replaceFrom)); } -void QInputMethodEvent_SetCommitString3(QInputMethodEvent* self, struct miqt_string* commitString, int replaceFrom, int replaceLength) { - QString commitString_QString = QString::fromUtf8(&commitString->data, commitString->len); +void QInputMethodEvent_SetCommitString3(QInputMethodEvent* self, struct miqt_string commitString, int replaceFrom, int replaceLength) { + QString commitString_QString = QString::fromUtf8(commitString.data, commitString.len); self->setCommitString(commitString_QString, static_cast(replaceFrom), static_cast(replaceLength)); } @@ -1200,8 +1212,8 @@ void QHelpEvent_Delete(QHelpEvent* self) { delete self; } -QStatusTipEvent* QStatusTipEvent_new(struct miqt_string* tip) { - QString tip_QString = QString::fromUtf8(&tip->data, tip->len); +QStatusTipEvent* QStatusTipEvent_new(struct miqt_string tip) { + QString tip_QString = QString::fromUtf8(tip.data, tip.len); return new QStatusTipEvent(tip_QString); } @@ -1209,19 +1221,23 @@ QStatusTipEvent* QStatusTipEvent_new2(QStatusTipEvent* param1) { return new QStatusTipEvent(*param1); } -struct miqt_string* QStatusTipEvent_Tip(const QStatusTipEvent* self) { +struct miqt_string QStatusTipEvent_Tip(const QStatusTipEvent* self) { QString _ret = self->tip(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QStatusTipEvent_Delete(QStatusTipEvent* self) { delete self; } -QWhatsThisClickedEvent* QWhatsThisClickedEvent_new(struct miqt_string* href) { - QString href_QString = QString::fromUtf8(&href->data, href->len); +QWhatsThisClickedEvent* QWhatsThisClickedEvent_new(struct miqt_string href) { + QString href_QString = QString::fromUtf8(href.data, href.len); return new QWhatsThisClickedEvent(href_QString); } @@ -1229,11 +1245,15 @@ QWhatsThisClickedEvent* QWhatsThisClickedEvent_new2(QWhatsThisClickedEvent* para return new QWhatsThisClickedEvent(*param1); } -struct miqt_string* QWhatsThisClickedEvent_Href(const QWhatsThisClickedEvent* self) { +struct miqt_string QWhatsThisClickedEvent_Href(const QWhatsThisClickedEvent* self) { QString _ret = self->href(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QWhatsThisClickedEvent_Delete(QWhatsThisClickedEvent* self) { @@ -1268,8 +1288,8 @@ void QActionEvent_Delete(QActionEvent* self) { delete self; } -QFileOpenEvent* QFileOpenEvent_new(struct miqt_string* file) { - QString file_QString = QString::fromUtf8(&file->data, file->len); +QFileOpenEvent* QFileOpenEvent_new(struct miqt_string file) { + QString file_QString = QString::fromUtf8(file.data, file.len); return new QFileOpenEvent(file_QString); } @@ -1281,11 +1301,15 @@ QFileOpenEvent* QFileOpenEvent_new3(QFileOpenEvent* param1) { return new QFileOpenEvent(*param1); } -struct miqt_string* QFileOpenEvent_File(const QFileOpenEvent* self) { +struct miqt_string QFileOpenEvent_File(const QFileOpenEvent* self) { QString _ret = self->file(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QUrl* QFileOpenEvent_Url(const QFileOpenEvent* self) { diff --git a/qt/gen_qevent.go b/qt/gen_qevent.go index 57e2dffa..70f42076 100644 --- a/qt/gen_qevent.go +++ b/qt/gen_qevent.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -35,10 +34,10 @@ const ( type QTabletEvent__PointerType int const ( - QTabletEvent__PointerType__UnknownPointer QTabletEvent__PointerType = 0 - QTabletEvent__PointerType__Pen QTabletEvent__PointerType = 1 - QTabletEvent__PointerType__Cursor QTabletEvent__PointerType = 2 - QTabletEvent__PointerType__Eraser QTabletEvent__PointerType = 3 + QTabletEvent__UnknownPointer QTabletEvent__PointerType = 0 + QTabletEvent__Pen QTabletEvent__PointerType = 1 + QTabletEvent__Cursor QTabletEvent__PointerType = 2 + QTabletEvent__Eraser QTabletEvent__PointerType = 3 ) type QPlatformSurfaceEvent__SurfaceEventType int @@ -59,18 +58,18 @@ const ( type QInputMethodEvent__AttributeType int const ( - QInputMethodEvent__AttributeType__TextFormat QInputMethodEvent__AttributeType = 0 - QInputMethodEvent__AttributeType__Cursor QInputMethodEvent__AttributeType = 1 - QInputMethodEvent__AttributeType__Language QInputMethodEvent__AttributeType = 2 - QInputMethodEvent__AttributeType__Ruby QInputMethodEvent__AttributeType = 3 - QInputMethodEvent__AttributeType__Selection QInputMethodEvent__AttributeType = 4 + QInputMethodEvent__TextFormat QInputMethodEvent__AttributeType = 0 + QInputMethodEvent__Cursor QInputMethodEvent__AttributeType = 1 + QInputMethodEvent__Language QInputMethodEvent__AttributeType = 2 + QInputMethodEvent__Ruby QInputMethodEvent__AttributeType = 3 + QInputMethodEvent__Selection QInputMethodEvent__AttributeType = 4 ) type QTouchEvent__TouchPoint__InfoFlag int const ( - QTouchEvent__TouchPoint__InfoFlag__Pen QTouchEvent__TouchPoint__InfoFlag = 1 - QTouchEvent__TouchPoint__InfoFlag__Token QTouchEvent__TouchPoint__InfoFlag = 2 + QTouchEvent__TouchPoint__Pen QTouchEvent__TouchPoint__InfoFlag = 1 + QTouchEvent__TouchPoint__Token QTouchEvent__TouchPoint__InfoFlag = 2 ) type QScrollEvent__ScrollState int @@ -983,49 +982,61 @@ func NewQKeyEvent3(param1 *QKeyEvent) *QKeyEvent { // NewQKeyEvent4 constructs a new QKeyEvent object. func NewQKeyEvent4(typeVal QEvent__Type, key int, modifiers KeyboardModifier, text string) *QKeyEvent { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - ret := C.QKeyEvent_new4((C.int)(typeVal), (C.int)(key), (C.int)(modifiers), (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + ret := C.QKeyEvent_new4((C.int)(typeVal), (C.int)(key), (C.int)(modifiers), text_ms) return newQKeyEvent(ret) } // NewQKeyEvent5 constructs a new QKeyEvent object. func NewQKeyEvent5(typeVal QEvent__Type, key int, modifiers KeyboardModifier, text string, autorep bool) *QKeyEvent { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - ret := C.QKeyEvent_new5((C.int)(typeVal), (C.int)(key), (C.int)(modifiers), (*C.struct_miqt_string)(text_ms), (C.bool)(autorep)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + ret := C.QKeyEvent_new5((C.int)(typeVal), (C.int)(key), (C.int)(modifiers), text_ms, (C.bool)(autorep)) return newQKeyEvent(ret) } // NewQKeyEvent6 constructs a new QKeyEvent object. func NewQKeyEvent6(typeVal QEvent__Type, key int, modifiers KeyboardModifier, text string, autorep bool, count uint16) *QKeyEvent { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - ret := C.QKeyEvent_new6((C.int)(typeVal), (C.int)(key), (C.int)(modifiers), (*C.struct_miqt_string)(text_ms), (C.bool)(autorep), (C.uint16_t)(count)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + ret := C.QKeyEvent_new6((C.int)(typeVal), (C.int)(key), (C.int)(modifiers), text_ms, (C.bool)(autorep), (C.uint16_t)(count)) return newQKeyEvent(ret) } // NewQKeyEvent7 constructs a new QKeyEvent object. func NewQKeyEvent7(typeVal QEvent__Type, key int, modifiers KeyboardModifier, nativeScanCode uint, nativeVirtualKey uint, nativeModifiers uint, text string) *QKeyEvent { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - ret := C.QKeyEvent_new7((C.int)(typeVal), (C.int)(key), (C.int)(modifiers), (C.uint)(nativeScanCode), (C.uint)(nativeVirtualKey), (C.uint)(nativeModifiers), (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + ret := C.QKeyEvent_new7((C.int)(typeVal), (C.int)(key), (C.int)(modifiers), (C.uint)(nativeScanCode), (C.uint)(nativeVirtualKey), (C.uint)(nativeModifiers), text_ms) return newQKeyEvent(ret) } // NewQKeyEvent8 constructs a new QKeyEvent object. func NewQKeyEvent8(typeVal QEvent__Type, key int, modifiers KeyboardModifier, nativeScanCode uint, nativeVirtualKey uint, nativeModifiers uint, text string, autorep bool) *QKeyEvent { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - ret := C.QKeyEvent_new8((C.int)(typeVal), (C.int)(key), (C.int)(modifiers), (C.uint)(nativeScanCode), (C.uint)(nativeVirtualKey), (C.uint)(nativeModifiers), (*C.struct_miqt_string)(text_ms), (C.bool)(autorep)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + ret := C.QKeyEvent_new8((C.int)(typeVal), (C.int)(key), (C.int)(modifiers), (C.uint)(nativeScanCode), (C.uint)(nativeVirtualKey), (C.uint)(nativeModifiers), text_ms, (C.bool)(autorep)) return newQKeyEvent(ret) } // NewQKeyEvent9 constructs a new QKeyEvent object. func NewQKeyEvent9(typeVal QEvent__Type, key int, modifiers KeyboardModifier, nativeScanCode uint, nativeVirtualKey uint, nativeModifiers uint, text string, autorep bool, count uint16) *QKeyEvent { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - ret := C.QKeyEvent_new9((C.int)(typeVal), (C.int)(key), (C.int)(modifiers), (C.uint)(nativeScanCode), (C.uint)(nativeVirtualKey), (C.uint)(nativeModifiers), (*C.struct_miqt_string)(text_ms), (C.bool)(autorep), (C.uint16_t)(count)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + ret := C.QKeyEvent_new9((C.int)(typeVal), (C.int)(key), (C.int)(modifiers), (C.uint)(nativeScanCode), (C.uint)(nativeVirtualKey), (C.uint)(nativeModifiers), text_ms, (C.bool)(autorep), (C.uint16_t)(count)) return newQKeyEvent(ret) } @@ -1042,9 +1053,9 @@ func (this *QKeyEvent) Modifiers() KeyboardModifier { } func (this *QKeyEvent) Text() string { - var _ms *C.struct_miqt_string = C.QKeyEvent_Text(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QKeyEvent_Text(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -1848,8 +1859,10 @@ func NewQInputMethodEvent() *QInputMethodEvent { // NewQInputMethodEvent2 constructs a new QInputMethodEvent object. func NewQInputMethodEvent2(preeditText string, attributes []QInputMethodEvent__Attribute) *QInputMethodEvent { - preeditText_ms := libmiqt.Strdupg(preeditText) - defer C.free(preeditText_ms) + preeditText_ms := C.struct_miqt_string{} + preeditText_ms.data = C.CString(preeditText) + preeditText_ms.len = C.size_t(len(preeditText)) + defer C.free(unsafe.Pointer(preeditText_ms.data)) // For the C ABI, malloc a C array of raw pointers attributes_CArray := (*[0xffff]*C.QInputMethodEvent__Attribute)(C.malloc(C.size_t(8 * len(attributes)))) defer C.free(unsafe.Pointer(attributes_CArray)) @@ -1858,7 +1871,7 @@ func NewQInputMethodEvent2(preeditText string, attributes []QInputMethodEvent__A } attributes_ma := &C.struct_miqt_array{len: C.size_t(len(attributes)), data: unsafe.Pointer(attributes_CArray)} defer runtime.KeepAlive(unsafe.Pointer(attributes_ma)) - ret := C.QInputMethodEvent_new2((*C.struct_miqt_string)(preeditText_ms), attributes_ma) + ret := C.QInputMethodEvent_new2(preeditText_ms, attributes_ma) return newQInputMethodEvent(ret) } @@ -1869,9 +1882,11 @@ func NewQInputMethodEvent3(other *QInputMethodEvent) *QInputMethodEvent { } func (this *QInputMethodEvent) SetCommitString(commitString string) { - commitString_ms := libmiqt.Strdupg(commitString) - defer C.free(commitString_ms) - C.QInputMethodEvent_SetCommitString(this.h, (*C.struct_miqt_string)(commitString_ms)) + commitString_ms := C.struct_miqt_string{} + commitString_ms.data = C.CString(commitString) + commitString_ms.len = C.size_t(len(commitString)) + defer C.free(unsafe.Pointer(commitString_ms.data)) + C.QInputMethodEvent_SetCommitString(this.h, commitString_ms) } func (this *QInputMethodEvent) Attributes() []QInputMethodEvent__Attribute { @@ -1889,16 +1904,16 @@ func (this *QInputMethodEvent) Attributes() []QInputMethodEvent__Attribute { } func (this *QInputMethodEvent) PreeditString() string { - var _ms *C.struct_miqt_string = C.QInputMethodEvent_PreeditString(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QInputMethodEvent_PreeditString(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QInputMethodEvent) CommitString() string { - var _ms *C.struct_miqt_string = C.QInputMethodEvent_CommitString(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QInputMethodEvent_CommitString(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -1911,15 +1926,19 @@ func (this *QInputMethodEvent) ReplacementLength() int { } func (this *QInputMethodEvent) SetCommitString2(commitString string, replaceFrom int) { - commitString_ms := libmiqt.Strdupg(commitString) - defer C.free(commitString_ms) - C.QInputMethodEvent_SetCommitString2(this.h, (*C.struct_miqt_string)(commitString_ms), (C.int)(replaceFrom)) + commitString_ms := C.struct_miqt_string{} + commitString_ms.data = C.CString(commitString) + commitString_ms.len = C.size_t(len(commitString)) + defer C.free(unsafe.Pointer(commitString_ms.data)) + C.QInputMethodEvent_SetCommitString2(this.h, commitString_ms, (C.int)(replaceFrom)) } func (this *QInputMethodEvent) SetCommitString3(commitString string, replaceFrom int, replaceLength int) { - commitString_ms := libmiqt.Strdupg(commitString) - defer C.free(commitString_ms) - C.QInputMethodEvent_SetCommitString3(this.h, (*C.struct_miqt_string)(commitString_ms), (C.int)(replaceFrom), (C.int)(replaceLength)) + commitString_ms := C.struct_miqt_string{} + commitString_ms.data = C.CString(commitString) + commitString_ms.len = C.size_t(len(commitString)) + defer C.free(unsafe.Pointer(commitString_ms.data)) + C.QInputMethodEvent_SetCommitString3(this.h, commitString_ms, (C.int)(replaceFrom), (C.int)(replaceLength)) } // Delete this object from C++ memory. @@ -2433,9 +2452,11 @@ func UnsafeNewQStatusTipEvent(h unsafe.Pointer) *QStatusTipEvent { // NewQStatusTipEvent constructs a new QStatusTipEvent object. func NewQStatusTipEvent(tip string) *QStatusTipEvent { - tip_ms := libmiqt.Strdupg(tip) - defer C.free(tip_ms) - ret := C.QStatusTipEvent_new((*C.struct_miqt_string)(tip_ms)) + tip_ms := C.struct_miqt_string{} + tip_ms.data = C.CString(tip) + tip_ms.len = C.size_t(len(tip)) + defer C.free(unsafe.Pointer(tip_ms.data)) + ret := C.QStatusTipEvent_new(tip_ms) return newQStatusTipEvent(ret) } @@ -2446,9 +2467,9 @@ func NewQStatusTipEvent2(param1 *QStatusTipEvent) *QStatusTipEvent { } func (this *QStatusTipEvent) Tip() string { - var _ms *C.struct_miqt_string = C.QStatusTipEvent_Tip(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStatusTipEvent_Tip(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -2498,9 +2519,11 @@ func UnsafeNewQWhatsThisClickedEvent(h unsafe.Pointer) *QWhatsThisClickedEvent { // NewQWhatsThisClickedEvent constructs a new QWhatsThisClickedEvent object. func NewQWhatsThisClickedEvent(href string) *QWhatsThisClickedEvent { - href_ms := libmiqt.Strdupg(href) - defer C.free(href_ms) - ret := C.QWhatsThisClickedEvent_new((*C.struct_miqt_string)(href_ms)) + href_ms := C.struct_miqt_string{} + href_ms.data = C.CString(href) + href_ms.len = C.size_t(len(href)) + defer C.free(unsafe.Pointer(href_ms.data)) + ret := C.QWhatsThisClickedEvent_new(href_ms) return newQWhatsThisClickedEvent(ret) } @@ -2511,9 +2534,9 @@ func NewQWhatsThisClickedEvent2(param1 *QWhatsThisClickedEvent) *QWhatsThisClick } func (this *QWhatsThisClickedEvent) Href() string { - var _ms *C.struct_miqt_string = C.QWhatsThisClickedEvent_Href(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QWhatsThisClickedEvent_Href(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -2637,9 +2660,11 @@ func UnsafeNewQFileOpenEvent(h unsafe.Pointer) *QFileOpenEvent { // NewQFileOpenEvent constructs a new QFileOpenEvent object. func NewQFileOpenEvent(file string) *QFileOpenEvent { - file_ms := libmiqt.Strdupg(file) - defer C.free(file_ms) - ret := C.QFileOpenEvent_new((*C.struct_miqt_string)(file_ms)) + file_ms := C.struct_miqt_string{} + file_ms.data = C.CString(file) + file_ms.len = C.size_t(len(file)) + defer C.free(unsafe.Pointer(file_ms.data)) + ret := C.QFileOpenEvent_new(file_ms) return newQFileOpenEvent(ret) } @@ -2656,9 +2681,9 @@ func NewQFileOpenEvent3(param1 *QFileOpenEvent) *QFileOpenEvent { } func (this *QFileOpenEvent) File() string { - var _ms *C.struct_miqt_string = C.QFileOpenEvent_File(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFileOpenEvent_File(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qevent.h b/qt/gen_qevent.h index 8484b5ab..fd9a9490 100644 --- a/qt/gen_qevent.h +++ b/qt/gen_qevent.h @@ -269,16 +269,16 @@ void QNativeGestureEvent_Delete(QNativeGestureEvent* self); QKeyEvent* QKeyEvent_new(int typeVal, int key, int modifiers); QKeyEvent* QKeyEvent_new2(int typeVal, int key, int modifiers, unsigned int nativeScanCode, unsigned int nativeVirtualKey, unsigned int nativeModifiers); QKeyEvent* QKeyEvent_new3(QKeyEvent* param1); -QKeyEvent* QKeyEvent_new4(int typeVal, int key, int modifiers, struct miqt_string* text); -QKeyEvent* QKeyEvent_new5(int typeVal, int key, int modifiers, struct miqt_string* text, bool autorep); -QKeyEvent* QKeyEvent_new6(int typeVal, int key, int modifiers, struct miqt_string* text, bool autorep, uint16_t count); -QKeyEvent* QKeyEvent_new7(int typeVal, int key, int modifiers, unsigned int nativeScanCode, unsigned int nativeVirtualKey, unsigned int nativeModifiers, struct miqt_string* text); -QKeyEvent* QKeyEvent_new8(int typeVal, int key, int modifiers, unsigned int nativeScanCode, unsigned int nativeVirtualKey, unsigned int nativeModifiers, struct miqt_string* text, bool autorep); -QKeyEvent* QKeyEvent_new9(int typeVal, int key, int modifiers, unsigned int nativeScanCode, unsigned int nativeVirtualKey, unsigned int nativeModifiers, struct miqt_string* text, bool autorep, uint16_t count); +QKeyEvent* QKeyEvent_new4(int typeVal, int key, int modifiers, struct miqt_string text); +QKeyEvent* QKeyEvent_new5(int typeVal, int key, int modifiers, struct miqt_string text, bool autorep); +QKeyEvent* QKeyEvent_new6(int typeVal, int key, int modifiers, struct miqt_string text, bool autorep, uint16_t count); +QKeyEvent* QKeyEvent_new7(int typeVal, int key, int modifiers, unsigned int nativeScanCode, unsigned int nativeVirtualKey, unsigned int nativeModifiers, struct miqt_string text); +QKeyEvent* QKeyEvent_new8(int typeVal, int key, int modifiers, unsigned int nativeScanCode, unsigned int nativeVirtualKey, unsigned int nativeModifiers, struct miqt_string text, bool autorep); +QKeyEvent* QKeyEvent_new9(int typeVal, int key, int modifiers, unsigned int nativeScanCode, unsigned int nativeVirtualKey, unsigned int nativeModifiers, struct miqt_string text, bool autorep, uint16_t count); int QKeyEvent_Key(const QKeyEvent* self); bool QKeyEvent_Matches(const QKeyEvent* self, int key); int QKeyEvent_Modifiers(const QKeyEvent* self); -struct miqt_string* QKeyEvent_Text(const QKeyEvent* self); +struct miqt_string QKeyEvent_Text(const QKeyEvent* self); bool QKeyEvent_IsAutoRepeat(const QKeyEvent* self); int QKeyEvent_Count(const QKeyEvent* self); unsigned int QKeyEvent_NativeScanCode(const QKeyEvent* self); @@ -357,16 +357,16 @@ int QContextMenuEvent_Reason(const QContextMenuEvent* self); void QContextMenuEvent_Delete(QContextMenuEvent* self); QInputMethodEvent* QInputMethodEvent_new(); -QInputMethodEvent* QInputMethodEvent_new2(struct miqt_string* preeditText, struct miqt_array* /* of QInputMethodEvent__Attribute* */ attributes); +QInputMethodEvent* QInputMethodEvent_new2(struct miqt_string preeditText, struct miqt_array* /* of QInputMethodEvent__Attribute* */ attributes); QInputMethodEvent* QInputMethodEvent_new3(QInputMethodEvent* other); -void QInputMethodEvent_SetCommitString(QInputMethodEvent* self, struct miqt_string* commitString); +void QInputMethodEvent_SetCommitString(QInputMethodEvent* self, struct miqt_string commitString); struct miqt_array* QInputMethodEvent_Attributes(const QInputMethodEvent* self); -struct miqt_string* QInputMethodEvent_PreeditString(const QInputMethodEvent* self); -struct miqt_string* QInputMethodEvent_CommitString(const QInputMethodEvent* self); +struct miqt_string QInputMethodEvent_PreeditString(const QInputMethodEvent* self); +struct miqt_string QInputMethodEvent_CommitString(const QInputMethodEvent* self); int QInputMethodEvent_ReplacementStart(const QInputMethodEvent* self); int QInputMethodEvent_ReplacementLength(const QInputMethodEvent* self); -void QInputMethodEvent_SetCommitString2(QInputMethodEvent* self, struct miqt_string* commitString, int replaceFrom); -void QInputMethodEvent_SetCommitString3(QInputMethodEvent* self, struct miqt_string* commitString, int replaceFrom, int replaceLength); +void QInputMethodEvent_SetCommitString2(QInputMethodEvent* self, struct miqt_string commitString, int replaceFrom); +void QInputMethodEvent_SetCommitString3(QInputMethodEvent* self, struct miqt_string commitString, int replaceFrom, int replaceLength); void QInputMethodEvent_Delete(QInputMethodEvent* self); QInputMethodQueryEvent* QInputMethodQueryEvent_new(int queries); @@ -422,14 +422,14 @@ QPoint* QHelpEvent_Pos(const QHelpEvent* self); QPoint* QHelpEvent_GlobalPos(const QHelpEvent* self); void QHelpEvent_Delete(QHelpEvent* self); -QStatusTipEvent* QStatusTipEvent_new(struct miqt_string* tip); +QStatusTipEvent* QStatusTipEvent_new(struct miqt_string tip); QStatusTipEvent* QStatusTipEvent_new2(QStatusTipEvent* param1); -struct miqt_string* QStatusTipEvent_Tip(const QStatusTipEvent* self); +struct miqt_string QStatusTipEvent_Tip(const QStatusTipEvent* self); void QStatusTipEvent_Delete(QStatusTipEvent* self); -QWhatsThisClickedEvent* QWhatsThisClickedEvent_new(struct miqt_string* href); +QWhatsThisClickedEvent* QWhatsThisClickedEvent_new(struct miqt_string href); QWhatsThisClickedEvent* QWhatsThisClickedEvent_new2(QWhatsThisClickedEvent* param1); -struct miqt_string* QWhatsThisClickedEvent_Href(const QWhatsThisClickedEvent* self); +struct miqt_string QWhatsThisClickedEvent_Href(const QWhatsThisClickedEvent* self); void QWhatsThisClickedEvent_Delete(QWhatsThisClickedEvent* self); QActionEvent* QActionEvent_new(int typeVal, QAction* action); @@ -440,10 +440,10 @@ QAction* QActionEvent_Before(const QActionEvent* self); void QActionEvent_OperatorAssign(QActionEvent* self, QActionEvent* param1); void QActionEvent_Delete(QActionEvent* self); -QFileOpenEvent* QFileOpenEvent_new(struct miqt_string* file); +QFileOpenEvent* QFileOpenEvent_new(struct miqt_string file); QFileOpenEvent* QFileOpenEvent_new2(QUrl* url); QFileOpenEvent* QFileOpenEvent_new3(QFileOpenEvent* param1); -struct miqt_string* QFileOpenEvent_File(const QFileOpenEvent* self); +struct miqt_string QFileOpenEvent_File(const QFileOpenEvent* self); QUrl* QFileOpenEvent_Url(const QFileOpenEvent* self); bool QFileOpenEvent_OpenFile(const QFileOpenEvent* self, QFile* file, int flags); void QFileOpenEvent_Delete(QFileOpenEvent* self); diff --git a/qt/gen_qeventloop.cpp b/qt/gen_qeventloop.cpp index 428ef538..e7624007 100644 --- a/qt/gen_qeventloop.cpp +++ b/qt/gen_qeventloop.cpp @@ -27,18 +27,26 @@ void* QEventLoop_Metacast(QEventLoop* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QEventLoop_Tr(const char* s) { +struct miqt_string QEventLoop_Tr(const char* s) { QString _ret = QEventLoop::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QEventLoop_TrUtf8(const char* s) { +struct miqt_string QEventLoop_TrUtf8(const char* s) { QString _ret = QEventLoop::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } bool QEventLoop_ProcessEvents(QEventLoop* self) { @@ -73,32 +81,48 @@ void QEventLoop_Quit(QEventLoop* self) { self->quit(); } -struct miqt_string* QEventLoop_Tr2(const char* s, const char* c) { +struct miqt_string QEventLoop_Tr2(const char* s, const char* c) { QString _ret = QEventLoop::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QEventLoop_Tr3(const char* s, const char* c, int n) { +struct miqt_string QEventLoop_Tr3(const char* s, const char* c, int n) { QString _ret = QEventLoop::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QEventLoop_TrUtf82(const char* s, const char* c) { +struct miqt_string QEventLoop_TrUtf82(const char* s, const char* c) { QString _ret = QEventLoop::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QEventLoop_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QEventLoop_TrUtf83(const char* s, const char* c, int n) { QString _ret = QEventLoop::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } bool QEventLoop_ProcessEvents1(QEventLoop* self, int flags) { diff --git a/qt/gen_qeventloop.go b/qt/gen_qeventloop.go index 20320963..7004fe47 100644 --- a/qt/gen_qeventloop.go +++ b/qt/gen_qeventloop.go @@ -74,24 +74,24 @@ func (this *QEventLoop) MetaObject() *QMetaObject { func (this *QEventLoop) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QEventLoop_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QEventLoop_Metacast(this.h, param1_Cstring)) } func QEventLoop_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QEventLoop_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QEventLoop_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QEventLoop_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QEventLoop_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QEventLoop_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -132,9 +132,9 @@ func QEventLoop_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QEventLoop_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QEventLoop_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -143,9 +143,9 @@ func QEventLoop_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QEventLoop_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QEventLoop_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -154,9 +154,9 @@ func QEventLoop_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QEventLoop_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QEventLoop_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -165,9 +165,9 @@ func QEventLoop_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QEventLoop_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QEventLoop_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qeventloop.h b/qt/gen_qeventloop.h index bd1d0d6c..977ba9e0 100644 --- a/qt/gen_qeventloop.h +++ b/qt/gen_qeventloop.h @@ -33,8 +33,8 @@ QEventLoop* QEventLoop_new(); QEventLoop* QEventLoop_new2(QObject* parent); QMetaObject* QEventLoop_MetaObject(const QEventLoop* self); void* QEventLoop_Metacast(QEventLoop* self, const char* param1); -struct miqt_string* QEventLoop_Tr(const char* s); -struct miqt_string* QEventLoop_TrUtf8(const char* s); +struct miqt_string QEventLoop_Tr(const char* s); +struct miqt_string QEventLoop_TrUtf8(const char* s); bool QEventLoop_ProcessEvents(QEventLoop* self); void QEventLoop_ProcessEvents2(QEventLoop* self, int flags, int maximumTime); int QEventLoop_Exec(QEventLoop* self); @@ -43,10 +43,10 @@ bool QEventLoop_IsRunning(const QEventLoop* self); void QEventLoop_WakeUp(QEventLoop* self); bool QEventLoop_Event(QEventLoop* self, QEvent* event); void QEventLoop_Quit(QEventLoop* self); -struct miqt_string* QEventLoop_Tr2(const char* s, const char* c); -struct miqt_string* QEventLoop_Tr3(const char* s, const char* c, int n); -struct miqt_string* QEventLoop_TrUtf82(const char* s, const char* c); -struct miqt_string* QEventLoop_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QEventLoop_Tr2(const char* s, const char* c); +struct miqt_string QEventLoop_Tr3(const char* s, const char* c, int n); +struct miqt_string QEventLoop_TrUtf82(const char* s, const char* c); +struct miqt_string QEventLoop_TrUtf83(const char* s, const char* c, int n); bool QEventLoop_ProcessEvents1(QEventLoop* self, int flags); int QEventLoop_Exec1(QEventLoop* self, int flags); void QEventLoop_Exit1(QEventLoop* self, int returnCode); diff --git a/qt/gen_qeventtransition.cpp b/qt/gen_qeventtransition.cpp index 28a5cb60..ccb987b7 100644 --- a/qt/gen_qeventtransition.cpp +++ b/qt/gen_qeventtransition.cpp @@ -33,18 +33,26 @@ void* QEventTransition_Metacast(QEventTransition* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QEventTransition_Tr(const char* s) { +struct miqt_string QEventTransition_Tr(const char* s) { QString _ret = QEventTransition::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QEventTransition_TrUtf8(const char* s) { +struct miqt_string QEventTransition_TrUtf8(const char* s) { QString _ret = QEventTransition::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QObject* QEventTransition_EventSource(const QEventTransition* self) { @@ -64,32 +72,48 @@ void QEventTransition_SetEventType(QEventTransition* self, int typeVal) { self->setEventType(static_cast(typeVal)); } -struct miqt_string* QEventTransition_Tr2(const char* s, const char* c) { +struct miqt_string QEventTransition_Tr2(const char* s, const char* c) { QString _ret = QEventTransition::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QEventTransition_Tr3(const char* s, const char* c, int n) { +struct miqt_string QEventTransition_Tr3(const char* s, const char* c, int n) { QString _ret = QEventTransition::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QEventTransition_TrUtf82(const char* s, const char* c) { +struct miqt_string QEventTransition_TrUtf82(const char* s, const char* c) { QString _ret = QEventTransition::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QEventTransition_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QEventTransition_TrUtf83(const char* s, const char* c, int n) { QString _ret = QEventTransition::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QEventTransition_Delete(QEventTransition* self) { diff --git a/qt/gen_qeventtransition.go b/qt/gen_qeventtransition.go index 45b326f3..165a2832 100644 --- a/qt/gen_qeventtransition.go +++ b/qt/gen_qeventtransition.go @@ -74,24 +74,24 @@ func (this *QEventTransition) MetaObject() *QMetaObject { func (this *QEventTransition) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QEventTransition_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QEventTransition_Metacast(this.h, param1_Cstring)) } func QEventTransition_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QEventTransition_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QEventTransition_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QEventTransition_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QEventTransition_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QEventTransition_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -116,9 +116,9 @@ func QEventTransition_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QEventTransition_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QEventTransition_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -127,9 +127,9 @@ func QEventTransition_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QEventTransition_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QEventTransition_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -138,9 +138,9 @@ func QEventTransition_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QEventTransition_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QEventTransition_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -149,9 +149,9 @@ func QEventTransition_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QEventTransition_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QEventTransition_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qeventtransition.h b/qt/gen_qeventtransition.h index 7799a040..ef669a32 100644 --- a/qt/gen_qeventtransition.h +++ b/qt/gen_qeventtransition.h @@ -31,16 +31,16 @@ QEventTransition* QEventTransition_new3(QState* sourceState); QEventTransition* QEventTransition_new4(QObject* object, int typeVal, QState* sourceState); QMetaObject* QEventTransition_MetaObject(const QEventTransition* self); void* QEventTransition_Metacast(QEventTransition* self, const char* param1); -struct miqt_string* QEventTransition_Tr(const char* s); -struct miqt_string* QEventTransition_TrUtf8(const char* s); +struct miqt_string QEventTransition_Tr(const char* s); +struct miqt_string QEventTransition_TrUtf8(const char* s); QObject* QEventTransition_EventSource(const QEventTransition* self); void QEventTransition_SetEventSource(QEventTransition* self, QObject* object); int QEventTransition_EventType(const QEventTransition* self); void QEventTransition_SetEventType(QEventTransition* self, int typeVal); -struct miqt_string* QEventTransition_Tr2(const char* s, const char* c); -struct miqt_string* QEventTransition_Tr3(const char* s, const char* c, int n); -struct miqt_string* QEventTransition_TrUtf82(const char* s, const char* c); -struct miqt_string* QEventTransition_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QEventTransition_Tr2(const char* s, const char* c); +struct miqt_string QEventTransition_Tr3(const char* s, const char* c, int n); +struct miqt_string QEventTransition_TrUtf82(const char* s, const char* c); +struct miqt_string QEventTransition_TrUtf83(const char* s, const char* c, int n); void QEventTransition_Delete(QEventTransition* self); #ifdef __cplusplus diff --git a/qt/gen_qfactoryinterface.cpp b/qt/gen_qfactoryinterface.cpp index 2cfaea2c..7c3eafaa 100644 --- a/qt/gen_qfactoryinterface.cpp +++ b/qt/gen_qfactoryinterface.cpp @@ -10,12 +10,16 @@ struct miqt_array* QFactoryInterface_Keys(const QFactoryInterface* self) { QStringList _ret = self->keys(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); diff --git a/qt/gen_qfactoryinterface.go b/qt/gen_qfactoryinterface.go index 892db2c2..63356c43 100644 --- a/qt/gen_qfactoryinterface.go +++ b/qt/gen_qfactoryinterface.go @@ -45,11 +45,11 @@ func UnsafeNewQFactoryInterface(h unsafe.Pointer) *QFactoryInterface { func (this *QFactoryInterface) Keys() []string { var _ma *C.struct_miqt_array = C.QFactoryInterface_Keys(this.h) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) diff --git a/qt/gen_qfile.cpp b/qt/gen_qfile.cpp index 42970899..52c21274 100644 --- a/qt/gen_qfile.cpp +++ b/qt/gen_qfile.cpp @@ -13,8 +13,8 @@ QFile* QFile_new() { return new QFile(); } -QFile* QFile_new2(struct miqt_string* name) { - QString name_QString = QString::fromUtf8(&name->data, name->len); +QFile* QFile_new2(struct miqt_string name) { + QString name_QString = QString::fromUtf8(name.data, name.len); return new QFile(name_QString); } @@ -22,8 +22,8 @@ QFile* QFile_new3(QObject* parent) { return new QFile(parent); } -QFile* QFile_new4(struct miqt_string* name, QObject* parent) { - QString name_QString = QString::fromUtf8(&name->data, name->len); +QFile* QFile_new4(struct miqt_string name, QObject* parent) { + QString name_QString = QString::fromUtf8(name.data, name.len); return new QFile(name_QString, parent); } @@ -35,96 +35,138 @@ void* QFile_Metacast(QFile* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QFile_Tr(const char* s) { +struct miqt_string QFile_Tr(const char* s) { QString _ret = QFile::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFile_TrUtf8(const char* s) { +struct miqt_string QFile_TrUtf8(const char* s) { QString _ret = QFile::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFile_FileName(const QFile* self) { +struct miqt_string QFile_FileName(const QFile* self) { QString _ret = self->fileName(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QFile_SetFileName(QFile* self, struct miqt_string* name) { - QString name_QString = QString::fromUtf8(&name->data, name->len); +void QFile_SetFileName(QFile* self, struct miqt_string name) { + QString name_QString = QString::fromUtf8(name.data, name.len); self->setFileName(name_QString); } -QByteArray* QFile_EncodeName(struct miqt_string* fileName) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); - return new QByteArray(QFile::encodeName(fileName_QString)); +struct miqt_string QFile_EncodeName(struct miqt_string fileName) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); + QByteArray _qb = QFile::encodeName(fileName_QString); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } -struct miqt_string* QFile_DecodeName(QByteArray* localFileName) { - QString _ret = QFile::decodeName(*localFileName); +struct miqt_string QFile_DecodeName(struct miqt_string localFileName) { + QByteArray localFileName_QByteArray(localFileName.data, localFileName.len); + QString _ret = QFile::decodeName(localFileName_QByteArray); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFile_DecodeNameWithLocalFileName(const char* localFileName) { +struct miqt_string QFile_DecodeNameWithLocalFileName(const char* localFileName) { QString _ret = QFile::decodeName(localFileName); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } bool QFile_Exists(const QFile* self) { return self->exists(); } -bool QFile_ExistsWithFileName(struct miqt_string* fileName) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +bool QFile_ExistsWithFileName(struct miqt_string fileName) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); return QFile::exists(fileName_QString); } -struct miqt_string* QFile_ReadLink(const QFile* self) { +struct miqt_string QFile_ReadLink(const QFile* self) { QString _ret = self->readLink(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFile_ReadLinkWithFileName(struct miqt_string* fileName) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +struct miqt_string QFile_ReadLinkWithFileName(struct miqt_string fileName) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); QString _ret = QFile::readLink(fileName_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFile_SymLinkTarget(const QFile* self) { +struct miqt_string QFile_SymLinkTarget(const QFile* self) { QString _ret = self->symLinkTarget(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFile_SymLinkTargetWithFileName(struct miqt_string* fileName) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +struct miqt_string QFile_SymLinkTargetWithFileName(struct miqt_string fileName) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); QString _ret = QFile::symLinkTarget(fileName_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } bool QFile_Remove(QFile* self) { return self->remove(); } -bool QFile_RemoveWithFileName(struct miqt_string* fileName) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +bool QFile_RemoveWithFileName(struct miqt_string fileName) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); return QFile::remove(fileName_QString); } @@ -132,41 +174,41 @@ bool QFile_MoveToTrash(QFile* self) { return self->moveToTrash(); } -bool QFile_MoveToTrashWithFileName(struct miqt_string* fileName) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +bool QFile_MoveToTrashWithFileName(struct miqt_string fileName) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); return QFile::moveToTrash(fileName_QString); } -bool QFile_Rename(QFile* self, struct miqt_string* newName) { - QString newName_QString = QString::fromUtf8(&newName->data, newName->len); +bool QFile_Rename(QFile* self, struct miqt_string newName) { + QString newName_QString = QString::fromUtf8(newName.data, newName.len); return self->rename(newName_QString); } -bool QFile_Rename2(struct miqt_string* oldName, struct miqt_string* newName) { - QString oldName_QString = QString::fromUtf8(&oldName->data, oldName->len); - QString newName_QString = QString::fromUtf8(&newName->data, newName->len); +bool QFile_Rename2(struct miqt_string oldName, struct miqt_string newName) { + QString oldName_QString = QString::fromUtf8(oldName.data, oldName.len); + QString newName_QString = QString::fromUtf8(newName.data, newName.len); return QFile::rename(oldName_QString, newName_QString); } -bool QFile_Link(QFile* self, struct miqt_string* newName) { - QString newName_QString = QString::fromUtf8(&newName->data, newName->len); +bool QFile_Link(QFile* self, struct miqt_string newName) { + QString newName_QString = QString::fromUtf8(newName.data, newName.len); return self->link(newName_QString); } -bool QFile_Link2(struct miqt_string* oldname, struct miqt_string* newName) { - QString oldname_QString = QString::fromUtf8(&oldname->data, oldname->len); - QString newName_QString = QString::fromUtf8(&newName->data, newName->len); +bool QFile_Link2(struct miqt_string oldname, struct miqt_string newName) { + QString oldname_QString = QString::fromUtf8(oldname.data, oldname.len); + QString newName_QString = QString::fromUtf8(newName.data, newName.len); return QFile::link(oldname_QString, newName_QString); } -bool QFile_Copy(QFile* self, struct miqt_string* newName) { - QString newName_QString = QString::fromUtf8(&newName->data, newName->len); +bool QFile_Copy(QFile* self, struct miqt_string newName) { + QString newName_QString = QString::fromUtf8(newName.data, newName.len); return self->copy(newName_QString); } -bool QFile_Copy2(struct miqt_string* fileName, struct miqt_string* newName) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); - QString newName_QString = QString::fromUtf8(&newName->data, newName->len); +bool QFile_Copy2(struct miqt_string fileName, struct miqt_string newName) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); + QString newName_QString = QString::fromUtf8(newName.data, newName.len); return QFile::copy(fileName_QString, newName_QString); } @@ -187,8 +229,8 @@ bool QFile_Resize(QFile* self, long long sz) { return self->resize(static_cast(sz)); } -bool QFile_Resize2(struct miqt_string* filename, long long sz) { - QString filename_QString = QString::fromUtf8(&filename->data, filename->len); +bool QFile_Resize2(struct miqt_string filename, long long sz) { + QString filename_QString = QString::fromUtf8(filename.data, filename.len); return QFile::resize(filename_QString, static_cast(sz)); } @@ -197,8 +239,8 @@ int QFile_Permissions(const QFile* self) { return static_cast(_ret); } -int QFile_PermissionsWithFilename(struct miqt_string* filename) { - QString filename_QString = QString::fromUtf8(&filename->data, filename->len); +int QFile_PermissionsWithFilename(struct miqt_string filename) { + QString filename_QString = QString::fromUtf8(filename.data, filename.len); QFileDevice::Permissions _ret = QFile::permissions(filename_QString); return static_cast(_ret); } @@ -207,37 +249,53 @@ bool QFile_SetPermissions(QFile* self, int permissionSpec) { return self->setPermissions(static_cast(permissionSpec)); } -bool QFile_SetPermissions2(struct miqt_string* filename, int permissionSpec) { - QString filename_QString = QString::fromUtf8(&filename->data, filename->len); +bool QFile_SetPermissions2(struct miqt_string filename, int permissionSpec) { + QString filename_QString = QString::fromUtf8(filename.data, filename.len); return QFile::setPermissions(filename_QString, static_cast(permissionSpec)); } -struct miqt_string* QFile_Tr2(const char* s, const char* c) { +struct miqt_string QFile_Tr2(const char* s, const char* c) { QString _ret = QFile::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFile_Tr3(const char* s, const char* c, int n) { +struct miqt_string QFile_Tr3(const char* s, const char* c, int n) { QString _ret = QFile::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFile_TrUtf82(const char* s, const char* c) { +struct miqt_string QFile_TrUtf82(const char* s, const char* c) { QString _ret = QFile::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFile_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QFile_TrUtf83(const char* s, const char* c, int n) { QString _ret = QFile::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } bool QFile_Open33(QFile* self, int fd, int ioFlags, int handleFlags) { diff --git a/qt/gen_qfile.go b/qt/gen_qfile.go index b68e55a9..e6362a6d 100644 --- a/qt/gen_qfile.go +++ b/qt/gen_qfile.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -52,9 +51,11 @@ func NewQFile() *QFile { // NewQFile2 constructs a new QFile object. func NewQFile2(name string) *QFile { - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - ret := C.QFile_new2((*C.struct_miqt_string)(name_ms)) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + ret := C.QFile_new2(name_ms) return newQFile(ret) } @@ -66,9 +67,11 @@ func NewQFile3(parent *QObject) *QFile { // NewQFile4 constructs a new QFile object. func NewQFile4(name string, parent *QObject) *QFile { - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - ret := C.QFile_new4((*C.struct_miqt_string)(name_ms), parent.cPointer()) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + ret := C.QFile_new4(name_ms, parent.cPointer()) return newQFile(ret) } @@ -79,62 +82,69 @@ func (this *QFile) MetaObject() *QMetaObject { func (this *QFile) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QFile_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QFile_Metacast(this.h, param1_Cstring)) } func QFile_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QFile_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFile_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QFile_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QFile_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFile_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QFile) FileName() string { - var _ms *C.struct_miqt_string = C.QFile_FileName(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFile_FileName(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QFile) SetFileName(name string) { - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - C.QFile_SetFileName(this.h, (*C.struct_miqt_string)(name_ms)) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + C.QFile_SetFileName(this.h, name_ms) } -func QFile_EncodeName(fileName string) *QByteArray { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - _ret := C.QFile_EncodeName((*C.struct_miqt_string)(fileName_ms)) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func QFile_EncodeName(fileName string) []byte { + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + var _bytearray C.struct_miqt_string = C.QFile_EncodeName(fileName_ms) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } -func QFile_DecodeName(localFileName *QByteArray) string { - var _ms *C.struct_miqt_string = C.QFile_DecodeName(localFileName.cPointer()) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) +func QFile_DecodeName(localFileName []byte) string { + localFileName_alias := C.struct_miqt_string{} + localFileName_alias.data = (*C.char)(unsafe.Pointer(&localFileName[0])) + localFileName_alias.len = C.size_t(len(localFileName)) + var _ms C.struct_miqt_string = C.QFile_DecodeName(localFileName_alias) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QFile_DecodeNameWithLocalFileName(localFileName string) string { localFileName_Cstring := C.CString(localFileName) defer C.free(unsafe.Pointer(localFileName_Cstring)) - var _ms *C.struct_miqt_string = C.QFile_DecodeNameWithLocalFileName(localFileName_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFile_DecodeNameWithLocalFileName(localFileName_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -143,40 +153,46 @@ func (this *QFile) Exists() bool { } func QFile_ExistsWithFileName(fileName string) bool { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - return (bool)(C.QFile_ExistsWithFileName((*C.struct_miqt_string)(fileName_ms))) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + return (bool)(C.QFile_ExistsWithFileName(fileName_ms)) } func (this *QFile) ReadLink() string { - var _ms *C.struct_miqt_string = C.QFile_ReadLink(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFile_ReadLink(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QFile_ReadLinkWithFileName(fileName string) string { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - var _ms *C.struct_miqt_string = C.QFile_ReadLinkWithFileName((*C.struct_miqt_string)(fileName_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + var _ms C.struct_miqt_string = C.QFile_ReadLinkWithFileName(fileName_ms) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QFile) SymLinkTarget() string { - var _ms *C.struct_miqt_string = C.QFile_SymLinkTarget(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFile_SymLinkTarget(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QFile_SymLinkTargetWithFileName(fileName string) string { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - var _ms *C.struct_miqt_string = C.QFile_SymLinkTargetWithFileName((*C.struct_miqt_string)(fileName_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + var _ms C.struct_miqt_string = C.QFile_SymLinkTargetWithFileName(fileName_ms) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -185,9 +201,11 @@ func (this *QFile) Remove() bool { } func QFile_RemoveWithFileName(fileName string) bool { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - return (bool)(C.QFile_RemoveWithFileName((*C.struct_miqt_string)(fileName_ms))) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + return (bool)(C.QFile_RemoveWithFileName(fileName_ms)) } func (this *QFile) MoveToTrash() bool { @@ -195,51 +213,71 @@ func (this *QFile) MoveToTrash() bool { } func QFile_MoveToTrashWithFileName(fileName string) bool { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - return (bool)(C.QFile_MoveToTrashWithFileName((*C.struct_miqt_string)(fileName_ms))) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + return (bool)(C.QFile_MoveToTrashWithFileName(fileName_ms)) } func (this *QFile) Rename(newName string) bool { - newName_ms := libmiqt.Strdupg(newName) - defer C.free(newName_ms) - return (bool)(C.QFile_Rename(this.h, (*C.struct_miqt_string)(newName_ms))) + newName_ms := C.struct_miqt_string{} + newName_ms.data = C.CString(newName) + newName_ms.len = C.size_t(len(newName)) + defer C.free(unsafe.Pointer(newName_ms.data)) + return (bool)(C.QFile_Rename(this.h, newName_ms)) } func QFile_Rename2(oldName string, newName string) bool { - oldName_ms := libmiqt.Strdupg(oldName) - defer C.free(oldName_ms) - newName_ms := libmiqt.Strdupg(newName) - defer C.free(newName_ms) - return (bool)(C.QFile_Rename2((*C.struct_miqt_string)(oldName_ms), (*C.struct_miqt_string)(newName_ms))) + oldName_ms := C.struct_miqt_string{} + oldName_ms.data = C.CString(oldName) + oldName_ms.len = C.size_t(len(oldName)) + defer C.free(unsafe.Pointer(oldName_ms.data)) + newName_ms := C.struct_miqt_string{} + newName_ms.data = C.CString(newName) + newName_ms.len = C.size_t(len(newName)) + defer C.free(unsafe.Pointer(newName_ms.data)) + return (bool)(C.QFile_Rename2(oldName_ms, newName_ms)) } func (this *QFile) Link(newName string) bool { - newName_ms := libmiqt.Strdupg(newName) - defer C.free(newName_ms) - return (bool)(C.QFile_Link(this.h, (*C.struct_miqt_string)(newName_ms))) + newName_ms := C.struct_miqt_string{} + newName_ms.data = C.CString(newName) + newName_ms.len = C.size_t(len(newName)) + defer C.free(unsafe.Pointer(newName_ms.data)) + return (bool)(C.QFile_Link(this.h, newName_ms)) } func QFile_Link2(oldname string, newName string) bool { - oldname_ms := libmiqt.Strdupg(oldname) - defer C.free(oldname_ms) - newName_ms := libmiqt.Strdupg(newName) - defer C.free(newName_ms) - return (bool)(C.QFile_Link2((*C.struct_miqt_string)(oldname_ms), (*C.struct_miqt_string)(newName_ms))) + oldname_ms := C.struct_miqt_string{} + oldname_ms.data = C.CString(oldname) + oldname_ms.len = C.size_t(len(oldname)) + defer C.free(unsafe.Pointer(oldname_ms.data)) + newName_ms := C.struct_miqt_string{} + newName_ms.data = C.CString(newName) + newName_ms.len = C.size_t(len(newName)) + defer C.free(unsafe.Pointer(newName_ms.data)) + return (bool)(C.QFile_Link2(oldname_ms, newName_ms)) } func (this *QFile) Copy(newName string) bool { - newName_ms := libmiqt.Strdupg(newName) - defer C.free(newName_ms) - return (bool)(C.QFile_Copy(this.h, (*C.struct_miqt_string)(newName_ms))) + newName_ms := C.struct_miqt_string{} + newName_ms.data = C.CString(newName) + newName_ms.len = C.size_t(len(newName)) + defer C.free(unsafe.Pointer(newName_ms.data)) + return (bool)(C.QFile_Copy(this.h, newName_ms)) } func QFile_Copy2(fileName string, newName string) bool { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - newName_ms := libmiqt.Strdupg(newName) - defer C.free(newName_ms) - return (bool)(C.QFile_Copy2((*C.struct_miqt_string)(fileName_ms), (*C.struct_miqt_string)(newName_ms))) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + newName_ms := C.struct_miqt_string{} + newName_ms.data = C.CString(newName) + newName_ms.len = C.size_t(len(newName)) + defer C.free(unsafe.Pointer(newName_ms.data)) + return (bool)(C.QFile_Copy2(fileName_ms, newName_ms)) } func (this *QFile) Open(flags QIODevice__OpenModeFlag) bool { @@ -259,9 +297,11 @@ func (this *QFile) Resize(sz int64) bool { } func QFile_Resize2(filename string, sz int64) bool { - filename_ms := libmiqt.Strdupg(filename) - defer C.free(filename_ms) - return (bool)(C.QFile_Resize2((*C.struct_miqt_string)(filename_ms), (C.longlong)(sz))) + filename_ms := C.struct_miqt_string{} + filename_ms.data = C.CString(filename) + filename_ms.len = C.size_t(len(filename)) + defer C.free(unsafe.Pointer(filename_ms.data)) + return (bool)(C.QFile_Resize2(filename_ms, (C.longlong)(sz))) } func (this *QFile) Permissions() QFileDevice__Permission { @@ -269,9 +309,11 @@ func (this *QFile) Permissions() QFileDevice__Permission { } func QFile_PermissionsWithFilename(filename string) QFileDevice__Permission { - filename_ms := libmiqt.Strdupg(filename) - defer C.free(filename_ms) - return (QFileDevice__Permission)(C.QFile_PermissionsWithFilename((*C.struct_miqt_string)(filename_ms))) + filename_ms := C.struct_miqt_string{} + filename_ms.data = C.CString(filename) + filename_ms.len = C.size_t(len(filename)) + defer C.free(unsafe.Pointer(filename_ms.data)) + return (QFileDevice__Permission)(C.QFile_PermissionsWithFilename(filename_ms)) } func (this *QFile) SetPermissions(permissionSpec QFileDevice__Permission) bool { @@ -279,9 +321,11 @@ func (this *QFile) SetPermissions(permissionSpec QFileDevice__Permission) bool { } func QFile_SetPermissions2(filename string, permissionSpec QFileDevice__Permission) bool { - filename_ms := libmiqt.Strdupg(filename) - defer C.free(filename_ms) - return (bool)(C.QFile_SetPermissions2((*C.struct_miqt_string)(filename_ms), (C.int)(permissionSpec))) + filename_ms := C.struct_miqt_string{} + filename_ms.data = C.CString(filename) + filename_ms.len = C.size_t(len(filename)) + defer C.free(unsafe.Pointer(filename_ms.data)) + return (bool)(C.QFile_SetPermissions2(filename_ms, (C.int)(permissionSpec))) } func QFile_Tr2(s string, c string) string { @@ -289,9 +333,9 @@ func QFile_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFile_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFile_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -300,9 +344,9 @@ func QFile_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFile_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFile_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -311,9 +355,9 @@ func QFile_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFile_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFile_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -322,9 +366,9 @@ func QFile_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFile_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFile_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qfile.h b/qt/gen_qfile.h index 8f473749..30cc88ed 100644 --- a/qt/gen_qfile.h +++ b/qt/gen_qfile.h @@ -26,47 +26,47 @@ typedef struct QObject QObject; #endif QFile* QFile_new(); -QFile* QFile_new2(struct miqt_string* name); +QFile* QFile_new2(struct miqt_string name); QFile* QFile_new3(QObject* parent); -QFile* QFile_new4(struct miqt_string* name, QObject* parent); +QFile* QFile_new4(struct miqt_string name, QObject* parent); QMetaObject* QFile_MetaObject(const QFile* self); void* QFile_Metacast(QFile* self, const char* param1); -struct miqt_string* QFile_Tr(const char* s); -struct miqt_string* QFile_TrUtf8(const char* s); -struct miqt_string* QFile_FileName(const QFile* self); -void QFile_SetFileName(QFile* self, struct miqt_string* name); -QByteArray* QFile_EncodeName(struct miqt_string* fileName); -struct miqt_string* QFile_DecodeName(QByteArray* localFileName); -struct miqt_string* QFile_DecodeNameWithLocalFileName(const char* localFileName); +struct miqt_string QFile_Tr(const char* s); +struct miqt_string QFile_TrUtf8(const char* s); +struct miqt_string QFile_FileName(const QFile* self); +void QFile_SetFileName(QFile* self, struct miqt_string name); +struct miqt_string QFile_EncodeName(struct miqt_string fileName); +struct miqt_string QFile_DecodeName(struct miqt_string localFileName); +struct miqt_string QFile_DecodeNameWithLocalFileName(const char* localFileName); bool QFile_Exists(const QFile* self); -bool QFile_ExistsWithFileName(struct miqt_string* fileName); -struct miqt_string* QFile_ReadLink(const QFile* self); -struct miqt_string* QFile_ReadLinkWithFileName(struct miqt_string* fileName); -struct miqt_string* QFile_SymLinkTarget(const QFile* self); -struct miqt_string* QFile_SymLinkTargetWithFileName(struct miqt_string* fileName); +bool QFile_ExistsWithFileName(struct miqt_string fileName); +struct miqt_string QFile_ReadLink(const QFile* self); +struct miqt_string QFile_ReadLinkWithFileName(struct miqt_string fileName); +struct miqt_string QFile_SymLinkTarget(const QFile* self); +struct miqt_string QFile_SymLinkTargetWithFileName(struct miqt_string fileName); bool QFile_Remove(QFile* self); -bool QFile_RemoveWithFileName(struct miqt_string* fileName); +bool QFile_RemoveWithFileName(struct miqt_string fileName); bool QFile_MoveToTrash(QFile* self); -bool QFile_MoveToTrashWithFileName(struct miqt_string* fileName); -bool QFile_Rename(QFile* self, struct miqt_string* newName); -bool QFile_Rename2(struct miqt_string* oldName, struct miqt_string* newName); -bool QFile_Link(QFile* self, struct miqt_string* newName); -bool QFile_Link2(struct miqt_string* oldname, struct miqt_string* newName); -bool QFile_Copy(QFile* self, struct miqt_string* newName); -bool QFile_Copy2(struct miqt_string* fileName, struct miqt_string* newName); +bool QFile_MoveToTrashWithFileName(struct miqt_string fileName); +bool QFile_Rename(QFile* self, struct miqt_string newName); +bool QFile_Rename2(struct miqt_string oldName, struct miqt_string newName); +bool QFile_Link(QFile* self, struct miqt_string newName); +bool QFile_Link2(struct miqt_string oldname, struct miqt_string newName); +bool QFile_Copy(QFile* self, struct miqt_string newName); +bool QFile_Copy2(struct miqt_string fileName, struct miqt_string newName); bool QFile_Open(QFile* self, int flags); bool QFile_Open3(QFile* self, int fd, int ioFlags); long long QFile_Size(const QFile* self); bool QFile_Resize(QFile* self, long long sz); -bool QFile_Resize2(struct miqt_string* filename, long long sz); +bool QFile_Resize2(struct miqt_string filename, long long sz); int QFile_Permissions(const QFile* self); -int QFile_PermissionsWithFilename(struct miqt_string* filename); +int QFile_PermissionsWithFilename(struct miqt_string filename); bool QFile_SetPermissions(QFile* self, int permissionSpec); -bool QFile_SetPermissions2(struct miqt_string* filename, int permissionSpec); -struct miqt_string* QFile_Tr2(const char* s, const char* c); -struct miqt_string* QFile_Tr3(const char* s, const char* c, int n); -struct miqt_string* QFile_TrUtf82(const char* s, const char* c); -struct miqt_string* QFile_TrUtf83(const char* s, const char* c, int n); +bool QFile_SetPermissions2(struct miqt_string filename, int permissionSpec); +struct miqt_string QFile_Tr2(const char* s, const char* c); +struct miqt_string QFile_Tr3(const char* s, const char* c, int n); +struct miqt_string QFile_TrUtf82(const char* s, const char* c); +struct miqt_string QFile_TrUtf83(const char* s, const char* c, int n); bool QFile_Open33(QFile* self, int fd, int ioFlags, int handleFlags); void QFile_Delete(QFile* self); diff --git a/qt/gen_qfiledevice.cpp b/qt/gen_qfiledevice.cpp index 553abdee..5cc2e174 100644 --- a/qt/gen_qfiledevice.cpp +++ b/qt/gen_qfiledevice.cpp @@ -16,18 +16,26 @@ void* QFileDevice_Metacast(QFileDevice* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QFileDevice_Tr(const char* s) { +struct miqt_string QFileDevice_Tr(const char* s) { QString _ret = QFileDevice::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFileDevice_TrUtf8(const char* s) { +struct miqt_string QFileDevice_TrUtf8(const char* s) { QString _ret = QFileDevice::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QFileDevice_Error(const QFileDevice* self) { @@ -51,11 +59,15 @@ int QFileDevice_Handle(const QFileDevice* self) { return self->handle(); } -struct miqt_string* QFileDevice_FileName(const QFileDevice* self) { +struct miqt_string QFileDevice_FileName(const QFileDevice* self) { QString _ret = self->fileName(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } long long QFileDevice_Pos(const QFileDevice* self) { @@ -110,32 +122,48 @@ bool QFileDevice_SetFileTime(QFileDevice* self, QDateTime* newDate, int fileTime return self->setFileTime(*newDate, static_cast(fileTime)); } -struct miqt_string* QFileDevice_Tr2(const char* s, const char* c) { +struct miqt_string QFileDevice_Tr2(const char* s, const char* c) { QString _ret = QFileDevice::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFileDevice_Tr3(const char* s, const char* c, int n) { +struct miqt_string QFileDevice_Tr3(const char* s, const char* c, int n) { QString _ret = QFileDevice::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFileDevice_TrUtf82(const char* s, const char* c) { +struct miqt_string QFileDevice_TrUtf82(const char* s, const char* c) { QString _ret = QFileDevice::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFileDevice_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QFileDevice_TrUtf83(const char* s, const char* c, int n) { QString _ret = QFileDevice::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } unsigned char* QFileDevice_Map3(QFileDevice* self, long long offset, long long size, int flags) { diff --git a/qt/gen_qfiledevice.go b/qt/gen_qfiledevice.go index 34225d94..5e527660 100644 --- a/qt/gen_qfiledevice.go +++ b/qt/gen_qfiledevice.go @@ -110,24 +110,24 @@ func (this *QFileDevice) MetaObject() *QMetaObject { func (this *QFileDevice) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QFileDevice_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QFileDevice_Metacast(this.h, param1_Cstring)) } func QFileDevice_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QFileDevice_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFileDevice_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QFileDevice_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QFileDevice_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFileDevice_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -152,9 +152,9 @@ func (this *QFileDevice) Handle() int { } func (this *QFileDevice) FileName() string { - var _ms *C.struct_miqt_string = C.QFileDevice_FileName(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFileDevice_FileName(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -214,9 +214,9 @@ func QFileDevice_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFileDevice_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFileDevice_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -225,9 +225,9 @@ func QFileDevice_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFileDevice_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFileDevice_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -236,9 +236,9 @@ func QFileDevice_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFileDevice_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFileDevice_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -247,9 +247,9 @@ func QFileDevice_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFileDevice_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFileDevice_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qfiledevice.h b/qt/gen_qfiledevice.h index 0d102e5e..74328f51 100644 --- a/qt/gen_qfiledevice.h +++ b/qt/gen_qfiledevice.h @@ -25,14 +25,14 @@ typedef struct QMetaObject QMetaObject; QMetaObject* QFileDevice_MetaObject(const QFileDevice* self); void* QFileDevice_Metacast(QFileDevice* self, const char* param1); -struct miqt_string* QFileDevice_Tr(const char* s); -struct miqt_string* QFileDevice_TrUtf8(const char* s); +struct miqt_string QFileDevice_Tr(const char* s); +struct miqt_string QFileDevice_TrUtf8(const char* s); int QFileDevice_Error(const QFileDevice* self); void QFileDevice_UnsetError(QFileDevice* self); void QFileDevice_Close(QFileDevice* self); bool QFileDevice_IsSequential(const QFileDevice* self); int QFileDevice_Handle(const QFileDevice* self); -struct miqt_string* QFileDevice_FileName(const QFileDevice* self); +struct miqt_string QFileDevice_FileName(const QFileDevice* self); long long QFileDevice_Pos(const QFileDevice* self); bool QFileDevice_Seek(QFileDevice* self, long long offset); bool QFileDevice_AtEnd(const QFileDevice* self); @@ -45,10 +45,10 @@ unsigned char* QFileDevice_Map(QFileDevice* self, long long offset, long long si bool QFileDevice_Unmap(QFileDevice* self, unsigned char* address); QDateTime* QFileDevice_FileTime(const QFileDevice* self, int time); bool QFileDevice_SetFileTime(QFileDevice* self, QDateTime* newDate, int fileTime); -struct miqt_string* QFileDevice_Tr2(const char* s, const char* c); -struct miqt_string* QFileDevice_Tr3(const char* s, const char* c, int n); -struct miqt_string* QFileDevice_TrUtf82(const char* s, const char* c); -struct miqt_string* QFileDevice_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QFileDevice_Tr2(const char* s, const char* c); +struct miqt_string QFileDevice_Tr3(const char* s, const char* c, int n); +struct miqt_string QFileDevice_TrUtf82(const char* s, const char* c); +struct miqt_string QFileDevice_TrUtf83(const char* s, const char* c, int n); unsigned char* QFileDevice_Map3(QFileDevice* self, long long offset, long long size, int flags); void QFileDevice_Delete(QFileDevice* self); diff --git a/qt/gen_qfiledialog.cpp b/qt/gen_qfiledialog.cpp index 1e7f493b..2c0eb224 100644 --- a/qt/gen_qfiledialog.cpp +++ b/qt/gen_qfiledialog.cpp @@ -27,21 +27,21 @@ QFileDialog* QFileDialog_new3(QWidget* parent) { return new QFileDialog(parent); } -QFileDialog* QFileDialog_new4(QWidget* parent, struct miqt_string* caption) { - QString caption_QString = QString::fromUtf8(&caption->data, caption->len); +QFileDialog* QFileDialog_new4(QWidget* parent, struct miqt_string caption) { + QString caption_QString = QString::fromUtf8(caption.data, caption.len); return new QFileDialog(parent, caption_QString); } -QFileDialog* QFileDialog_new5(QWidget* parent, struct miqt_string* caption, struct miqt_string* directory) { - QString caption_QString = QString::fromUtf8(&caption->data, caption->len); - QString directory_QString = QString::fromUtf8(&directory->data, directory->len); +QFileDialog* QFileDialog_new5(QWidget* parent, struct miqt_string caption, struct miqt_string directory) { + QString caption_QString = QString::fromUtf8(caption.data, caption.len); + QString directory_QString = QString::fromUtf8(directory.data, directory.len); return new QFileDialog(parent, caption_QString, directory_QString); } -QFileDialog* QFileDialog_new6(QWidget* parent, struct miqt_string* caption, struct miqt_string* directory, struct miqt_string* filter) { - QString caption_QString = QString::fromUtf8(&caption->data, caption->len); - QString directory_QString = QString::fromUtf8(&directory->data, directory->len); - QString filter_QString = QString::fromUtf8(&filter->data, filter->len); +QFileDialog* QFileDialog_new6(QWidget* parent, struct miqt_string caption, struct miqt_string directory, struct miqt_string filter) { + QString caption_QString = QString::fromUtf8(caption.data, caption.len); + QString directory_QString = QString::fromUtf8(directory.data, directory.len); + QString filter_QString = QString::fromUtf8(filter.data, filter.len); return new QFileDialog(parent, caption_QString, directory_QString, filter_QString); } @@ -53,22 +53,30 @@ void* QFileDialog_Metacast(QFileDialog* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QFileDialog_Tr(const char* s) { +struct miqt_string QFileDialog_Tr(const char* s) { QString _ret = QFileDialog::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFileDialog_TrUtf8(const char* s) { +struct miqt_string QFileDialog_TrUtf8(const char* s) { QString _ret = QFileDialog::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QFileDialog_SetDirectory(QFileDialog* self, struct miqt_string* directory) { - QString directory_QString = QString::fromUtf8(&directory->data, directory->len); +void QFileDialog_SetDirectory(QFileDialog* self, struct miqt_string directory) { + QString directory_QString = QString::fromUtf8(directory.data, directory.len); self->setDirectory(directory_QString); } @@ -88,20 +96,24 @@ QUrl* QFileDialog_DirectoryUrl(const QFileDialog* self) { return new QUrl(self->directoryUrl()); } -void QFileDialog_SelectFile(QFileDialog* self, struct miqt_string* filename) { - QString filename_QString = QString::fromUtf8(&filename->data, filename->len); +void QFileDialog_SelectFile(QFileDialog* self, struct miqt_string filename) { + QString filename_QString = QString::fromUtf8(filename.data, filename.len); self->selectFile(filename_QString); } struct miqt_array* QFileDialog_SelectedFiles(const QFileDialog* self) { QStringList _ret = self->selectedFiles(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -134,17 +146,17 @@ bool QFileDialog_IsNameFilterDetailsVisible(const QFileDialog* self) { return self->isNameFilterDetailsVisible(); } -void QFileDialog_SetNameFilter(QFileDialog* self, struct miqt_string* filter) { - QString filter_QString = QString::fromUtf8(&filter->data, filter->len); +void QFileDialog_SetNameFilter(QFileDialog* self, struct miqt_string filter) { + QString filter_QString = QString::fromUtf8(filter.data, filter.len); self->setNameFilter(filter_QString); } -void QFileDialog_SetNameFilters(QFileDialog* self, struct miqt_array* /* of struct miqt_string* */ filters) { +void QFileDialog_SetNameFilters(QFileDialog* self, struct miqt_array* /* of struct miqt_string */ filters) { QStringList filters_QList; filters_QList.reserve(filters->len); - struct miqt_string** filters_arr = static_cast(filters->data); + struct miqt_string* filters_arr = static_cast(filters->data); for(size_t i = 0; i < filters->len; ++i) { - QString filters_arr_i_QString = QString::fromUtf8(&filters_arr[i]->data, filters_arr[i]->len); + QString filters_arr_i_QString = QString::fromUtf8(filters_arr[i].data, filters_arr[i].len); filters_QList.push_back(filters_arr_i_QString); } self->setNameFilters(filters_QList); @@ -153,12 +165,16 @@ void QFileDialog_SetNameFilters(QFileDialog* self, struct miqt_array* /* of stru struct miqt_array* QFileDialog_NameFilters(const QFileDialog* self) { QStringList _ret = self->nameFilters(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -166,31 +182,39 @@ struct miqt_array* QFileDialog_NameFilters(const QFileDialog* self) { return _out; } -void QFileDialog_SelectNameFilter(QFileDialog* self, struct miqt_string* filter) { - QString filter_QString = QString::fromUtf8(&filter->data, filter->len); +void QFileDialog_SelectNameFilter(QFileDialog* self, struct miqt_string filter) { + QString filter_QString = QString::fromUtf8(filter.data, filter.len); self->selectNameFilter(filter_QString); } -struct miqt_string* QFileDialog_SelectedMimeTypeFilter(const QFileDialog* self) { +struct miqt_string QFileDialog_SelectedMimeTypeFilter(const QFileDialog* self) { QString _ret = self->selectedMimeTypeFilter(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFileDialog_SelectedNameFilter(const QFileDialog* self) { +struct miqt_string QFileDialog_SelectedNameFilter(const QFileDialog* self) { QString _ret = self->selectedNameFilter(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QFileDialog_SetMimeTypeFilters(QFileDialog* self, struct miqt_array* /* of struct miqt_string* */ filters) { +void QFileDialog_SetMimeTypeFilters(QFileDialog* self, struct miqt_array* /* of struct miqt_string */ filters) { QStringList filters_QList; filters_QList.reserve(filters->len); - struct miqt_string** filters_arr = static_cast(filters->data); + struct miqt_string* filters_arr = static_cast(filters->data); for(size_t i = 0; i < filters->len; ++i) { - QString filters_arr_i_QString = QString::fromUtf8(&filters_arr[i]->data, filters_arr[i]->len); + QString filters_arr_i_QString = QString::fromUtf8(filters_arr[i].data, filters_arr[i].len); filters_QList.push_back(filters_arr_i_QString); } self->setMimeTypeFilters(filters_QList); @@ -199,12 +223,16 @@ void QFileDialog_SetMimeTypeFilters(QFileDialog* self, struct miqt_array* /* of struct miqt_array* QFileDialog_MimeTypeFilters(const QFileDialog* self) { QStringList _ret = self->mimeTypeFilters(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -212,8 +240,8 @@ struct miqt_array* QFileDialog_MimeTypeFilters(const QFileDialog* self) { return _out; } -void QFileDialog_SelectMimeTypeFilter(QFileDialog* self, struct miqt_string* filter) { - QString filter_QString = QString::fromUtf8(&filter->data, filter->len); +void QFileDialog_SelectMimeTypeFilter(QFileDialog* self, struct miqt_string filter) { + QString filter_QString = QString::fromUtf8(filter.data, filter.len); self->selectMimeTypeFilter(filter_QString); } @@ -292,12 +320,18 @@ struct miqt_array* QFileDialog_SidebarUrls(const QFileDialog* self) { return _out; } -QByteArray* QFileDialog_SaveState(const QFileDialog* self) { - return new QByteArray(self->saveState()); +struct miqt_string QFileDialog_SaveState(const QFileDialog* self) { + QByteArray _qb = self->saveState(); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } -bool QFileDialog_RestoreState(QFileDialog* self, QByteArray* state) { - return self->restoreState(*state); +bool QFileDialog_RestoreState(QFileDialog* self, struct miqt_string state) { + QByteArray state_QByteArray(state.data, state.len); + return self->restoreState(state_QByteArray); } void QFileDialog_SetConfirmOverwrite(QFileDialog* self, bool enabled) { @@ -308,24 +342,28 @@ bool QFileDialog_ConfirmOverwrite(const QFileDialog* self) { return self->confirmOverwrite(); } -void QFileDialog_SetDefaultSuffix(QFileDialog* self, struct miqt_string* suffix) { - QString suffix_QString = QString::fromUtf8(&suffix->data, suffix->len); +void QFileDialog_SetDefaultSuffix(QFileDialog* self, struct miqt_string suffix) { + QString suffix_QString = QString::fromUtf8(suffix.data, suffix.len); self->setDefaultSuffix(suffix_QString); } -struct miqt_string* QFileDialog_DefaultSuffix(const QFileDialog* self) { +struct miqt_string QFileDialog_DefaultSuffix(const QFileDialog* self) { QString _ret = self->defaultSuffix(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QFileDialog_SetHistory(QFileDialog* self, struct miqt_array* /* of struct miqt_string* */ paths) { +void QFileDialog_SetHistory(QFileDialog* self, struct miqt_array* /* of struct miqt_string */ paths) { QStringList paths_QList; paths_QList.reserve(paths->len); - struct miqt_string** paths_arr = static_cast(paths->data); + struct miqt_string* paths_arr = static_cast(paths->data); for(size_t i = 0; i < paths->len; ++i) { - QString paths_arr_i_QString = QString::fromUtf8(&paths_arr[i]->data, paths_arr[i]->len); + QString paths_arr_i_QString = QString::fromUtf8(paths_arr[i].data, paths_arr[i].len); paths_QList.push_back(paths_arr_i_QString); } self->setHistory(paths_QList); @@ -334,12 +372,16 @@ void QFileDialog_SetHistory(QFileDialog* self, struct miqt_array* /* of struct m struct miqt_array* QFileDialog_History(const QFileDialog* self) { QStringList _ret = self->history(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -363,24 +405,28 @@ QFileIconProvider* QFileDialog_IconProvider(const QFileDialog* self) { return self->iconProvider(); } -void QFileDialog_SetLabelText(QFileDialog* self, int label, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QFileDialog_SetLabelText(QFileDialog* self, int label, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->setLabelText(static_cast(label), text_QString); } -struct miqt_string* QFileDialog_LabelText(const QFileDialog* self, int label) { +struct miqt_string QFileDialog_LabelText(const QFileDialog* self, int label) { QString _ret = self->labelText(static_cast(label)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QFileDialog_SetSupportedSchemes(QFileDialog* self, struct miqt_array* /* of struct miqt_string* */ schemes) { +void QFileDialog_SetSupportedSchemes(QFileDialog* self, struct miqt_array* /* of struct miqt_string */ schemes) { QStringList schemes_QList; schemes_QList.reserve(schemes->len); - struct miqt_string** schemes_arr = static_cast(schemes->data); + struct miqt_string* schemes_arr = static_cast(schemes->data); for(size_t i = 0; i < schemes->len; ++i) { - QString schemes_arr_i_QString = QString::fromUtf8(&schemes_arr[i]->data, schemes_arr[i]->len); + QString schemes_arr_i_QString = QString::fromUtf8(schemes_arr[i].data, schemes_arr[i].len); schemes_QList.push_back(schemes_arr_i_QString); } self->setSupportedSchemes(schemes_QList); @@ -389,12 +435,16 @@ void QFileDialog_SetSupportedSchemes(QFileDialog* self, struct miqt_array* /* of struct miqt_array* QFileDialog_SupportedSchemes(const QFileDialog* self) { QStringList _ret = self->supportedSchemes(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -431,8 +481,8 @@ void QFileDialog_SetVisible(QFileDialog* self, bool visible) { self->setVisible(visible); } -void QFileDialog_FileSelected(QFileDialog* self, struct miqt_string* file) { - QString file_QString = QString::fromUtf8(&file->data, file->len); +void QFileDialog_FileSelected(QFileDialog* self, struct miqt_string file) { + QString file_QString = QString::fromUtf8(file.data, file.len); self->fileSelected(file_QString); } @@ -441,17 +491,21 @@ void QFileDialog_connect_FileSelected(QFileDialog* self, intptr_t slot) { const QString file_ret = file; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray file_b = file_ret.toUtf8(); - struct miqt_string* sigval1 = miqt_strdup(file_b.data(), file_b.length()); + struct miqt_string file_ms; + file_ms.len = file_b.length(); + file_ms.data = static_cast(malloc(file_ms.len)); + memcpy(file_ms.data, file_b.data(), file_ms.len); + struct miqt_string sigval1 = file_ms; miqt_exec_callback_QFileDialog_FileSelected(slot, sigval1); }); } -void QFileDialog_FilesSelected(QFileDialog* self, struct miqt_array* /* of struct miqt_string* */ files) { +void QFileDialog_FilesSelected(QFileDialog* self, struct miqt_array* /* of struct miqt_string */ files) { QStringList files_QList; files_QList.reserve(files->len); - struct miqt_string** files_arr = static_cast(files->data); + struct miqt_string* files_arr = static_cast(files->data); for(size_t i = 0; i < files->len; ++i) { - QString files_arr_i_QString = QString::fromUtf8(&files_arr[i]->data, files_arr[i]->len); + QString files_arr_i_QString = QString::fromUtf8(files_arr[i].data, files_arr[i].len); files_QList.push_back(files_arr_i_QString); } self->filesSelected(files_QList); @@ -461,12 +515,16 @@ void QFileDialog_connect_FilesSelected(QFileDialog* self, intptr_t slot) { QFileDialog::connect(self, static_cast(&QFileDialog::filesSelected), self, [=](const QStringList& files) { const QStringList& files_ret = files; // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** files_arr = static_cast(malloc(sizeof(struct miqt_string*) * files_ret.length())); + struct miqt_string* files_arr = static_cast(malloc(sizeof(struct miqt_string) * files_ret.length())); for (size_t i = 0, e = files_ret.length(); i < e; ++i) { QString files_lv_ret = files_ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray files_lv_b = files_lv_ret.toUtf8(); - files_arr[i] = miqt_strdup(files_lv_b.data(), files_lv_b.length()); + struct miqt_string files_lv_ms; + files_lv_ms.len = files_lv_b.length(); + files_lv_ms.data = static_cast(malloc(files_lv_ms.len)); + memcpy(files_lv_ms.data, files_lv_b.data(), files_lv_ms.len); + files_arr[i] = files_lv_ms; } struct miqt_array* files_out = static_cast(malloc(sizeof(struct miqt_array))); files_out->len = files_ret.length(); @@ -476,8 +534,8 @@ void QFileDialog_connect_FilesSelected(QFileDialog* self, intptr_t slot) { }); } -void QFileDialog_CurrentChanged(QFileDialog* self, struct miqt_string* path) { - QString path_QString = QString::fromUtf8(&path->data, path->len); +void QFileDialog_CurrentChanged(QFileDialog* self, struct miqt_string path) { + QString path_QString = QString::fromUtf8(path.data, path.len); self->currentChanged(path_QString); } @@ -486,13 +544,17 @@ void QFileDialog_connect_CurrentChanged(QFileDialog* self, intptr_t slot) { const QString path_ret = path; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray path_b = path_ret.toUtf8(); - struct miqt_string* sigval1 = miqt_strdup(path_b.data(), path_b.length()); + struct miqt_string path_ms; + path_ms.len = path_b.length(); + path_ms.data = static_cast(malloc(path_ms.len)); + memcpy(path_ms.data, path_b.data(), path_ms.len); + struct miqt_string sigval1 = path_ms; miqt_exec_callback_QFileDialog_CurrentChanged(slot, sigval1); }); } -void QFileDialog_DirectoryEntered(QFileDialog* self, struct miqt_string* directory) { - QString directory_QString = QString::fromUtf8(&directory->data, directory->len); +void QFileDialog_DirectoryEntered(QFileDialog* self, struct miqt_string directory) { + QString directory_QString = QString::fromUtf8(directory.data, directory.len); self->directoryEntered(directory_QString); } @@ -501,7 +563,11 @@ void QFileDialog_connect_DirectoryEntered(QFileDialog* self, intptr_t slot) { const QString directory_ret = directory; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray directory_b = directory_ret.toUtf8(); - struct miqt_string* sigval1 = miqt_strdup(directory_b.data(), directory_b.length()); + struct miqt_string directory_ms; + directory_ms.len = directory_b.length(); + directory_ms.data = static_cast(malloc(directory_ms.len)); + memcpy(directory_ms.data, directory_b.data(), directory_ms.len); + struct miqt_string sigval1 = directory_ms; miqt_exec_callback_QFileDialog_DirectoryEntered(slot, sigval1); }); } @@ -571,8 +637,8 @@ void QFileDialog_connect_DirectoryUrlEntered(QFileDialog* self, intptr_t slot) { }); } -void QFileDialog_FilterSelected(QFileDialog* self, struct miqt_string* filter) { - QString filter_QString = QString::fromUtf8(&filter->data, filter->len); +void QFileDialog_FilterSelected(QFileDialog* self, struct miqt_string filter) { + QString filter_QString = QString::fromUtf8(filter.data, filter.len); self->filterSelected(filter_QString); } @@ -581,38 +647,54 @@ void QFileDialog_connect_FilterSelected(QFileDialog* self, intptr_t slot) { const QString filter_ret = filter; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray filter_b = filter_ret.toUtf8(); - struct miqt_string* sigval1 = miqt_strdup(filter_b.data(), filter_b.length()); + struct miqt_string filter_ms; + filter_ms.len = filter_b.length(); + filter_ms.data = static_cast(malloc(filter_ms.len)); + memcpy(filter_ms.data, filter_b.data(), filter_ms.len); + struct miqt_string sigval1 = filter_ms; miqt_exec_callback_QFileDialog_FilterSelected(slot, sigval1); }); } -struct miqt_string* QFileDialog_GetOpenFileName() { +struct miqt_string QFileDialog_GetOpenFileName() { QString _ret = QFileDialog::getOpenFileName(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QUrl* QFileDialog_GetOpenFileUrl() { return new QUrl(QFileDialog::getOpenFileUrl()); } -struct miqt_string* QFileDialog_GetSaveFileName() { +struct miqt_string QFileDialog_GetSaveFileName() { QString _ret = QFileDialog::getSaveFileName(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QUrl* QFileDialog_GetSaveFileUrl() { return new QUrl(QFileDialog::getSaveFileUrl()); } -struct miqt_string* QFileDialog_GetExistingDirectory() { +struct miqt_string QFileDialog_GetExistingDirectory() { QString _ret = QFileDialog::getExistingDirectory(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QUrl* QFileDialog_GetExistingDirectoryUrl() { @@ -622,12 +704,16 @@ QUrl* QFileDialog_GetExistingDirectoryUrl() { struct miqt_array* QFileDialog_GetOpenFileNames() { QStringList _ret = QFileDialog::getOpenFileNames(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -648,209 +734,274 @@ struct miqt_array* QFileDialog_GetOpenFileUrls() { return _out; } -void QFileDialog_SaveFileContent(QByteArray* fileContent) { - QFileDialog::saveFileContent(*fileContent); +void QFileDialog_SaveFileContent(struct miqt_string fileContent) { + QByteArray fileContent_QByteArray(fileContent.data, fileContent.len); + QFileDialog::saveFileContent(fileContent_QByteArray); } -struct miqt_string* QFileDialog_Tr2(const char* s, const char* c) { +struct miqt_string QFileDialog_Tr2(const char* s, const char* c) { QString _ret = QFileDialog::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFileDialog_Tr3(const char* s, const char* c, int n) { +struct miqt_string QFileDialog_Tr3(const char* s, const char* c, int n) { QString _ret = QFileDialog::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFileDialog_TrUtf82(const char* s, const char* c) { +struct miqt_string QFileDialog_TrUtf82(const char* s, const char* c) { QString _ret = QFileDialog::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFileDialog_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QFileDialog_TrUtf83(const char* s, const char* c, int n) { QString _ret = QFileDialog::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QFileDialog_SetOption2(QFileDialog* self, int option, bool on) { self->setOption(static_cast(option), on); } -struct miqt_string* QFileDialog_GetOpenFileName1(QWidget* parent) { +struct miqt_string QFileDialog_GetOpenFileName1(QWidget* parent) { QString _ret = QFileDialog::getOpenFileName(parent); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFileDialog_GetOpenFileName2(QWidget* parent, struct miqt_string* caption) { - QString caption_QString = QString::fromUtf8(&caption->data, caption->len); +struct miqt_string QFileDialog_GetOpenFileName2(QWidget* parent, struct miqt_string caption) { + QString caption_QString = QString::fromUtf8(caption.data, caption.len); QString _ret = QFileDialog::getOpenFileName(parent, caption_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFileDialog_GetOpenFileName3(QWidget* parent, struct miqt_string* caption, struct miqt_string* dir) { - QString caption_QString = QString::fromUtf8(&caption->data, caption->len); - QString dir_QString = QString::fromUtf8(&dir->data, dir->len); +struct miqt_string QFileDialog_GetOpenFileName3(QWidget* parent, struct miqt_string caption, struct miqt_string dir) { + QString caption_QString = QString::fromUtf8(caption.data, caption.len); + QString dir_QString = QString::fromUtf8(dir.data, dir.len); QString _ret = QFileDialog::getOpenFileName(parent, caption_QString, dir_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFileDialog_GetOpenFileName4(QWidget* parent, struct miqt_string* caption, struct miqt_string* dir, struct miqt_string* filter) { - QString caption_QString = QString::fromUtf8(&caption->data, caption->len); - QString dir_QString = QString::fromUtf8(&dir->data, dir->len); - QString filter_QString = QString::fromUtf8(&filter->data, filter->len); +struct miqt_string QFileDialog_GetOpenFileName4(QWidget* parent, struct miqt_string caption, struct miqt_string dir, struct miqt_string filter) { + QString caption_QString = QString::fromUtf8(caption.data, caption.len); + QString dir_QString = QString::fromUtf8(dir.data, dir.len); + QString filter_QString = QString::fromUtf8(filter.data, filter.len); QString _ret = QFileDialog::getOpenFileName(parent, caption_QString, dir_QString, filter_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QUrl* QFileDialog_GetOpenFileUrl1(QWidget* parent) { return new QUrl(QFileDialog::getOpenFileUrl(parent)); } -QUrl* QFileDialog_GetOpenFileUrl2(QWidget* parent, struct miqt_string* caption) { - QString caption_QString = QString::fromUtf8(&caption->data, caption->len); +QUrl* QFileDialog_GetOpenFileUrl2(QWidget* parent, struct miqt_string caption) { + QString caption_QString = QString::fromUtf8(caption.data, caption.len); return new QUrl(QFileDialog::getOpenFileUrl(parent, caption_QString)); } -QUrl* QFileDialog_GetOpenFileUrl3(QWidget* parent, struct miqt_string* caption, QUrl* dir) { - QString caption_QString = QString::fromUtf8(&caption->data, caption->len); +QUrl* QFileDialog_GetOpenFileUrl3(QWidget* parent, struct miqt_string caption, QUrl* dir) { + QString caption_QString = QString::fromUtf8(caption.data, caption.len); return new QUrl(QFileDialog::getOpenFileUrl(parent, caption_QString, *dir)); } -QUrl* QFileDialog_GetOpenFileUrl4(QWidget* parent, struct miqt_string* caption, QUrl* dir, struct miqt_string* filter) { - QString caption_QString = QString::fromUtf8(&caption->data, caption->len); - QString filter_QString = QString::fromUtf8(&filter->data, filter->len); +QUrl* QFileDialog_GetOpenFileUrl4(QWidget* parent, struct miqt_string caption, QUrl* dir, struct miqt_string filter) { + QString caption_QString = QString::fromUtf8(caption.data, caption.len); + QString filter_QString = QString::fromUtf8(filter.data, filter.len); return new QUrl(QFileDialog::getOpenFileUrl(parent, caption_QString, *dir, filter_QString)); } -struct miqt_string* QFileDialog_GetSaveFileName1(QWidget* parent) { +struct miqt_string QFileDialog_GetSaveFileName1(QWidget* parent) { QString _ret = QFileDialog::getSaveFileName(parent); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFileDialog_GetSaveFileName2(QWidget* parent, struct miqt_string* caption) { - QString caption_QString = QString::fromUtf8(&caption->data, caption->len); +struct miqt_string QFileDialog_GetSaveFileName2(QWidget* parent, struct miqt_string caption) { + QString caption_QString = QString::fromUtf8(caption.data, caption.len); QString _ret = QFileDialog::getSaveFileName(parent, caption_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFileDialog_GetSaveFileName3(QWidget* parent, struct miqt_string* caption, struct miqt_string* dir) { - QString caption_QString = QString::fromUtf8(&caption->data, caption->len); - QString dir_QString = QString::fromUtf8(&dir->data, dir->len); +struct miqt_string QFileDialog_GetSaveFileName3(QWidget* parent, struct miqt_string caption, struct miqt_string dir) { + QString caption_QString = QString::fromUtf8(caption.data, caption.len); + QString dir_QString = QString::fromUtf8(dir.data, dir.len); QString _ret = QFileDialog::getSaveFileName(parent, caption_QString, dir_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFileDialog_GetSaveFileName4(QWidget* parent, struct miqt_string* caption, struct miqt_string* dir, struct miqt_string* filter) { - QString caption_QString = QString::fromUtf8(&caption->data, caption->len); - QString dir_QString = QString::fromUtf8(&dir->data, dir->len); - QString filter_QString = QString::fromUtf8(&filter->data, filter->len); +struct miqt_string QFileDialog_GetSaveFileName4(QWidget* parent, struct miqt_string caption, struct miqt_string dir, struct miqt_string filter) { + QString caption_QString = QString::fromUtf8(caption.data, caption.len); + QString dir_QString = QString::fromUtf8(dir.data, dir.len); + QString filter_QString = QString::fromUtf8(filter.data, filter.len); QString _ret = QFileDialog::getSaveFileName(parent, caption_QString, dir_QString, filter_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QUrl* QFileDialog_GetSaveFileUrl1(QWidget* parent) { return new QUrl(QFileDialog::getSaveFileUrl(parent)); } -QUrl* QFileDialog_GetSaveFileUrl2(QWidget* parent, struct miqt_string* caption) { - QString caption_QString = QString::fromUtf8(&caption->data, caption->len); +QUrl* QFileDialog_GetSaveFileUrl2(QWidget* parent, struct miqt_string caption) { + QString caption_QString = QString::fromUtf8(caption.data, caption.len); return new QUrl(QFileDialog::getSaveFileUrl(parent, caption_QString)); } -QUrl* QFileDialog_GetSaveFileUrl3(QWidget* parent, struct miqt_string* caption, QUrl* dir) { - QString caption_QString = QString::fromUtf8(&caption->data, caption->len); +QUrl* QFileDialog_GetSaveFileUrl3(QWidget* parent, struct miqt_string caption, QUrl* dir) { + QString caption_QString = QString::fromUtf8(caption.data, caption.len); return new QUrl(QFileDialog::getSaveFileUrl(parent, caption_QString, *dir)); } -QUrl* QFileDialog_GetSaveFileUrl4(QWidget* parent, struct miqt_string* caption, QUrl* dir, struct miqt_string* filter) { - QString caption_QString = QString::fromUtf8(&caption->data, caption->len); - QString filter_QString = QString::fromUtf8(&filter->data, filter->len); +QUrl* QFileDialog_GetSaveFileUrl4(QWidget* parent, struct miqt_string caption, QUrl* dir, struct miqt_string filter) { + QString caption_QString = QString::fromUtf8(caption.data, caption.len); + QString filter_QString = QString::fromUtf8(filter.data, filter.len); return new QUrl(QFileDialog::getSaveFileUrl(parent, caption_QString, *dir, filter_QString)); } -struct miqt_string* QFileDialog_GetExistingDirectory1(QWidget* parent) { +struct miqt_string QFileDialog_GetExistingDirectory1(QWidget* parent) { QString _ret = QFileDialog::getExistingDirectory(parent); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFileDialog_GetExistingDirectory2(QWidget* parent, struct miqt_string* caption) { - QString caption_QString = QString::fromUtf8(&caption->data, caption->len); +struct miqt_string QFileDialog_GetExistingDirectory2(QWidget* parent, struct miqt_string caption) { + QString caption_QString = QString::fromUtf8(caption.data, caption.len); QString _ret = QFileDialog::getExistingDirectory(parent, caption_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFileDialog_GetExistingDirectory3(QWidget* parent, struct miqt_string* caption, struct miqt_string* dir) { - QString caption_QString = QString::fromUtf8(&caption->data, caption->len); - QString dir_QString = QString::fromUtf8(&dir->data, dir->len); +struct miqt_string QFileDialog_GetExistingDirectory3(QWidget* parent, struct miqt_string caption, struct miqt_string dir) { + QString caption_QString = QString::fromUtf8(caption.data, caption.len); + QString dir_QString = QString::fromUtf8(dir.data, dir.len); QString _ret = QFileDialog::getExistingDirectory(parent, caption_QString, dir_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFileDialog_GetExistingDirectory4(QWidget* parent, struct miqt_string* caption, struct miqt_string* dir, int options) { - QString caption_QString = QString::fromUtf8(&caption->data, caption->len); - QString dir_QString = QString::fromUtf8(&dir->data, dir->len); +struct miqt_string QFileDialog_GetExistingDirectory4(QWidget* parent, struct miqt_string caption, struct miqt_string dir, int options) { + QString caption_QString = QString::fromUtf8(caption.data, caption.len); + QString dir_QString = QString::fromUtf8(dir.data, dir.len); QString _ret = QFileDialog::getExistingDirectory(parent, caption_QString, dir_QString, static_cast(options)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QUrl* QFileDialog_GetExistingDirectoryUrl1(QWidget* parent) { return new QUrl(QFileDialog::getExistingDirectoryUrl(parent)); } -QUrl* QFileDialog_GetExistingDirectoryUrl2(QWidget* parent, struct miqt_string* caption) { - QString caption_QString = QString::fromUtf8(&caption->data, caption->len); +QUrl* QFileDialog_GetExistingDirectoryUrl2(QWidget* parent, struct miqt_string caption) { + QString caption_QString = QString::fromUtf8(caption.data, caption.len); return new QUrl(QFileDialog::getExistingDirectoryUrl(parent, caption_QString)); } -QUrl* QFileDialog_GetExistingDirectoryUrl3(QWidget* parent, struct miqt_string* caption, QUrl* dir) { - QString caption_QString = QString::fromUtf8(&caption->data, caption->len); +QUrl* QFileDialog_GetExistingDirectoryUrl3(QWidget* parent, struct miqt_string caption, QUrl* dir) { + QString caption_QString = QString::fromUtf8(caption.data, caption.len); return new QUrl(QFileDialog::getExistingDirectoryUrl(parent, caption_QString, *dir)); } -QUrl* QFileDialog_GetExistingDirectoryUrl4(QWidget* parent, struct miqt_string* caption, QUrl* dir, int options) { - QString caption_QString = QString::fromUtf8(&caption->data, caption->len); +QUrl* QFileDialog_GetExistingDirectoryUrl4(QWidget* parent, struct miqt_string caption, QUrl* dir, int options) { + QString caption_QString = QString::fromUtf8(caption.data, caption.len); return new QUrl(QFileDialog::getExistingDirectoryUrl(parent, caption_QString, *dir, static_cast(options))); } -QUrl* QFileDialog_GetExistingDirectoryUrl5(QWidget* parent, struct miqt_string* caption, QUrl* dir, int options, struct miqt_array* /* of struct miqt_string* */ supportedSchemes) { - QString caption_QString = QString::fromUtf8(&caption->data, caption->len); +QUrl* QFileDialog_GetExistingDirectoryUrl5(QWidget* parent, struct miqt_string caption, QUrl* dir, int options, struct miqt_array* /* of struct miqt_string */ supportedSchemes) { + QString caption_QString = QString::fromUtf8(caption.data, caption.len); QStringList supportedSchemes_QList; supportedSchemes_QList.reserve(supportedSchemes->len); - struct miqt_string** supportedSchemes_arr = static_cast(supportedSchemes->data); + struct miqt_string* supportedSchemes_arr = static_cast(supportedSchemes->data); for(size_t i = 0; i < supportedSchemes->len; ++i) { - QString supportedSchemes_arr_i_QString = QString::fromUtf8(&supportedSchemes_arr[i]->data, supportedSchemes_arr[i]->len); + QString supportedSchemes_arr_i_QString = QString::fromUtf8(supportedSchemes_arr[i].data, supportedSchemes_arr[i].len); supportedSchemes_QList.push_back(supportedSchemes_arr_i_QString); } return new QUrl(QFileDialog::getExistingDirectoryUrl(parent, caption_QString, *dir, static_cast(options), supportedSchemes_QList)); @@ -859,12 +1010,16 @@ QUrl* QFileDialog_GetExistingDirectoryUrl5(QWidget* parent, struct miqt_string* struct miqt_array* QFileDialog_GetOpenFileNames1(QWidget* parent) { QStringList _ret = QFileDialog::getOpenFileNames(parent); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -872,16 +1027,20 @@ struct miqt_array* QFileDialog_GetOpenFileNames1(QWidget* parent) { return _out; } -struct miqt_array* QFileDialog_GetOpenFileNames2(QWidget* parent, struct miqt_string* caption) { - QString caption_QString = QString::fromUtf8(&caption->data, caption->len); +struct miqt_array* QFileDialog_GetOpenFileNames2(QWidget* parent, struct miqt_string caption) { + QString caption_QString = QString::fromUtf8(caption.data, caption.len); QStringList _ret = QFileDialog::getOpenFileNames(parent, caption_QString); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -889,17 +1048,21 @@ struct miqt_array* QFileDialog_GetOpenFileNames2(QWidget* parent, struct miqt_st return _out; } -struct miqt_array* QFileDialog_GetOpenFileNames3(QWidget* parent, struct miqt_string* caption, struct miqt_string* dir) { - QString caption_QString = QString::fromUtf8(&caption->data, caption->len); - QString dir_QString = QString::fromUtf8(&dir->data, dir->len); +struct miqt_array* QFileDialog_GetOpenFileNames3(QWidget* parent, struct miqt_string caption, struct miqt_string dir) { + QString caption_QString = QString::fromUtf8(caption.data, caption.len); + QString dir_QString = QString::fromUtf8(dir.data, dir.len); QStringList _ret = QFileDialog::getOpenFileNames(parent, caption_QString, dir_QString); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -907,18 +1070,22 @@ struct miqt_array* QFileDialog_GetOpenFileNames3(QWidget* parent, struct miqt_st return _out; } -struct miqt_array* QFileDialog_GetOpenFileNames4(QWidget* parent, struct miqt_string* caption, struct miqt_string* dir, struct miqt_string* filter) { - QString caption_QString = QString::fromUtf8(&caption->data, caption->len); - QString dir_QString = QString::fromUtf8(&dir->data, dir->len); - QString filter_QString = QString::fromUtf8(&filter->data, filter->len); +struct miqt_array* QFileDialog_GetOpenFileNames4(QWidget* parent, struct miqt_string caption, struct miqt_string dir, struct miqt_string filter) { + QString caption_QString = QString::fromUtf8(caption.data, caption.len); + QString dir_QString = QString::fromUtf8(dir.data, dir.len); + QString filter_QString = QString::fromUtf8(filter.data, filter.len); QStringList _ret = QFileDialog::getOpenFileNames(parent, caption_QString, dir_QString, filter_QString); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -939,8 +1106,8 @@ struct miqt_array* QFileDialog_GetOpenFileUrls1(QWidget* parent) { return _out; } -struct miqt_array* QFileDialog_GetOpenFileUrls2(QWidget* parent, struct miqt_string* caption) { - QString caption_QString = QString::fromUtf8(&caption->data, caption->len); +struct miqt_array* QFileDialog_GetOpenFileUrls2(QWidget* parent, struct miqt_string caption) { + QString caption_QString = QString::fromUtf8(caption.data, caption.len); QList _ret = QFileDialog::getOpenFileUrls(parent, caption_QString); // Convert QList<> from C++ memory to manually-managed C memory QUrl** _arr = static_cast(malloc(sizeof(QUrl*) * _ret.length())); @@ -953,8 +1120,8 @@ struct miqt_array* QFileDialog_GetOpenFileUrls2(QWidget* parent, struct miqt_str return _out; } -struct miqt_array* QFileDialog_GetOpenFileUrls3(QWidget* parent, struct miqt_string* caption, QUrl* dir) { - QString caption_QString = QString::fromUtf8(&caption->data, caption->len); +struct miqt_array* QFileDialog_GetOpenFileUrls3(QWidget* parent, struct miqt_string caption, QUrl* dir) { + QString caption_QString = QString::fromUtf8(caption.data, caption.len); QList _ret = QFileDialog::getOpenFileUrls(parent, caption_QString, *dir); // Convert QList<> from C++ memory to manually-managed C memory QUrl** _arr = static_cast(malloc(sizeof(QUrl*) * _ret.length())); @@ -967,9 +1134,9 @@ struct miqt_array* QFileDialog_GetOpenFileUrls3(QWidget* parent, struct miqt_str return _out; } -struct miqt_array* QFileDialog_GetOpenFileUrls4(QWidget* parent, struct miqt_string* caption, QUrl* dir, struct miqt_string* filter) { - QString caption_QString = QString::fromUtf8(&caption->data, caption->len); - QString filter_QString = QString::fromUtf8(&filter->data, filter->len); +struct miqt_array* QFileDialog_GetOpenFileUrls4(QWidget* parent, struct miqt_string caption, QUrl* dir, struct miqt_string filter) { + QString caption_QString = QString::fromUtf8(caption.data, caption.len); + QString filter_QString = QString::fromUtf8(filter.data, filter.len); QList _ret = QFileDialog::getOpenFileUrls(parent, caption_QString, *dir, filter_QString); // Convert QList<> from C++ memory to manually-managed C memory QUrl** _arr = static_cast(malloc(sizeof(QUrl*) * _ret.length())); @@ -982,9 +1149,10 @@ struct miqt_array* QFileDialog_GetOpenFileUrls4(QWidget* parent, struct miqt_str return _out; } -void QFileDialog_SaveFileContent2(QByteArray* fileContent, struct miqt_string* fileNameHint) { - QString fileNameHint_QString = QString::fromUtf8(&fileNameHint->data, fileNameHint->len); - QFileDialog::saveFileContent(*fileContent, fileNameHint_QString); +void QFileDialog_SaveFileContent2(struct miqt_string fileContent, struct miqt_string fileNameHint) { + QByteArray fileContent_QByteArray(fileContent.data, fileContent.len); + QString fileNameHint_QString = QString::fromUtf8(fileNameHint.data, fileNameHint.len); + QFileDialog::saveFileContent(fileContent_QByteArray, fileNameHint_QString); } void QFileDialog_Delete(QFileDialog* self) { diff --git a/qt/gen_qfiledialog.go b/qt/gen_qfiledialog.go index e91d4ea6..61f4b21c 100644 --- a/qt/gen_qfiledialog.go +++ b/qt/gen_qfiledialog.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "runtime/cgo" "unsafe" @@ -112,31 +111,43 @@ func NewQFileDialog3(parent *QWidget) *QFileDialog { // NewQFileDialog4 constructs a new QFileDialog object. func NewQFileDialog4(parent *QWidget, caption string) *QFileDialog { - caption_ms := libmiqt.Strdupg(caption) - defer C.free(caption_ms) - ret := C.QFileDialog_new4(parent.cPointer(), (*C.struct_miqt_string)(caption_ms)) + caption_ms := C.struct_miqt_string{} + caption_ms.data = C.CString(caption) + caption_ms.len = C.size_t(len(caption)) + defer C.free(unsafe.Pointer(caption_ms.data)) + ret := C.QFileDialog_new4(parent.cPointer(), caption_ms) return newQFileDialog(ret) } // NewQFileDialog5 constructs a new QFileDialog object. func NewQFileDialog5(parent *QWidget, caption string, directory string) *QFileDialog { - caption_ms := libmiqt.Strdupg(caption) - defer C.free(caption_ms) - directory_ms := libmiqt.Strdupg(directory) - defer C.free(directory_ms) - ret := C.QFileDialog_new5(parent.cPointer(), (*C.struct_miqt_string)(caption_ms), (*C.struct_miqt_string)(directory_ms)) + caption_ms := C.struct_miqt_string{} + caption_ms.data = C.CString(caption) + caption_ms.len = C.size_t(len(caption)) + defer C.free(unsafe.Pointer(caption_ms.data)) + directory_ms := C.struct_miqt_string{} + directory_ms.data = C.CString(directory) + directory_ms.len = C.size_t(len(directory)) + defer C.free(unsafe.Pointer(directory_ms.data)) + ret := C.QFileDialog_new5(parent.cPointer(), caption_ms, directory_ms) return newQFileDialog(ret) } // NewQFileDialog6 constructs a new QFileDialog object. func NewQFileDialog6(parent *QWidget, caption string, directory string, filter string) *QFileDialog { - caption_ms := libmiqt.Strdupg(caption) - defer C.free(caption_ms) - directory_ms := libmiqt.Strdupg(directory) - defer C.free(directory_ms) - filter_ms := libmiqt.Strdupg(filter) - defer C.free(filter_ms) - ret := C.QFileDialog_new6(parent.cPointer(), (*C.struct_miqt_string)(caption_ms), (*C.struct_miqt_string)(directory_ms), (*C.struct_miqt_string)(filter_ms)) + caption_ms := C.struct_miqt_string{} + caption_ms.data = C.CString(caption) + caption_ms.len = C.size_t(len(caption)) + defer C.free(unsafe.Pointer(caption_ms.data)) + directory_ms := C.struct_miqt_string{} + directory_ms.data = C.CString(directory) + directory_ms.len = C.size_t(len(directory)) + defer C.free(unsafe.Pointer(directory_ms.data)) + filter_ms := C.struct_miqt_string{} + filter_ms.data = C.CString(filter) + filter_ms.len = C.size_t(len(filter)) + defer C.free(unsafe.Pointer(filter_ms.data)) + ret := C.QFileDialog_new6(parent.cPointer(), caption_ms, directory_ms, filter_ms) return newQFileDialog(ret) } @@ -147,31 +158,33 @@ func (this *QFileDialog) MetaObject() *QMetaObject { func (this *QFileDialog) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QFileDialog_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QFileDialog_Metacast(this.h, param1_Cstring)) } func QFileDialog_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QFileDialog_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFileDialog_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QFileDialog_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QFileDialog_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFileDialog_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QFileDialog) SetDirectory(directory string) { - directory_ms := libmiqt.Strdupg(directory) - defer C.free(directory_ms) - C.QFileDialog_SetDirectory(this.h, (*C.struct_miqt_string)(directory_ms)) + directory_ms := C.struct_miqt_string{} + directory_ms.data = C.CString(directory) + directory_ms.len = C.size_t(len(directory)) + defer C.free(unsafe.Pointer(directory_ms.data)) + C.QFileDialog_SetDirectory(this.h, directory_ms) } func (this *QFileDialog) SetDirectoryWithDirectory(directory *QDir) { @@ -197,19 +210,21 @@ func (this *QFileDialog) DirectoryUrl() *QUrl { } func (this *QFileDialog) SelectFile(filename string) { - filename_ms := libmiqt.Strdupg(filename) - defer C.free(filename_ms) - C.QFileDialog_SelectFile(this.h, (*C.struct_miqt_string)(filename_ms)) + filename_ms := C.struct_miqt_string{} + filename_ms.data = C.CString(filename) + filename_ms.len = C.size_t(len(filename)) + defer C.free(unsafe.Pointer(filename_ms.data)) + C.QFileDialog_SelectFile(this.h, filename_ms) } func (this *QFileDialog) SelectedFiles() []string { var _ma *C.struct_miqt_array = C.QFileDialog_SelectedFiles(this.h) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -243,19 +258,23 @@ func (this *QFileDialog) IsNameFilterDetailsVisible() bool { } func (this *QFileDialog) SetNameFilter(filter string) { - filter_ms := libmiqt.Strdupg(filter) - defer C.free(filter_ms) - C.QFileDialog_SetNameFilter(this.h, (*C.struct_miqt_string)(filter_ms)) + filter_ms := C.struct_miqt_string{} + filter_ms.data = C.CString(filter) + filter_ms.len = C.size_t(len(filter)) + defer C.free(unsafe.Pointer(filter_ms.data)) + C.QFileDialog_SetNameFilter(this.h, filter_ms) } func (this *QFileDialog) SetNameFilters(filters []string) { // For the C ABI, malloc a C array of raw pointers - filters_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(filters)))) + filters_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(filters)))) defer C.free(unsafe.Pointer(filters_CArray)) for i := range filters { - filters_i_ms := libmiqt.Strdupg(filters[i]) - defer C.free(filters_i_ms) - filters_CArray[i] = (*C.struct_miqt_string)(filters_i_ms) + filters_i_ms := C.struct_miqt_string{} + filters_i_ms.data = C.CString(filters[i]) + filters_i_ms.len = C.size_t(len(filters[i])) + defer C.free(unsafe.Pointer(filters_i_ms.data)) + filters_CArray[i] = filters_i_ms } filters_ma := &C.struct_miqt_array{len: C.size_t(len(filters)), data: unsafe.Pointer(filters_CArray)} defer runtime.KeepAlive(unsafe.Pointer(filters_ma)) @@ -265,11 +284,11 @@ func (this *QFileDialog) SetNameFilters(filters []string) { func (this *QFileDialog) NameFilters() []string { var _ma *C.struct_miqt_array = C.QFileDialog_NameFilters(this.h) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -277,33 +296,37 @@ func (this *QFileDialog) NameFilters() []string { } func (this *QFileDialog) SelectNameFilter(filter string) { - filter_ms := libmiqt.Strdupg(filter) - defer C.free(filter_ms) - C.QFileDialog_SelectNameFilter(this.h, (*C.struct_miqt_string)(filter_ms)) + filter_ms := C.struct_miqt_string{} + filter_ms.data = C.CString(filter) + filter_ms.len = C.size_t(len(filter)) + defer C.free(unsafe.Pointer(filter_ms.data)) + C.QFileDialog_SelectNameFilter(this.h, filter_ms) } func (this *QFileDialog) SelectedMimeTypeFilter() string { - var _ms *C.struct_miqt_string = C.QFileDialog_SelectedMimeTypeFilter(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFileDialog_SelectedMimeTypeFilter(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QFileDialog) SelectedNameFilter() string { - var _ms *C.struct_miqt_string = C.QFileDialog_SelectedNameFilter(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFileDialog_SelectedNameFilter(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QFileDialog) SetMimeTypeFilters(filters []string) { // For the C ABI, malloc a C array of raw pointers - filters_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(filters)))) + filters_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(filters)))) defer C.free(unsafe.Pointer(filters_CArray)) for i := range filters { - filters_i_ms := libmiqt.Strdupg(filters[i]) - defer C.free(filters_i_ms) - filters_CArray[i] = (*C.struct_miqt_string)(filters_i_ms) + filters_i_ms := C.struct_miqt_string{} + filters_i_ms.data = C.CString(filters[i]) + filters_i_ms.len = C.size_t(len(filters[i])) + defer C.free(unsafe.Pointer(filters_i_ms.data)) + filters_CArray[i] = filters_i_ms } filters_ma := &C.struct_miqt_array{len: C.size_t(len(filters)), data: unsafe.Pointer(filters_CArray)} defer runtime.KeepAlive(unsafe.Pointer(filters_ma)) @@ -313,11 +336,11 @@ func (this *QFileDialog) SetMimeTypeFilters(filters []string) { func (this *QFileDialog) MimeTypeFilters() []string { var _ma *C.struct_miqt_array = C.QFileDialog_MimeTypeFilters(this.h) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -325,9 +348,11 @@ func (this *QFileDialog) MimeTypeFilters() []string { } func (this *QFileDialog) SelectMimeTypeFilter(filter string) { - filter_ms := libmiqt.Strdupg(filter) - defer C.free(filter_ms) - C.QFileDialog_SelectMimeTypeFilter(this.h, (*C.struct_miqt_string)(filter_ms)) + filter_ms := C.struct_miqt_string{} + filter_ms.data = C.CString(filter) + filter_ms.len = C.size_t(len(filter)) + defer C.free(unsafe.Pointer(filter_ms.data)) + C.QFileDialog_SelectMimeTypeFilter(this.h, filter_ms) } func (this *QFileDialog) Filter() QDir__Filter { @@ -404,15 +429,18 @@ func (this *QFileDialog) SidebarUrls() []QUrl { return _ret } -func (this *QFileDialog) SaveState() *QByteArray { - _ret := C.QFileDialog_SaveState(this.h) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QFileDialog) SaveState() []byte { + var _bytearray C.struct_miqt_string = C.QFileDialog_SaveState(this.h) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } -func (this *QFileDialog) RestoreState(state *QByteArray) bool { - return (bool)(C.QFileDialog_RestoreState(this.h, state.cPointer())) +func (this *QFileDialog) RestoreState(state []byte) bool { + state_alias := C.struct_miqt_string{} + state_alias.data = (*C.char)(unsafe.Pointer(&state[0])) + state_alias.len = C.size_t(len(state)) + return (bool)(C.QFileDialog_RestoreState(this.h, state_alias)) } func (this *QFileDialog) SetConfirmOverwrite(enabled bool) { @@ -424,26 +452,30 @@ func (this *QFileDialog) ConfirmOverwrite() bool { } func (this *QFileDialog) SetDefaultSuffix(suffix string) { - suffix_ms := libmiqt.Strdupg(suffix) - defer C.free(suffix_ms) - C.QFileDialog_SetDefaultSuffix(this.h, (*C.struct_miqt_string)(suffix_ms)) + suffix_ms := C.struct_miqt_string{} + suffix_ms.data = C.CString(suffix) + suffix_ms.len = C.size_t(len(suffix)) + defer C.free(unsafe.Pointer(suffix_ms.data)) + C.QFileDialog_SetDefaultSuffix(this.h, suffix_ms) } func (this *QFileDialog) DefaultSuffix() string { - var _ms *C.struct_miqt_string = C.QFileDialog_DefaultSuffix(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFileDialog_DefaultSuffix(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QFileDialog) SetHistory(paths []string) { // For the C ABI, malloc a C array of raw pointers - paths_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(paths)))) + paths_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(paths)))) defer C.free(unsafe.Pointer(paths_CArray)) for i := range paths { - paths_i_ms := libmiqt.Strdupg(paths[i]) - defer C.free(paths_i_ms) - paths_CArray[i] = (*C.struct_miqt_string)(paths_i_ms) + paths_i_ms := C.struct_miqt_string{} + paths_i_ms.data = C.CString(paths[i]) + paths_i_ms.len = C.size_t(len(paths[i])) + defer C.free(unsafe.Pointer(paths_i_ms.data)) + paths_CArray[i] = paths_i_ms } paths_ma := &C.struct_miqt_array{len: C.size_t(len(paths)), data: unsafe.Pointer(paths_CArray)} defer runtime.KeepAlive(unsafe.Pointer(paths_ma)) @@ -453,11 +485,11 @@ func (this *QFileDialog) SetHistory(paths []string) { func (this *QFileDialog) History() []string { var _ma *C.struct_miqt_array = C.QFileDialog_History(this.h) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -481,26 +513,30 @@ func (this *QFileDialog) IconProvider() *QFileIconProvider { } func (this *QFileDialog) SetLabelText(label QFileDialog__DialogLabel, text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QFileDialog_SetLabelText(this.h, (C.int)(label), (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QFileDialog_SetLabelText(this.h, (C.int)(label), text_ms) } func (this *QFileDialog) LabelText(label QFileDialog__DialogLabel) string { - var _ms *C.struct_miqt_string = C.QFileDialog_LabelText(this.h, (C.int)(label)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFileDialog_LabelText(this.h, (C.int)(label)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QFileDialog) SetSupportedSchemes(schemes []string) { // For the C ABI, malloc a C array of raw pointers - schemes_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(schemes)))) + schemes_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(schemes)))) defer C.free(unsafe.Pointer(schemes_CArray)) for i := range schemes { - schemes_i_ms := libmiqt.Strdupg(schemes[i]) - defer C.free(schemes_i_ms) - schemes_CArray[i] = (*C.struct_miqt_string)(schemes_i_ms) + schemes_i_ms := C.struct_miqt_string{} + schemes_i_ms.data = C.CString(schemes[i]) + schemes_i_ms.len = C.size_t(len(schemes[i])) + defer C.free(unsafe.Pointer(schemes_i_ms.data)) + schemes_CArray[i] = schemes_i_ms } schemes_ma := &C.struct_miqt_array{len: C.size_t(len(schemes)), data: unsafe.Pointer(schemes_CArray)} defer runtime.KeepAlive(unsafe.Pointer(schemes_ma)) @@ -510,11 +546,11 @@ func (this *QFileDialog) SetSupportedSchemes(schemes []string) { func (this *QFileDialog) SupportedSchemes() []string { var _ma *C.struct_miqt_array = C.QFileDialog_SupportedSchemes(this.h) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -550,25 +586,27 @@ func (this *QFileDialog) SetVisible(visible bool) { } func (this *QFileDialog) FileSelected(file string) { - file_ms := libmiqt.Strdupg(file) - defer C.free(file_ms) - C.QFileDialog_FileSelected(this.h, (*C.struct_miqt_string)(file_ms)) + file_ms := C.struct_miqt_string{} + file_ms.data = C.CString(file) + file_ms.len = C.size_t(len(file)) + defer C.free(unsafe.Pointer(file_ms.data)) + C.QFileDialog_FileSelected(this.h, file_ms) } func (this *QFileDialog) OnFileSelected(slot func(file string)) { C.QFileDialog_connect_FileSelected(this.h, C.intptr_t(cgo.NewHandle(slot))) } //export miqt_exec_callback_QFileDialog_FileSelected -func miqt_exec_callback_QFileDialog_FileSelected(cb C.intptr_t, file *C.struct_miqt_string) { +func miqt_exec_callback_QFileDialog_FileSelected(cb C.intptr_t, file C.struct_miqt_string) { gofunc, ok := cgo.Handle(cb).Value().(func(file string)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") } // Convert all CABI parameters to Go parameters - var file_ms *C.struct_miqt_string = file - file_ret := C.GoStringN(&file_ms.data, C.int(int64(file_ms.len))) - C.free(unsafe.Pointer(file_ms)) + var file_ms C.struct_miqt_string = file + file_ret := C.GoStringN(file_ms.data, C.int(int64(file_ms.len))) + C.free(unsafe.Pointer(file_ms.data)) slotval1 := file_ret gofunc(slotval1) @@ -576,12 +614,14 @@ func miqt_exec_callback_QFileDialog_FileSelected(cb C.intptr_t, file *C.struct_m func (this *QFileDialog) FilesSelected(files []string) { // For the C ABI, malloc a C array of raw pointers - files_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(files)))) + files_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(files)))) defer C.free(unsafe.Pointer(files_CArray)) for i := range files { - files_i_ms := libmiqt.Strdupg(files[i]) - defer C.free(files_i_ms) - files_CArray[i] = (*C.struct_miqt_string)(files_i_ms) + files_i_ms := C.struct_miqt_string{} + files_i_ms.data = C.CString(files[i]) + files_i_ms.len = C.size_t(len(files[i])) + defer C.free(unsafe.Pointer(files_i_ms.data)) + files_CArray[i] = files_i_ms } files_ma := &C.struct_miqt_array{len: C.size_t(len(files)), data: unsafe.Pointer(files_CArray)} defer runtime.KeepAlive(unsafe.Pointer(files_ma)) @@ -601,11 +641,11 @@ func miqt_exec_callback_QFileDialog_FilesSelected(cb C.intptr_t, files *C.struct // Convert all CABI parameters to Go parameters var files_ma *C.struct_miqt_array = files files_ret := make([]string, int(files_ma.len)) - files_outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(files_ma.data)) // hey ya + files_outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(files_ma.data)) // hey ya for i := 0; i < int(files_ma.len); i++ { - var files_lv_ms *C.struct_miqt_string = files_outCast[i] - files_lv_ret := C.GoStringN(&files_lv_ms.data, C.int(int64(files_lv_ms.len))) - C.free(unsafe.Pointer(files_lv_ms)) + var files_lv_ms C.struct_miqt_string = files_outCast[i] + files_lv_ret := C.GoStringN(files_lv_ms.data, C.int(int64(files_lv_ms.len))) + C.free(unsafe.Pointer(files_lv_ms.data)) files_ret[i] = files_lv_ret } C.free(unsafe.Pointer(files_ma)) @@ -615,50 +655,54 @@ func miqt_exec_callback_QFileDialog_FilesSelected(cb C.intptr_t, files *C.struct } func (this *QFileDialog) CurrentChanged(path string) { - path_ms := libmiqt.Strdupg(path) - defer C.free(path_ms) - C.QFileDialog_CurrentChanged(this.h, (*C.struct_miqt_string)(path_ms)) + path_ms := C.struct_miqt_string{} + path_ms.data = C.CString(path) + path_ms.len = C.size_t(len(path)) + defer C.free(unsafe.Pointer(path_ms.data)) + C.QFileDialog_CurrentChanged(this.h, path_ms) } func (this *QFileDialog) OnCurrentChanged(slot func(path string)) { C.QFileDialog_connect_CurrentChanged(this.h, C.intptr_t(cgo.NewHandle(slot))) } //export miqt_exec_callback_QFileDialog_CurrentChanged -func miqt_exec_callback_QFileDialog_CurrentChanged(cb C.intptr_t, path *C.struct_miqt_string) { +func miqt_exec_callback_QFileDialog_CurrentChanged(cb C.intptr_t, path C.struct_miqt_string) { gofunc, ok := cgo.Handle(cb).Value().(func(path string)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") } // Convert all CABI parameters to Go parameters - var path_ms *C.struct_miqt_string = path - path_ret := C.GoStringN(&path_ms.data, C.int(int64(path_ms.len))) - C.free(unsafe.Pointer(path_ms)) + var path_ms C.struct_miqt_string = path + path_ret := C.GoStringN(path_ms.data, C.int(int64(path_ms.len))) + C.free(unsafe.Pointer(path_ms.data)) slotval1 := path_ret gofunc(slotval1) } func (this *QFileDialog) DirectoryEntered(directory string) { - directory_ms := libmiqt.Strdupg(directory) - defer C.free(directory_ms) - C.QFileDialog_DirectoryEntered(this.h, (*C.struct_miqt_string)(directory_ms)) + directory_ms := C.struct_miqt_string{} + directory_ms.data = C.CString(directory) + directory_ms.len = C.size_t(len(directory)) + defer C.free(unsafe.Pointer(directory_ms.data)) + C.QFileDialog_DirectoryEntered(this.h, directory_ms) } func (this *QFileDialog) OnDirectoryEntered(slot func(directory string)) { C.QFileDialog_connect_DirectoryEntered(this.h, C.intptr_t(cgo.NewHandle(slot))) } //export miqt_exec_callback_QFileDialog_DirectoryEntered -func miqt_exec_callback_QFileDialog_DirectoryEntered(cb C.intptr_t, directory *C.struct_miqt_string) { +func miqt_exec_callback_QFileDialog_DirectoryEntered(cb C.intptr_t, directory C.struct_miqt_string) { gofunc, ok := cgo.Handle(cb).Value().(func(directory string)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") } // Convert all CABI parameters to Go parameters - var directory_ms *C.struct_miqt_string = directory - directory_ret := C.GoStringN(&directory_ms.data, C.int(int64(directory_ms.len))) - C.free(unsafe.Pointer(directory_ms)) + var directory_ms C.struct_miqt_string = directory + directory_ret := C.GoStringN(directory_ms.data, C.int(int64(directory_ms.len))) + C.free(unsafe.Pointer(directory_ms.data)) slotval1 := directory_ret gofunc(slotval1) @@ -763,34 +807,36 @@ func miqt_exec_callback_QFileDialog_DirectoryUrlEntered(cb C.intptr_t, directory } func (this *QFileDialog) FilterSelected(filter string) { - filter_ms := libmiqt.Strdupg(filter) - defer C.free(filter_ms) - C.QFileDialog_FilterSelected(this.h, (*C.struct_miqt_string)(filter_ms)) + filter_ms := C.struct_miqt_string{} + filter_ms.data = C.CString(filter) + filter_ms.len = C.size_t(len(filter)) + defer C.free(unsafe.Pointer(filter_ms.data)) + C.QFileDialog_FilterSelected(this.h, filter_ms) } func (this *QFileDialog) OnFilterSelected(slot func(filter string)) { C.QFileDialog_connect_FilterSelected(this.h, C.intptr_t(cgo.NewHandle(slot))) } //export miqt_exec_callback_QFileDialog_FilterSelected -func miqt_exec_callback_QFileDialog_FilterSelected(cb C.intptr_t, filter *C.struct_miqt_string) { +func miqt_exec_callback_QFileDialog_FilterSelected(cb C.intptr_t, filter C.struct_miqt_string) { gofunc, ok := cgo.Handle(cb).Value().(func(filter string)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") } // Convert all CABI parameters to Go parameters - var filter_ms *C.struct_miqt_string = filter - filter_ret := C.GoStringN(&filter_ms.data, C.int(int64(filter_ms.len))) - C.free(unsafe.Pointer(filter_ms)) + var filter_ms C.struct_miqt_string = filter + filter_ret := C.GoStringN(filter_ms.data, C.int(int64(filter_ms.len))) + C.free(unsafe.Pointer(filter_ms.data)) slotval1 := filter_ret gofunc(slotval1) } func QFileDialog_GetOpenFileName() string { - var _ms *C.struct_miqt_string = C.QFileDialog_GetOpenFileName() - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFileDialog_GetOpenFileName() + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -802,9 +848,9 @@ func QFileDialog_GetOpenFileUrl() *QUrl { } func QFileDialog_GetSaveFileName() string { - var _ms *C.struct_miqt_string = C.QFileDialog_GetSaveFileName() - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFileDialog_GetSaveFileName() + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -816,9 +862,9 @@ func QFileDialog_GetSaveFileUrl() *QUrl { } func QFileDialog_GetExistingDirectory() string { - var _ms *C.struct_miqt_string = C.QFileDialog_GetExistingDirectory() - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFileDialog_GetExistingDirectory() + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -832,11 +878,11 @@ func QFileDialog_GetExistingDirectoryUrl() *QUrl { func QFileDialog_GetOpenFileNames() []string { var _ma *C.struct_miqt_array = C.QFileDialog_GetOpenFileNames() _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -857,8 +903,11 @@ func QFileDialog_GetOpenFileUrls() []QUrl { return _ret } -func QFileDialog_SaveFileContent(fileContent *QByteArray) { - C.QFileDialog_SaveFileContent(fileContent.cPointer()) +func QFileDialog_SaveFileContent(fileContent []byte) { + fileContent_alias := C.struct_miqt_string{} + fileContent_alias.data = (*C.char)(unsafe.Pointer(&fileContent[0])) + fileContent_alias.len = C.size_t(len(fileContent)) + C.QFileDialog_SaveFileContent(fileContent_alias) } func QFileDialog_Tr2(s string, c string) string { @@ -866,9 +915,9 @@ func QFileDialog_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFileDialog_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFileDialog_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -877,9 +926,9 @@ func QFileDialog_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFileDialog_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFileDialog_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -888,9 +937,9 @@ func QFileDialog_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFileDialog_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFileDialog_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -899,9 +948,9 @@ func QFileDialog_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFileDialog_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFileDialog_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -910,42 +959,54 @@ func (this *QFileDialog) SetOption2(option QFileDialog__Option, on bool) { } func QFileDialog_GetOpenFileName1(parent *QWidget) string { - var _ms *C.struct_miqt_string = C.QFileDialog_GetOpenFileName1(parent.cPointer()) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFileDialog_GetOpenFileName1(parent.cPointer()) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QFileDialog_GetOpenFileName2(parent *QWidget, caption string) string { - caption_ms := libmiqt.Strdupg(caption) - defer C.free(caption_ms) - var _ms *C.struct_miqt_string = C.QFileDialog_GetOpenFileName2(parent.cPointer(), (*C.struct_miqt_string)(caption_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + caption_ms := C.struct_miqt_string{} + caption_ms.data = C.CString(caption) + caption_ms.len = C.size_t(len(caption)) + defer C.free(unsafe.Pointer(caption_ms.data)) + var _ms C.struct_miqt_string = C.QFileDialog_GetOpenFileName2(parent.cPointer(), caption_ms) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QFileDialog_GetOpenFileName3(parent *QWidget, caption string, dir string) string { - caption_ms := libmiqt.Strdupg(caption) - defer C.free(caption_ms) - dir_ms := libmiqt.Strdupg(dir) - defer C.free(dir_ms) - var _ms *C.struct_miqt_string = C.QFileDialog_GetOpenFileName3(parent.cPointer(), (*C.struct_miqt_string)(caption_ms), (*C.struct_miqt_string)(dir_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + caption_ms := C.struct_miqt_string{} + caption_ms.data = C.CString(caption) + caption_ms.len = C.size_t(len(caption)) + defer C.free(unsafe.Pointer(caption_ms.data)) + dir_ms := C.struct_miqt_string{} + dir_ms.data = C.CString(dir) + dir_ms.len = C.size_t(len(dir)) + defer C.free(unsafe.Pointer(dir_ms.data)) + var _ms C.struct_miqt_string = C.QFileDialog_GetOpenFileName3(parent.cPointer(), caption_ms, dir_ms) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QFileDialog_GetOpenFileName4(parent *QWidget, caption string, dir string, filter string) string { - caption_ms := libmiqt.Strdupg(caption) - defer C.free(caption_ms) - dir_ms := libmiqt.Strdupg(dir) - defer C.free(dir_ms) - filter_ms := libmiqt.Strdupg(filter) - defer C.free(filter_ms) - var _ms *C.struct_miqt_string = C.QFileDialog_GetOpenFileName4(parent.cPointer(), (*C.struct_miqt_string)(caption_ms), (*C.struct_miqt_string)(dir_ms), (*C.struct_miqt_string)(filter_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + caption_ms := C.struct_miqt_string{} + caption_ms.data = C.CString(caption) + caption_ms.len = C.size_t(len(caption)) + defer C.free(unsafe.Pointer(caption_ms.data)) + dir_ms := C.struct_miqt_string{} + dir_ms.data = C.CString(dir) + dir_ms.len = C.size_t(len(dir)) + defer C.free(unsafe.Pointer(dir_ms.data)) + filter_ms := C.struct_miqt_string{} + filter_ms.data = C.CString(filter) + filter_ms.len = C.size_t(len(filter)) + defer C.free(unsafe.Pointer(filter_ms.data)) + var _ms C.struct_miqt_string = C.QFileDialog_GetOpenFileName4(parent.cPointer(), caption_ms, dir_ms, filter_ms) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -957,71 +1018,91 @@ func QFileDialog_GetOpenFileUrl1(parent *QWidget) *QUrl { } func QFileDialog_GetOpenFileUrl2(parent *QWidget, caption string) *QUrl { - caption_ms := libmiqt.Strdupg(caption) - defer C.free(caption_ms) - _ret := C.QFileDialog_GetOpenFileUrl2(parent.cPointer(), (*C.struct_miqt_string)(caption_ms)) + caption_ms := C.struct_miqt_string{} + caption_ms.data = C.CString(caption) + caption_ms.len = C.size_t(len(caption)) + defer C.free(unsafe.Pointer(caption_ms.data)) + _ret := C.QFileDialog_GetOpenFileUrl2(parent.cPointer(), caption_ms) _goptr := newQUrl(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func QFileDialog_GetOpenFileUrl3(parent *QWidget, caption string, dir *QUrl) *QUrl { - caption_ms := libmiqt.Strdupg(caption) - defer C.free(caption_ms) - _ret := C.QFileDialog_GetOpenFileUrl3(parent.cPointer(), (*C.struct_miqt_string)(caption_ms), dir.cPointer()) + caption_ms := C.struct_miqt_string{} + caption_ms.data = C.CString(caption) + caption_ms.len = C.size_t(len(caption)) + defer C.free(unsafe.Pointer(caption_ms.data)) + _ret := C.QFileDialog_GetOpenFileUrl3(parent.cPointer(), caption_ms, dir.cPointer()) _goptr := newQUrl(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func QFileDialog_GetOpenFileUrl4(parent *QWidget, caption string, dir *QUrl, filter string) *QUrl { - caption_ms := libmiqt.Strdupg(caption) - defer C.free(caption_ms) - filter_ms := libmiqt.Strdupg(filter) - defer C.free(filter_ms) - _ret := C.QFileDialog_GetOpenFileUrl4(parent.cPointer(), (*C.struct_miqt_string)(caption_ms), dir.cPointer(), (*C.struct_miqt_string)(filter_ms)) + caption_ms := C.struct_miqt_string{} + caption_ms.data = C.CString(caption) + caption_ms.len = C.size_t(len(caption)) + defer C.free(unsafe.Pointer(caption_ms.data)) + filter_ms := C.struct_miqt_string{} + filter_ms.data = C.CString(filter) + filter_ms.len = C.size_t(len(filter)) + defer C.free(unsafe.Pointer(filter_ms.data)) + _ret := C.QFileDialog_GetOpenFileUrl4(parent.cPointer(), caption_ms, dir.cPointer(), filter_ms) _goptr := newQUrl(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func QFileDialog_GetSaveFileName1(parent *QWidget) string { - var _ms *C.struct_miqt_string = C.QFileDialog_GetSaveFileName1(parent.cPointer()) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFileDialog_GetSaveFileName1(parent.cPointer()) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QFileDialog_GetSaveFileName2(parent *QWidget, caption string) string { - caption_ms := libmiqt.Strdupg(caption) - defer C.free(caption_ms) - var _ms *C.struct_miqt_string = C.QFileDialog_GetSaveFileName2(parent.cPointer(), (*C.struct_miqt_string)(caption_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + caption_ms := C.struct_miqt_string{} + caption_ms.data = C.CString(caption) + caption_ms.len = C.size_t(len(caption)) + defer C.free(unsafe.Pointer(caption_ms.data)) + var _ms C.struct_miqt_string = C.QFileDialog_GetSaveFileName2(parent.cPointer(), caption_ms) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QFileDialog_GetSaveFileName3(parent *QWidget, caption string, dir string) string { - caption_ms := libmiqt.Strdupg(caption) - defer C.free(caption_ms) - dir_ms := libmiqt.Strdupg(dir) - defer C.free(dir_ms) - var _ms *C.struct_miqt_string = C.QFileDialog_GetSaveFileName3(parent.cPointer(), (*C.struct_miqt_string)(caption_ms), (*C.struct_miqt_string)(dir_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + caption_ms := C.struct_miqt_string{} + caption_ms.data = C.CString(caption) + caption_ms.len = C.size_t(len(caption)) + defer C.free(unsafe.Pointer(caption_ms.data)) + dir_ms := C.struct_miqt_string{} + dir_ms.data = C.CString(dir) + dir_ms.len = C.size_t(len(dir)) + defer C.free(unsafe.Pointer(dir_ms.data)) + var _ms C.struct_miqt_string = C.QFileDialog_GetSaveFileName3(parent.cPointer(), caption_ms, dir_ms) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QFileDialog_GetSaveFileName4(parent *QWidget, caption string, dir string, filter string) string { - caption_ms := libmiqt.Strdupg(caption) - defer C.free(caption_ms) - dir_ms := libmiqt.Strdupg(dir) - defer C.free(dir_ms) - filter_ms := libmiqt.Strdupg(filter) - defer C.free(filter_ms) - var _ms *C.struct_miqt_string = C.QFileDialog_GetSaveFileName4(parent.cPointer(), (*C.struct_miqt_string)(caption_ms), (*C.struct_miqt_string)(dir_ms), (*C.struct_miqt_string)(filter_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + caption_ms := C.struct_miqt_string{} + caption_ms.data = C.CString(caption) + caption_ms.len = C.size_t(len(caption)) + defer C.free(unsafe.Pointer(caption_ms.data)) + dir_ms := C.struct_miqt_string{} + dir_ms.data = C.CString(dir) + dir_ms.len = C.size_t(len(dir)) + defer C.free(unsafe.Pointer(dir_ms.data)) + filter_ms := C.struct_miqt_string{} + filter_ms.data = C.CString(filter) + filter_ms.len = C.size_t(len(filter)) + defer C.free(unsafe.Pointer(filter_ms.data)) + var _ms C.struct_miqt_string = C.QFileDialog_GetSaveFileName4(parent.cPointer(), caption_ms, dir_ms, filter_ms) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -1033,69 +1114,87 @@ func QFileDialog_GetSaveFileUrl1(parent *QWidget) *QUrl { } func QFileDialog_GetSaveFileUrl2(parent *QWidget, caption string) *QUrl { - caption_ms := libmiqt.Strdupg(caption) - defer C.free(caption_ms) - _ret := C.QFileDialog_GetSaveFileUrl2(parent.cPointer(), (*C.struct_miqt_string)(caption_ms)) + caption_ms := C.struct_miqt_string{} + caption_ms.data = C.CString(caption) + caption_ms.len = C.size_t(len(caption)) + defer C.free(unsafe.Pointer(caption_ms.data)) + _ret := C.QFileDialog_GetSaveFileUrl2(parent.cPointer(), caption_ms) _goptr := newQUrl(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func QFileDialog_GetSaveFileUrl3(parent *QWidget, caption string, dir *QUrl) *QUrl { - caption_ms := libmiqt.Strdupg(caption) - defer C.free(caption_ms) - _ret := C.QFileDialog_GetSaveFileUrl3(parent.cPointer(), (*C.struct_miqt_string)(caption_ms), dir.cPointer()) + caption_ms := C.struct_miqt_string{} + caption_ms.data = C.CString(caption) + caption_ms.len = C.size_t(len(caption)) + defer C.free(unsafe.Pointer(caption_ms.data)) + _ret := C.QFileDialog_GetSaveFileUrl3(parent.cPointer(), caption_ms, dir.cPointer()) _goptr := newQUrl(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func QFileDialog_GetSaveFileUrl4(parent *QWidget, caption string, dir *QUrl, filter string) *QUrl { - caption_ms := libmiqt.Strdupg(caption) - defer C.free(caption_ms) - filter_ms := libmiqt.Strdupg(filter) - defer C.free(filter_ms) - _ret := C.QFileDialog_GetSaveFileUrl4(parent.cPointer(), (*C.struct_miqt_string)(caption_ms), dir.cPointer(), (*C.struct_miqt_string)(filter_ms)) + caption_ms := C.struct_miqt_string{} + caption_ms.data = C.CString(caption) + caption_ms.len = C.size_t(len(caption)) + defer C.free(unsafe.Pointer(caption_ms.data)) + filter_ms := C.struct_miqt_string{} + filter_ms.data = C.CString(filter) + filter_ms.len = C.size_t(len(filter)) + defer C.free(unsafe.Pointer(filter_ms.data)) + _ret := C.QFileDialog_GetSaveFileUrl4(parent.cPointer(), caption_ms, dir.cPointer(), filter_ms) _goptr := newQUrl(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func QFileDialog_GetExistingDirectory1(parent *QWidget) string { - var _ms *C.struct_miqt_string = C.QFileDialog_GetExistingDirectory1(parent.cPointer()) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFileDialog_GetExistingDirectory1(parent.cPointer()) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QFileDialog_GetExistingDirectory2(parent *QWidget, caption string) string { - caption_ms := libmiqt.Strdupg(caption) - defer C.free(caption_ms) - var _ms *C.struct_miqt_string = C.QFileDialog_GetExistingDirectory2(parent.cPointer(), (*C.struct_miqt_string)(caption_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + caption_ms := C.struct_miqt_string{} + caption_ms.data = C.CString(caption) + caption_ms.len = C.size_t(len(caption)) + defer C.free(unsafe.Pointer(caption_ms.data)) + var _ms C.struct_miqt_string = C.QFileDialog_GetExistingDirectory2(parent.cPointer(), caption_ms) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QFileDialog_GetExistingDirectory3(parent *QWidget, caption string, dir string) string { - caption_ms := libmiqt.Strdupg(caption) - defer C.free(caption_ms) - dir_ms := libmiqt.Strdupg(dir) - defer C.free(dir_ms) - var _ms *C.struct_miqt_string = C.QFileDialog_GetExistingDirectory3(parent.cPointer(), (*C.struct_miqt_string)(caption_ms), (*C.struct_miqt_string)(dir_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + caption_ms := C.struct_miqt_string{} + caption_ms.data = C.CString(caption) + caption_ms.len = C.size_t(len(caption)) + defer C.free(unsafe.Pointer(caption_ms.data)) + dir_ms := C.struct_miqt_string{} + dir_ms.data = C.CString(dir) + dir_ms.len = C.size_t(len(dir)) + defer C.free(unsafe.Pointer(dir_ms.data)) + var _ms C.struct_miqt_string = C.QFileDialog_GetExistingDirectory3(parent.cPointer(), caption_ms, dir_ms) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QFileDialog_GetExistingDirectory4(parent *QWidget, caption string, dir string, options QFileDialog__Option) string { - caption_ms := libmiqt.Strdupg(caption) - defer C.free(caption_ms) - dir_ms := libmiqt.Strdupg(dir) - defer C.free(dir_ms) - var _ms *C.struct_miqt_string = C.QFileDialog_GetExistingDirectory4(parent.cPointer(), (*C.struct_miqt_string)(caption_ms), (*C.struct_miqt_string)(dir_ms), (C.int)(options)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + caption_ms := C.struct_miqt_string{} + caption_ms.data = C.CString(caption) + caption_ms.len = C.size_t(len(caption)) + defer C.free(unsafe.Pointer(caption_ms.data)) + dir_ms := C.struct_miqt_string{} + dir_ms.data = C.CString(dir) + dir_ms.len = C.size_t(len(dir)) + defer C.free(unsafe.Pointer(dir_ms.data)) + var _ms C.struct_miqt_string = C.QFileDialog_GetExistingDirectory4(parent.cPointer(), caption_ms, dir_ms, (C.int)(options)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -1107,46 +1206,56 @@ func QFileDialog_GetExistingDirectoryUrl1(parent *QWidget) *QUrl { } func QFileDialog_GetExistingDirectoryUrl2(parent *QWidget, caption string) *QUrl { - caption_ms := libmiqt.Strdupg(caption) - defer C.free(caption_ms) - _ret := C.QFileDialog_GetExistingDirectoryUrl2(parent.cPointer(), (*C.struct_miqt_string)(caption_ms)) + caption_ms := C.struct_miqt_string{} + caption_ms.data = C.CString(caption) + caption_ms.len = C.size_t(len(caption)) + defer C.free(unsafe.Pointer(caption_ms.data)) + _ret := C.QFileDialog_GetExistingDirectoryUrl2(parent.cPointer(), caption_ms) _goptr := newQUrl(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func QFileDialog_GetExistingDirectoryUrl3(parent *QWidget, caption string, dir *QUrl) *QUrl { - caption_ms := libmiqt.Strdupg(caption) - defer C.free(caption_ms) - _ret := C.QFileDialog_GetExistingDirectoryUrl3(parent.cPointer(), (*C.struct_miqt_string)(caption_ms), dir.cPointer()) + caption_ms := C.struct_miqt_string{} + caption_ms.data = C.CString(caption) + caption_ms.len = C.size_t(len(caption)) + defer C.free(unsafe.Pointer(caption_ms.data)) + _ret := C.QFileDialog_GetExistingDirectoryUrl3(parent.cPointer(), caption_ms, dir.cPointer()) _goptr := newQUrl(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func QFileDialog_GetExistingDirectoryUrl4(parent *QWidget, caption string, dir *QUrl, options QFileDialog__Option) *QUrl { - caption_ms := libmiqt.Strdupg(caption) - defer C.free(caption_ms) - _ret := C.QFileDialog_GetExistingDirectoryUrl4(parent.cPointer(), (*C.struct_miqt_string)(caption_ms), dir.cPointer(), (C.int)(options)) + caption_ms := C.struct_miqt_string{} + caption_ms.data = C.CString(caption) + caption_ms.len = C.size_t(len(caption)) + defer C.free(unsafe.Pointer(caption_ms.data)) + _ret := C.QFileDialog_GetExistingDirectoryUrl4(parent.cPointer(), caption_ms, dir.cPointer(), (C.int)(options)) _goptr := newQUrl(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func QFileDialog_GetExistingDirectoryUrl5(parent *QWidget, caption string, dir *QUrl, options QFileDialog__Option, supportedSchemes []string) *QUrl { - caption_ms := libmiqt.Strdupg(caption) - defer C.free(caption_ms) + caption_ms := C.struct_miqt_string{} + caption_ms.data = C.CString(caption) + caption_ms.len = C.size_t(len(caption)) + defer C.free(unsafe.Pointer(caption_ms.data)) // For the C ABI, malloc a C array of raw pointers - supportedSchemes_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(supportedSchemes)))) + supportedSchemes_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(supportedSchemes)))) defer C.free(unsafe.Pointer(supportedSchemes_CArray)) for i := range supportedSchemes { - supportedSchemes_i_ms := libmiqt.Strdupg(supportedSchemes[i]) - defer C.free(supportedSchemes_i_ms) - supportedSchemes_CArray[i] = (*C.struct_miqt_string)(supportedSchemes_i_ms) + supportedSchemes_i_ms := C.struct_miqt_string{} + supportedSchemes_i_ms.data = C.CString(supportedSchemes[i]) + supportedSchemes_i_ms.len = C.size_t(len(supportedSchemes[i])) + defer C.free(unsafe.Pointer(supportedSchemes_i_ms.data)) + supportedSchemes_CArray[i] = supportedSchemes_i_ms } supportedSchemes_ma := &C.struct_miqt_array{len: C.size_t(len(supportedSchemes)), data: unsafe.Pointer(supportedSchemes_CArray)} defer runtime.KeepAlive(unsafe.Pointer(supportedSchemes_ma)) - _ret := C.QFileDialog_GetExistingDirectoryUrl5(parent.cPointer(), (*C.struct_miqt_string)(caption_ms), dir.cPointer(), (C.int)(options), supportedSchemes_ma) + _ret := C.QFileDialog_GetExistingDirectoryUrl5(parent.cPointer(), caption_ms, dir.cPointer(), (C.int)(options), supportedSchemes_ma) _goptr := newQUrl(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -1155,11 +1264,11 @@ func QFileDialog_GetExistingDirectoryUrl5(parent *QWidget, caption string, dir * func QFileDialog_GetOpenFileNames1(parent *QWidget) []string { var _ma *C.struct_miqt_array = C.QFileDialog_GetOpenFileNames1(parent.cPointer()) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -1167,15 +1276,17 @@ func QFileDialog_GetOpenFileNames1(parent *QWidget) []string { } func QFileDialog_GetOpenFileNames2(parent *QWidget, caption string) []string { - caption_ms := libmiqt.Strdupg(caption) - defer C.free(caption_ms) - var _ma *C.struct_miqt_array = C.QFileDialog_GetOpenFileNames2(parent.cPointer(), (*C.struct_miqt_string)(caption_ms)) + caption_ms := C.struct_miqt_string{} + caption_ms.data = C.CString(caption) + caption_ms.len = C.size_t(len(caption)) + defer C.free(unsafe.Pointer(caption_ms.data)) + var _ma *C.struct_miqt_array = C.QFileDialog_GetOpenFileNames2(parent.cPointer(), caption_ms) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -1183,17 +1294,21 @@ func QFileDialog_GetOpenFileNames2(parent *QWidget, caption string) []string { } func QFileDialog_GetOpenFileNames3(parent *QWidget, caption string, dir string) []string { - caption_ms := libmiqt.Strdupg(caption) - defer C.free(caption_ms) - dir_ms := libmiqt.Strdupg(dir) - defer C.free(dir_ms) - var _ma *C.struct_miqt_array = C.QFileDialog_GetOpenFileNames3(parent.cPointer(), (*C.struct_miqt_string)(caption_ms), (*C.struct_miqt_string)(dir_ms)) + caption_ms := C.struct_miqt_string{} + caption_ms.data = C.CString(caption) + caption_ms.len = C.size_t(len(caption)) + defer C.free(unsafe.Pointer(caption_ms.data)) + dir_ms := C.struct_miqt_string{} + dir_ms.data = C.CString(dir) + dir_ms.len = C.size_t(len(dir)) + defer C.free(unsafe.Pointer(dir_ms.data)) + var _ma *C.struct_miqt_array = C.QFileDialog_GetOpenFileNames3(parent.cPointer(), caption_ms, dir_ms) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -1201,19 +1316,25 @@ func QFileDialog_GetOpenFileNames3(parent *QWidget, caption string, dir string) } func QFileDialog_GetOpenFileNames4(parent *QWidget, caption string, dir string, filter string) []string { - caption_ms := libmiqt.Strdupg(caption) - defer C.free(caption_ms) - dir_ms := libmiqt.Strdupg(dir) - defer C.free(dir_ms) - filter_ms := libmiqt.Strdupg(filter) - defer C.free(filter_ms) - var _ma *C.struct_miqt_array = C.QFileDialog_GetOpenFileNames4(parent.cPointer(), (*C.struct_miqt_string)(caption_ms), (*C.struct_miqt_string)(dir_ms), (*C.struct_miqt_string)(filter_ms)) + caption_ms := C.struct_miqt_string{} + caption_ms.data = C.CString(caption) + caption_ms.len = C.size_t(len(caption)) + defer C.free(unsafe.Pointer(caption_ms.data)) + dir_ms := C.struct_miqt_string{} + dir_ms.data = C.CString(dir) + dir_ms.len = C.size_t(len(dir)) + defer C.free(unsafe.Pointer(dir_ms.data)) + filter_ms := C.struct_miqt_string{} + filter_ms.data = C.CString(filter) + filter_ms.len = C.size_t(len(filter)) + defer C.free(unsafe.Pointer(filter_ms.data)) + var _ma *C.struct_miqt_array = C.QFileDialog_GetOpenFileNames4(parent.cPointer(), caption_ms, dir_ms, filter_ms) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -1235,9 +1356,11 @@ func QFileDialog_GetOpenFileUrls1(parent *QWidget) []QUrl { } func QFileDialog_GetOpenFileUrls2(parent *QWidget, caption string) []QUrl { - caption_ms := libmiqt.Strdupg(caption) - defer C.free(caption_ms) - var _ma *C.struct_miqt_array = C.QFileDialog_GetOpenFileUrls2(parent.cPointer(), (*C.struct_miqt_string)(caption_ms)) + caption_ms := C.struct_miqt_string{} + caption_ms.data = C.CString(caption) + caption_ms.len = C.size_t(len(caption)) + defer C.free(unsafe.Pointer(caption_ms.data)) + var _ma *C.struct_miqt_array = C.QFileDialog_GetOpenFileUrls2(parent.cPointer(), caption_ms) _ret := make([]QUrl, int(_ma.len)) _outCast := (*[0xffff]*C.QUrl)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -1251,9 +1374,11 @@ func QFileDialog_GetOpenFileUrls2(parent *QWidget, caption string) []QUrl { } func QFileDialog_GetOpenFileUrls3(parent *QWidget, caption string, dir *QUrl) []QUrl { - caption_ms := libmiqt.Strdupg(caption) - defer C.free(caption_ms) - var _ma *C.struct_miqt_array = C.QFileDialog_GetOpenFileUrls3(parent.cPointer(), (*C.struct_miqt_string)(caption_ms), dir.cPointer()) + caption_ms := C.struct_miqt_string{} + caption_ms.data = C.CString(caption) + caption_ms.len = C.size_t(len(caption)) + defer C.free(unsafe.Pointer(caption_ms.data)) + var _ma *C.struct_miqt_array = C.QFileDialog_GetOpenFileUrls3(parent.cPointer(), caption_ms, dir.cPointer()) _ret := make([]QUrl, int(_ma.len)) _outCast := (*[0xffff]*C.QUrl)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -1267,11 +1392,15 @@ func QFileDialog_GetOpenFileUrls3(parent *QWidget, caption string, dir *QUrl) [] } func QFileDialog_GetOpenFileUrls4(parent *QWidget, caption string, dir *QUrl, filter string) []QUrl { - caption_ms := libmiqt.Strdupg(caption) - defer C.free(caption_ms) - filter_ms := libmiqt.Strdupg(filter) - defer C.free(filter_ms) - var _ma *C.struct_miqt_array = C.QFileDialog_GetOpenFileUrls4(parent.cPointer(), (*C.struct_miqt_string)(caption_ms), dir.cPointer(), (*C.struct_miqt_string)(filter_ms)) + caption_ms := C.struct_miqt_string{} + caption_ms.data = C.CString(caption) + caption_ms.len = C.size_t(len(caption)) + defer C.free(unsafe.Pointer(caption_ms.data)) + filter_ms := C.struct_miqt_string{} + filter_ms.data = C.CString(filter) + filter_ms.len = C.size_t(len(filter)) + defer C.free(unsafe.Pointer(filter_ms.data)) + var _ma *C.struct_miqt_array = C.QFileDialog_GetOpenFileUrls4(parent.cPointer(), caption_ms, dir.cPointer(), filter_ms) _ret := make([]QUrl, int(_ma.len)) _outCast := (*[0xffff]*C.QUrl)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -1284,10 +1413,15 @@ func QFileDialog_GetOpenFileUrls4(parent *QWidget, caption string, dir *QUrl, fi return _ret } -func QFileDialog_SaveFileContent2(fileContent *QByteArray, fileNameHint string) { - fileNameHint_ms := libmiqt.Strdupg(fileNameHint) - defer C.free(fileNameHint_ms) - C.QFileDialog_SaveFileContent2(fileContent.cPointer(), (*C.struct_miqt_string)(fileNameHint_ms)) +func QFileDialog_SaveFileContent2(fileContent []byte, fileNameHint string) { + fileContent_alias := C.struct_miqt_string{} + fileContent_alias.data = (*C.char)(unsafe.Pointer(&fileContent[0])) + fileContent_alias.len = C.size_t(len(fileContent)) + fileNameHint_ms := C.struct_miqt_string{} + fileNameHint_ms.data = C.CString(fileNameHint) + fileNameHint_ms.len = C.size_t(len(fileNameHint)) + defer C.free(unsafe.Pointer(fileNameHint_ms.data)) + C.QFileDialog_SaveFileContent2(fileContent_alias, fileNameHint_ms) } // Delete this object from C++ memory. diff --git a/qt/gen_qfiledialog.h b/qt/gen_qfiledialog.h index 25f021e0..5392fa12 100644 --- a/qt/gen_qfiledialog.h +++ b/qt/gen_qfiledialog.h @@ -38,33 +38,33 @@ typedef struct QWidget QWidget; QFileDialog* QFileDialog_new(QWidget* parent, int f); QFileDialog* QFileDialog_new2(); QFileDialog* QFileDialog_new3(QWidget* parent); -QFileDialog* QFileDialog_new4(QWidget* parent, struct miqt_string* caption); -QFileDialog* QFileDialog_new5(QWidget* parent, struct miqt_string* caption, struct miqt_string* directory); -QFileDialog* QFileDialog_new6(QWidget* parent, struct miqt_string* caption, struct miqt_string* directory, struct miqt_string* filter); +QFileDialog* QFileDialog_new4(QWidget* parent, struct miqt_string caption); +QFileDialog* QFileDialog_new5(QWidget* parent, struct miqt_string caption, struct miqt_string directory); +QFileDialog* QFileDialog_new6(QWidget* parent, struct miqt_string caption, struct miqt_string directory, struct miqt_string filter); QMetaObject* QFileDialog_MetaObject(const QFileDialog* self); void* QFileDialog_Metacast(QFileDialog* self, const char* param1); -struct miqt_string* QFileDialog_Tr(const char* s); -struct miqt_string* QFileDialog_TrUtf8(const char* s); -void QFileDialog_SetDirectory(QFileDialog* self, struct miqt_string* directory); +struct miqt_string QFileDialog_Tr(const char* s); +struct miqt_string QFileDialog_TrUtf8(const char* s); +void QFileDialog_SetDirectory(QFileDialog* self, struct miqt_string directory); void QFileDialog_SetDirectoryWithDirectory(QFileDialog* self, QDir* directory); QDir* QFileDialog_Directory(const QFileDialog* self); void QFileDialog_SetDirectoryUrl(QFileDialog* self, QUrl* directory); QUrl* QFileDialog_DirectoryUrl(const QFileDialog* self); -void QFileDialog_SelectFile(QFileDialog* self, struct miqt_string* filename); +void QFileDialog_SelectFile(QFileDialog* self, struct miqt_string filename); struct miqt_array* QFileDialog_SelectedFiles(const QFileDialog* self); void QFileDialog_SelectUrl(QFileDialog* self, QUrl* url); struct miqt_array* QFileDialog_SelectedUrls(const QFileDialog* self); void QFileDialog_SetNameFilterDetailsVisible(QFileDialog* self, bool enabled); bool QFileDialog_IsNameFilterDetailsVisible(const QFileDialog* self); -void QFileDialog_SetNameFilter(QFileDialog* self, struct miqt_string* filter); -void QFileDialog_SetNameFilters(QFileDialog* self, struct miqt_array* /* of struct miqt_string* */ filters); +void QFileDialog_SetNameFilter(QFileDialog* self, struct miqt_string filter); +void QFileDialog_SetNameFilters(QFileDialog* self, struct miqt_array* /* of struct miqt_string */ filters); struct miqt_array* QFileDialog_NameFilters(const QFileDialog* self); -void QFileDialog_SelectNameFilter(QFileDialog* self, struct miqt_string* filter); -struct miqt_string* QFileDialog_SelectedMimeTypeFilter(const QFileDialog* self); -struct miqt_string* QFileDialog_SelectedNameFilter(const QFileDialog* self); -void QFileDialog_SetMimeTypeFilters(QFileDialog* self, struct miqt_array* /* of struct miqt_string* */ filters); +void QFileDialog_SelectNameFilter(QFileDialog* self, struct miqt_string filter); +struct miqt_string QFileDialog_SelectedMimeTypeFilter(const QFileDialog* self); +struct miqt_string QFileDialog_SelectedNameFilter(const QFileDialog* self); +void QFileDialog_SetMimeTypeFilters(QFileDialog* self, struct miqt_array* /* of struct miqt_string */ filters); struct miqt_array* QFileDialog_MimeTypeFilters(const QFileDialog* self); -void QFileDialog_SelectMimeTypeFilter(QFileDialog* self, struct miqt_string* filter); +void QFileDialog_SelectMimeTypeFilter(QFileDialog* self, struct miqt_string filter); int QFileDialog_Filter(const QFileDialog* self); void QFileDialog_SetFilter(QFileDialog* self, int filters); void QFileDialog_SetViewMode(QFileDialog* self, int mode); @@ -79,21 +79,21 @@ void QFileDialog_SetResolveSymlinks(QFileDialog* self, bool enabled); bool QFileDialog_ResolveSymlinks(const QFileDialog* self); void QFileDialog_SetSidebarUrls(QFileDialog* self, struct miqt_array* /* of QUrl* */ urls); struct miqt_array* QFileDialog_SidebarUrls(const QFileDialog* self); -QByteArray* QFileDialog_SaveState(const QFileDialog* self); -bool QFileDialog_RestoreState(QFileDialog* self, QByteArray* state); +struct miqt_string QFileDialog_SaveState(const QFileDialog* self); +bool QFileDialog_RestoreState(QFileDialog* self, struct miqt_string state); void QFileDialog_SetConfirmOverwrite(QFileDialog* self, bool enabled); bool QFileDialog_ConfirmOverwrite(const QFileDialog* self); -void QFileDialog_SetDefaultSuffix(QFileDialog* self, struct miqt_string* suffix); -struct miqt_string* QFileDialog_DefaultSuffix(const QFileDialog* self); -void QFileDialog_SetHistory(QFileDialog* self, struct miqt_array* /* of struct miqt_string* */ paths); +void QFileDialog_SetDefaultSuffix(QFileDialog* self, struct miqt_string suffix); +struct miqt_string QFileDialog_DefaultSuffix(const QFileDialog* self); +void QFileDialog_SetHistory(QFileDialog* self, struct miqt_array* /* of struct miqt_string */ paths); struct miqt_array* QFileDialog_History(const QFileDialog* self); void QFileDialog_SetItemDelegate(QFileDialog* self, QAbstractItemDelegate* delegate); QAbstractItemDelegate* QFileDialog_ItemDelegate(const QFileDialog* self); void QFileDialog_SetIconProvider(QFileDialog* self, QFileIconProvider* provider); QFileIconProvider* QFileDialog_IconProvider(const QFileDialog* self); -void QFileDialog_SetLabelText(QFileDialog* self, int label, struct miqt_string* text); -struct miqt_string* QFileDialog_LabelText(const QFileDialog* self, int label); -void QFileDialog_SetSupportedSchemes(QFileDialog* self, struct miqt_array* /* of struct miqt_string* */ schemes); +void QFileDialog_SetLabelText(QFileDialog* self, int label, struct miqt_string text); +struct miqt_string QFileDialog_LabelText(const QFileDialog* self, int label); +void QFileDialog_SetSupportedSchemes(QFileDialog* self, struct miqt_array* /* of struct miqt_string */ schemes); struct miqt_array* QFileDialog_SupportedSchemes(const QFileDialog* self); void QFileDialog_SetProxyModel(QFileDialog* self, QAbstractProxyModel* model); QAbstractProxyModel* QFileDialog_ProxyModel(const QFileDialog* self); @@ -102,13 +102,13 @@ bool QFileDialog_TestOption(const QFileDialog* self, int option); void QFileDialog_SetOptions(QFileDialog* self, int options); int QFileDialog_Options(const QFileDialog* self); void QFileDialog_SetVisible(QFileDialog* self, bool visible); -void QFileDialog_FileSelected(QFileDialog* self, struct miqt_string* file); +void QFileDialog_FileSelected(QFileDialog* self, struct miqt_string file); void QFileDialog_connect_FileSelected(QFileDialog* self, intptr_t slot); -void QFileDialog_FilesSelected(QFileDialog* self, struct miqt_array* /* of struct miqt_string* */ files); +void QFileDialog_FilesSelected(QFileDialog* self, struct miqt_array* /* of struct miqt_string */ files); void QFileDialog_connect_FilesSelected(QFileDialog* self, intptr_t slot); -void QFileDialog_CurrentChanged(QFileDialog* self, struct miqt_string* path); +void QFileDialog_CurrentChanged(QFileDialog* self, struct miqt_string path); void QFileDialog_connect_CurrentChanged(QFileDialog* self, intptr_t slot); -void QFileDialog_DirectoryEntered(QFileDialog* self, struct miqt_string* directory); +void QFileDialog_DirectoryEntered(QFileDialog* self, struct miqt_string directory); void QFileDialog_connect_DirectoryEntered(QFileDialog* self, intptr_t slot); void QFileDialog_UrlSelected(QFileDialog* self, QUrl* url); void QFileDialog_connect_UrlSelected(QFileDialog* self, intptr_t slot); @@ -118,56 +118,56 @@ void QFileDialog_CurrentUrlChanged(QFileDialog* self, QUrl* url); void QFileDialog_connect_CurrentUrlChanged(QFileDialog* self, intptr_t slot); void QFileDialog_DirectoryUrlEntered(QFileDialog* self, QUrl* directory); void QFileDialog_connect_DirectoryUrlEntered(QFileDialog* self, intptr_t slot); -void QFileDialog_FilterSelected(QFileDialog* self, struct miqt_string* filter); +void QFileDialog_FilterSelected(QFileDialog* self, struct miqt_string filter); void QFileDialog_connect_FilterSelected(QFileDialog* self, intptr_t slot); -struct miqt_string* QFileDialog_GetOpenFileName(); +struct miqt_string QFileDialog_GetOpenFileName(); QUrl* QFileDialog_GetOpenFileUrl(); -struct miqt_string* QFileDialog_GetSaveFileName(); +struct miqt_string QFileDialog_GetSaveFileName(); QUrl* QFileDialog_GetSaveFileUrl(); -struct miqt_string* QFileDialog_GetExistingDirectory(); +struct miqt_string QFileDialog_GetExistingDirectory(); QUrl* QFileDialog_GetExistingDirectoryUrl(); struct miqt_array* QFileDialog_GetOpenFileNames(); struct miqt_array* QFileDialog_GetOpenFileUrls(); -void QFileDialog_SaveFileContent(QByteArray* fileContent); -struct miqt_string* QFileDialog_Tr2(const char* s, const char* c); -struct miqt_string* QFileDialog_Tr3(const char* s, const char* c, int n); -struct miqt_string* QFileDialog_TrUtf82(const char* s, const char* c); -struct miqt_string* QFileDialog_TrUtf83(const char* s, const char* c, int n); +void QFileDialog_SaveFileContent(struct miqt_string fileContent); +struct miqt_string QFileDialog_Tr2(const char* s, const char* c); +struct miqt_string QFileDialog_Tr3(const char* s, const char* c, int n); +struct miqt_string QFileDialog_TrUtf82(const char* s, const char* c); +struct miqt_string QFileDialog_TrUtf83(const char* s, const char* c, int n); void QFileDialog_SetOption2(QFileDialog* self, int option, bool on); -struct miqt_string* QFileDialog_GetOpenFileName1(QWidget* parent); -struct miqt_string* QFileDialog_GetOpenFileName2(QWidget* parent, struct miqt_string* caption); -struct miqt_string* QFileDialog_GetOpenFileName3(QWidget* parent, struct miqt_string* caption, struct miqt_string* dir); -struct miqt_string* QFileDialog_GetOpenFileName4(QWidget* parent, struct miqt_string* caption, struct miqt_string* dir, struct miqt_string* filter); +struct miqt_string QFileDialog_GetOpenFileName1(QWidget* parent); +struct miqt_string QFileDialog_GetOpenFileName2(QWidget* parent, struct miqt_string caption); +struct miqt_string QFileDialog_GetOpenFileName3(QWidget* parent, struct miqt_string caption, struct miqt_string dir); +struct miqt_string QFileDialog_GetOpenFileName4(QWidget* parent, struct miqt_string caption, struct miqt_string dir, struct miqt_string filter); QUrl* QFileDialog_GetOpenFileUrl1(QWidget* parent); -QUrl* QFileDialog_GetOpenFileUrl2(QWidget* parent, struct miqt_string* caption); -QUrl* QFileDialog_GetOpenFileUrl3(QWidget* parent, struct miqt_string* caption, QUrl* dir); -QUrl* QFileDialog_GetOpenFileUrl4(QWidget* parent, struct miqt_string* caption, QUrl* dir, struct miqt_string* filter); -struct miqt_string* QFileDialog_GetSaveFileName1(QWidget* parent); -struct miqt_string* QFileDialog_GetSaveFileName2(QWidget* parent, struct miqt_string* caption); -struct miqt_string* QFileDialog_GetSaveFileName3(QWidget* parent, struct miqt_string* caption, struct miqt_string* dir); -struct miqt_string* QFileDialog_GetSaveFileName4(QWidget* parent, struct miqt_string* caption, struct miqt_string* dir, struct miqt_string* filter); +QUrl* QFileDialog_GetOpenFileUrl2(QWidget* parent, struct miqt_string caption); +QUrl* QFileDialog_GetOpenFileUrl3(QWidget* parent, struct miqt_string caption, QUrl* dir); +QUrl* QFileDialog_GetOpenFileUrl4(QWidget* parent, struct miqt_string caption, QUrl* dir, struct miqt_string filter); +struct miqt_string QFileDialog_GetSaveFileName1(QWidget* parent); +struct miqt_string QFileDialog_GetSaveFileName2(QWidget* parent, struct miqt_string caption); +struct miqt_string QFileDialog_GetSaveFileName3(QWidget* parent, struct miqt_string caption, struct miqt_string dir); +struct miqt_string QFileDialog_GetSaveFileName4(QWidget* parent, struct miqt_string caption, struct miqt_string dir, struct miqt_string filter); QUrl* QFileDialog_GetSaveFileUrl1(QWidget* parent); -QUrl* QFileDialog_GetSaveFileUrl2(QWidget* parent, struct miqt_string* caption); -QUrl* QFileDialog_GetSaveFileUrl3(QWidget* parent, struct miqt_string* caption, QUrl* dir); -QUrl* QFileDialog_GetSaveFileUrl4(QWidget* parent, struct miqt_string* caption, QUrl* dir, struct miqt_string* filter); -struct miqt_string* QFileDialog_GetExistingDirectory1(QWidget* parent); -struct miqt_string* QFileDialog_GetExistingDirectory2(QWidget* parent, struct miqt_string* caption); -struct miqt_string* QFileDialog_GetExistingDirectory3(QWidget* parent, struct miqt_string* caption, struct miqt_string* dir); -struct miqt_string* QFileDialog_GetExistingDirectory4(QWidget* parent, struct miqt_string* caption, struct miqt_string* dir, int options); +QUrl* QFileDialog_GetSaveFileUrl2(QWidget* parent, struct miqt_string caption); +QUrl* QFileDialog_GetSaveFileUrl3(QWidget* parent, struct miqt_string caption, QUrl* dir); +QUrl* QFileDialog_GetSaveFileUrl4(QWidget* parent, struct miqt_string caption, QUrl* dir, struct miqt_string filter); +struct miqt_string QFileDialog_GetExistingDirectory1(QWidget* parent); +struct miqt_string QFileDialog_GetExistingDirectory2(QWidget* parent, struct miqt_string caption); +struct miqt_string QFileDialog_GetExistingDirectory3(QWidget* parent, struct miqt_string caption, struct miqt_string dir); +struct miqt_string QFileDialog_GetExistingDirectory4(QWidget* parent, struct miqt_string caption, struct miqt_string dir, int options); QUrl* QFileDialog_GetExistingDirectoryUrl1(QWidget* parent); -QUrl* QFileDialog_GetExistingDirectoryUrl2(QWidget* parent, struct miqt_string* caption); -QUrl* QFileDialog_GetExistingDirectoryUrl3(QWidget* parent, struct miqt_string* caption, QUrl* dir); -QUrl* QFileDialog_GetExistingDirectoryUrl4(QWidget* parent, struct miqt_string* caption, QUrl* dir, int options); -QUrl* QFileDialog_GetExistingDirectoryUrl5(QWidget* parent, struct miqt_string* caption, QUrl* dir, int options, struct miqt_array* /* of struct miqt_string* */ supportedSchemes); +QUrl* QFileDialog_GetExistingDirectoryUrl2(QWidget* parent, struct miqt_string caption); +QUrl* QFileDialog_GetExistingDirectoryUrl3(QWidget* parent, struct miqt_string caption, QUrl* dir); +QUrl* QFileDialog_GetExistingDirectoryUrl4(QWidget* parent, struct miqt_string caption, QUrl* dir, int options); +QUrl* QFileDialog_GetExistingDirectoryUrl5(QWidget* parent, struct miqt_string caption, QUrl* dir, int options, struct miqt_array* /* of struct miqt_string */ supportedSchemes); struct miqt_array* QFileDialog_GetOpenFileNames1(QWidget* parent); -struct miqt_array* QFileDialog_GetOpenFileNames2(QWidget* parent, struct miqt_string* caption); -struct miqt_array* QFileDialog_GetOpenFileNames3(QWidget* parent, struct miqt_string* caption, struct miqt_string* dir); -struct miqt_array* QFileDialog_GetOpenFileNames4(QWidget* parent, struct miqt_string* caption, struct miqt_string* dir, struct miqt_string* filter); +struct miqt_array* QFileDialog_GetOpenFileNames2(QWidget* parent, struct miqt_string caption); +struct miqt_array* QFileDialog_GetOpenFileNames3(QWidget* parent, struct miqt_string caption, struct miqt_string dir); +struct miqt_array* QFileDialog_GetOpenFileNames4(QWidget* parent, struct miqt_string caption, struct miqt_string dir, struct miqt_string filter); struct miqt_array* QFileDialog_GetOpenFileUrls1(QWidget* parent); -struct miqt_array* QFileDialog_GetOpenFileUrls2(QWidget* parent, struct miqt_string* caption); -struct miqt_array* QFileDialog_GetOpenFileUrls3(QWidget* parent, struct miqt_string* caption, QUrl* dir); -struct miqt_array* QFileDialog_GetOpenFileUrls4(QWidget* parent, struct miqt_string* caption, QUrl* dir, struct miqt_string* filter); -void QFileDialog_SaveFileContent2(QByteArray* fileContent, struct miqt_string* fileNameHint); +struct miqt_array* QFileDialog_GetOpenFileUrls2(QWidget* parent, struct miqt_string caption); +struct miqt_array* QFileDialog_GetOpenFileUrls3(QWidget* parent, struct miqt_string caption, QUrl* dir); +struct miqt_array* QFileDialog_GetOpenFileUrls4(QWidget* parent, struct miqt_string caption, QUrl* dir, struct miqt_string filter); +void QFileDialog_SaveFileContent2(struct miqt_string fileContent, struct miqt_string fileNameHint); void QFileDialog_Delete(QFileDialog* self); #ifdef __cplusplus diff --git a/qt/gen_qfileiconprovider.cpp b/qt/gen_qfileiconprovider.cpp index 11a39ab8..3231b805 100644 --- a/qt/gen_qfileiconprovider.cpp +++ b/qt/gen_qfileiconprovider.cpp @@ -20,11 +20,15 @@ QIcon* QFileIconProvider_IconWithInfo(const QFileIconProvider* self, QFileInfo* return new QIcon(self->icon(*info)); } -struct miqt_string* QFileIconProvider_Type(const QFileIconProvider* self, QFileInfo* info) { +struct miqt_string QFileIconProvider_Type(const QFileIconProvider* self, QFileInfo* info) { QString _ret = self->type(*info); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QFileIconProvider_SetOptions(QFileIconProvider* self, int options) { diff --git a/qt/gen_qfileiconprovider.go b/qt/gen_qfileiconprovider.go index bda88382..a8456485 100644 --- a/qt/gen_qfileiconprovider.go +++ b/qt/gen_qfileiconprovider.go @@ -81,9 +81,9 @@ func (this *QFileIconProvider) IconWithInfo(info *QFileInfo) *QIcon { } func (this *QFileIconProvider) Type(info *QFileInfo) string { - var _ms *C.struct_miqt_string = C.QFileIconProvider_Type(this.h, info.cPointer()) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFileIconProvider_Type(this.h, info.cPointer()) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qfileiconprovider.h b/qt/gen_qfileiconprovider.h index e504c176..12b89ab7 100644 --- a/qt/gen_qfileiconprovider.h +++ b/qt/gen_qfileiconprovider.h @@ -26,7 +26,7 @@ typedef struct QIcon QIcon; QFileIconProvider* QFileIconProvider_new(); QIcon* QFileIconProvider_Icon(const QFileIconProvider* self, int typeVal); QIcon* QFileIconProvider_IconWithInfo(const QFileIconProvider* self, QFileInfo* info); -struct miqt_string* QFileIconProvider_Type(const QFileIconProvider* self, QFileInfo* info); +struct miqt_string QFileIconProvider_Type(const QFileIconProvider* self, QFileInfo* info); void QFileIconProvider_SetOptions(QFileIconProvider* self, int options); int QFileIconProvider_Options(const QFileIconProvider* self); void QFileIconProvider_Delete(QFileIconProvider* self); diff --git a/qt/gen_qfileinfo.cpp b/qt/gen_qfileinfo.cpp index 43f2c657..34aebd59 100644 --- a/qt/gen_qfileinfo.cpp +++ b/qt/gen_qfileinfo.cpp @@ -13,8 +13,8 @@ QFileInfo* QFileInfo_new() { return new QFileInfo(); } -QFileInfo* QFileInfo_new2(struct miqt_string* file) { - QString file_QString = QString::fromUtf8(&file->data, file->len); +QFileInfo* QFileInfo_new2(struct miqt_string file) { + QString file_QString = QString::fromUtf8(file.data, file.len); return new QFileInfo(file_QString); } @@ -22,8 +22,8 @@ QFileInfo* QFileInfo_new3(QFile* file) { return new QFileInfo(*file); } -QFileInfo* QFileInfo_new4(QDir* dir, struct miqt_string* file) { - QString file_QString = QString::fromUtf8(&file->data, file->len); +QFileInfo* QFileInfo_new4(QDir* dir, struct miqt_string file) { + QString file_QString = QString::fromUtf8(file.data, file.len); return new QFileInfo(*dir, file_QString); } @@ -47,8 +47,8 @@ bool QFileInfo_OperatorNotEqual(const QFileInfo* self, QFileInfo* fileinfo) { return self->operator!=(*fileinfo); } -void QFileInfo_SetFile(QFileInfo* self, struct miqt_string* file) { - QString file_QString = QString::fromUtf8(&file->data, file->len); +void QFileInfo_SetFile(QFileInfo* self, struct miqt_string file) { + QString file_QString = QString::fromUtf8(file.data, file.len); self->setFile(file_QString); } @@ -56,8 +56,8 @@ void QFileInfo_SetFileWithFile(QFileInfo* self, QFile* file) { self->setFile(*file); } -void QFileInfo_SetFile2(QFileInfo* self, QDir* dir, struct miqt_string* file) { - QString file_QString = QString::fromUtf8(&file->data, file->len); +void QFileInfo_SetFile2(QFileInfo* self, QDir* dir, struct miqt_string file) { + QString file_QString = QString::fromUtf8(file.data, file.len); self->setFile(*dir, file_QString); } @@ -65,8 +65,8 @@ bool QFileInfo_Exists(const QFileInfo* self) { return self->exists(); } -bool QFileInfo_ExistsWithFile(struct miqt_string* file) { - QString file_QString = QString::fromUtf8(&file->data, file->len); +bool QFileInfo_ExistsWithFile(struct miqt_string file) { + QString file_QString = QString::fromUtf8(file.data, file.len); return QFileInfo::exists(file_QString); } @@ -74,88 +74,136 @@ void QFileInfo_Refresh(QFileInfo* self) { self->refresh(); } -struct miqt_string* QFileInfo_FilePath(const QFileInfo* self) { +struct miqt_string QFileInfo_FilePath(const QFileInfo* self) { QString _ret = self->filePath(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFileInfo_AbsoluteFilePath(const QFileInfo* self) { +struct miqt_string QFileInfo_AbsoluteFilePath(const QFileInfo* self) { QString _ret = self->absoluteFilePath(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFileInfo_CanonicalFilePath(const QFileInfo* self) { +struct miqt_string QFileInfo_CanonicalFilePath(const QFileInfo* self) { QString _ret = self->canonicalFilePath(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFileInfo_FileName(const QFileInfo* self) { +struct miqt_string QFileInfo_FileName(const QFileInfo* self) { QString _ret = self->fileName(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFileInfo_BaseName(const QFileInfo* self) { +struct miqt_string QFileInfo_BaseName(const QFileInfo* self) { QString _ret = self->baseName(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFileInfo_CompleteBaseName(const QFileInfo* self) { +struct miqt_string QFileInfo_CompleteBaseName(const QFileInfo* self) { QString _ret = self->completeBaseName(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFileInfo_Suffix(const QFileInfo* self) { +struct miqt_string QFileInfo_Suffix(const QFileInfo* self) { QString _ret = self->suffix(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFileInfo_BundleName(const QFileInfo* self) { +struct miqt_string QFileInfo_BundleName(const QFileInfo* self) { QString _ret = self->bundleName(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFileInfo_CompleteSuffix(const QFileInfo* self) { +struct miqt_string QFileInfo_CompleteSuffix(const QFileInfo* self) { QString _ret = self->completeSuffix(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFileInfo_Path(const QFileInfo* self) { +struct miqt_string QFileInfo_Path(const QFileInfo* self) { QString _ret = self->path(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFileInfo_AbsolutePath(const QFileInfo* self) { +struct miqt_string QFileInfo_AbsolutePath(const QFileInfo* self) { QString _ret = self->absolutePath(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFileInfo_CanonicalPath(const QFileInfo* self) { +struct miqt_string QFileInfo_CanonicalPath(const QFileInfo* self) { QString _ret = self->canonicalPath(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QDir* QFileInfo_Dir(const QFileInfo* self) { @@ -230,25 +278,37 @@ bool QFileInfo_IsBundle(const QFileInfo* self) { return self->isBundle(); } -struct miqt_string* QFileInfo_ReadLink(const QFileInfo* self) { +struct miqt_string QFileInfo_ReadLink(const QFileInfo* self) { QString _ret = self->readLink(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFileInfo_SymLinkTarget(const QFileInfo* self) { +struct miqt_string QFileInfo_SymLinkTarget(const QFileInfo* self) { QString _ret = self->symLinkTarget(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFileInfo_Owner(const QFileInfo* self) { +struct miqt_string QFileInfo_Owner(const QFileInfo* self) { QString _ret = self->owner(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } unsigned int QFileInfo_OwnerId(const QFileInfo* self) { @@ -256,11 +316,15 @@ unsigned int QFileInfo_OwnerId(const QFileInfo* self) { return static_cast(_ret); } -struct miqt_string* QFileInfo_Group(const QFileInfo* self) { +struct miqt_string QFileInfo_Group(const QFileInfo* self) { QString _ret = self->group(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } unsigned int QFileInfo_GroupId(const QFileInfo* self) { diff --git a/qt/gen_qfileinfo.go b/qt/gen_qfileinfo.go index 1c3e700f..a6642ea7 100644 --- a/qt/gen_qfileinfo.go +++ b/qt/gen_qfileinfo.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -51,9 +50,11 @@ func NewQFileInfo() *QFileInfo { // NewQFileInfo2 constructs a new QFileInfo object. func NewQFileInfo2(file string) *QFileInfo { - file_ms := libmiqt.Strdupg(file) - defer C.free(file_ms) - ret := C.QFileInfo_new2((*C.struct_miqt_string)(file_ms)) + file_ms := C.struct_miqt_string{} + file_ms.data = C.CString(file) + file_ms.len = C.size_t(len(file)) + defer C.free(unsafe.Pointer(file_ms.data)) + ret := C.QFileInfo_new2(file_ms) return newQFileInfo(ret) } @@ -65,9 +66,11 @@ func NewQFileInfo3(file *QFile) *QFileInfo { // NewQFileInfo4 constructs a new QFileInfo object. func NewQFileInfo4(dir *QDir, file string) *QFileInfo { - file_ms := libmiqt.Strdupg(file) - defer C.free(file_ms) - ret := C.QFileInfo_new4(dir.cPointer(), (*C.struct_miqt_string)(file_ms)) + file_ms := C.struct_miqt_string{} + file_ms.data = C.CString(file) + file_ms.len = C.size_t(len(file)) + defer C.free(unsafe.Pointer(file_ms.data)) + ret := C.QFileInfo_new4(dir.cPointer(), file_ms) return newQFileInfo(ret) } @@ -94,9 +97,11 @@ func (this *QFileInfo) OperatorNotEqual(fileinfo *QFileInfo) bool { } func (this *QFileInfo) SetFile(file string) { - file_ms := libmiqt.Strdupg(file) - defer C.free(file_ms) - C.QFileInfo_SetFile(this.h, (*C.struct_miqt_string)(file_ms)) + file_ms := C.struct_miqt_string{} + file_ms.data = C.CString(file) + file_ms.len = C.size_t(len(file)) + defer C.free(unsafe.Pointer(file_ms.data)) + C.QFileInfo_SetFile(this.h, file_ms) } func (this *QFileInfo) SetFileWithFile(file *QFile) { @@ -104,9 +109,11 @@ func (this *QFileInfo) SetFileWithFile(file *QFile) { } func (this *QFileInfo) SetFile2(dir *QDir, file string) { - file_ms := libmiqt.Strdupg(file) - defer C.free(file_ms) - C.QFileInfo_SetFile2(this.h, dir.cPointer(), (*C.struct_miqt_string)(file_ms)) + file_ms := C.struct_miqt_string{} + file_ms.data = C.CString(file) + file_ms.len = C.size_t(len(file)) + defer C.free(unsafe.Pointer(file_ms.data)) + C.QFileInfo_SetFile2(this.h, dir.cPointer(), file_ms) } func (this *QFileInfo) Exists() bool { @@ -114,9 +121,11 @@ func (this *QFileInfo) Exists() bool { } func QFileInfo_ExistsWithFile(file string) bool { - file_ms := libmiqt.Strdupg(file) - defer C.free(file_ms) - return (bool)(C.QFileInfo_ExistsWithFile((*C.struct_miqt_string)(file_ms))) + file_ms := C.struct_miqt_string{} + file_ms.data = C.CString(file) + file_ms.len = C.size_t(len(file)) + defer C.free(unsafe.Pointer(file_ms.data)) + return (bool)(C.QFileInfo_ExistsWithFile(file_ms)) } func (this *QFileInfo) Refresh() { @@ -124,86 +133,86 @@ func (this *QFileInfo) Refresh() { } func (this *QFileInfo) FilePath() string { - var _ms *C.struct_miqt_string = C.QFileInfo_FilePath(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFileInfo_FilePath(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QFileInfo) AbsoluteFilePath() string { - var _ms *C.struct_miqt_string = C.QFileInfo_AbsoluteFilePath(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFileInfo_AbsoluteFilePath(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QFileInfo) CanonicalFilePath() string { - var _ms *C.struct_miqt_string = C.QFileInfo_CanonicalFilePath(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFileInfo_CanonicalFilePath(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QFileInfo) FileName() string { - var _ms *C.struct_miqt_string = C.QFileInfo_FileName(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFileInfo_FileName(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QFileInfo) BaseName() string { - var _ms *C.struct_miqt_string = C.QFileInfo_BaseName(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFileInfo_BaseName(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QFileInfo) CompleteBaseName() string { - var _ms *C.struct_miqt_string = C.QFileInfo_CompleteBaseName(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFileInfo_CompleteBaseName(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QFileInfo) Suffix() string { - var _ms *C.struct_miqt_string = C.QFileInfo_Suffix(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFileInfo_Suffix(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QFileInfo) BundleName() string { - var _ms *C.struct_miqt_string = C.QFileInfo_BundleName(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFileInfo_BundleName(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QFileInfo) CompleteSuffix() string { - var _ms *C.struct_miqt_string = C.QFileInfo_CompleteSuffix(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFileInfo_CompleteSuffix(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QFileInfo) Path() string { - var _ms *C.struct_miqt_string = C.QFileInfo_Path(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFileInfo_Path(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QFileInfo) AbsolutePath() string { - var _ms *C.struct_miqt_string = C.QFileInfo_AbsolutePath(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFileInfo_AbsolutePath(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QFileInfo) CanonicalPath() string { - var _ms *C.struct_miqt_string = C.QFileInfo_CanonicalPath(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFileInfo_CanonicalPath(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -286,23 +295,23 @@ func (this *QFileInfo) IsBundle() bool { } func (this *QFileInfo) ReadLink() string { - var _ms *C.struct_miqt_string = C.QFileInfo_ReadLink(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFileInfo_ReadLink(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QFileInfo) SymLinkTarget() string { - var _ms *C.struct_miqt_string = C.QFileInfo_SymLinkTarget(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFileInfo_SymLinkTarget(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QFileInfo) Owner() string { - var _ms *C.struct_miqt_string = C.QFileInfo_Owner(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFileInfo_Owner(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -311,9 +320,9 @@ func (this *QFileInfo) OwnerId() uint { } func (this *QFileInfo) Group() string { - var _ms *C.struct_miqt_string = C.QFileInfo_Group(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFileInfo_Group(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qfileinfo.h b/qt/gen_qfileinfo.h index 85f30d4c..fbe016e7 100644 --- a/qt/gen_qfileinfo.h +++ b/qt/gen_qfileinfo.h @@ -26,32 +26,32 @@ typedef struct QFileInfo QFileInfo; #endif QFileInfo* QFileInfo_new(); -QFileInfo* QFileInfo_new2(struct miqt_string* file); +QFileInfo* QFileInfo_new2(struct miqt_string file); QFileInfo* QFileInfo_new3(QFile* file); -QFileInfo* QFileInfo_new4(QDir* dir, struct miqt_string* file); +QFileInfo* QFileInfo_new4(QDir* dir, struct miqt_string file); QFileInfo* QFileInfo_new5(QFileInfo* fileinfo); void QFileInfo_OperatorAssign(QFileInfo* self, QFileInfo* fileinfo); void QFileInfo_Swap(QFileInfo* self, QFileInfo* other); bool QFileInfo_OperatorEqual(const QFileInfo* self, QFileInfo* fileinfo); bool QFileInfo_OperatorNotEqual(const QFileInfo* self, QFileInfo* fileinfo); -void QFileInfo_SetFile(QFileInfo* self, struct miqt_string* file); +void QFileInfo_SetFile(QFileInfo* self, struct miqt_string file); void QFileInfo_SetFileWithFile(QFileInfo* self, QFile* file); -void QFileInfo_SetFile2(QFileInfo* self, QDir* dir, struct miqt_string* file); +void QFileInfo_SetFile2(QFileInfo* self, QDir* dir, struct miqt_string file); bool QFileInfo_Exists(const QFileInfo* self); -bool QFileInfo_ExistsWithFile(struct miqt_string* file); +bool QFileInfo_ExistsWithFile(struct miqt_string file); void QFileInfo_Refresh(QFileInfo* self); -struct miqt_string* QFileInfo_FilePath(const QFileInfo* self); -struct miqt_string* QFileInfo_AbsoluteFilePath(const QFileInfo* self); -struct miqt_string* QFileInfo_CanonicalFilePath(const QFileInfo* self); -struct miqt_string* QFileInfo_FileName(const QFileInfo* self); -struct miqt_string* QFileInfo_BaseName(const QFileInfo* self); -struct miqt_string* QFileInfo_CompleteBaseName(const QFileInfo* self); -struct miqt_string* QFileInfo_Suffix(const QFileInfo* self); -struct miqt_string* QFileInfo_BundleName(const QFileInfo* self); -struct miqt_string* QFileInfo_CompleteSuffix(const QFileInfo* self); -struct miqt_string* QFileInfo_Path(const QFileInfo* self); -struct miqt_string* QFileInfo_AbsolutePath(const QFileInfo* self); -struct miqt_string* QFileInfo_CanonicalPath(const QFileInfo* self); +struct miqt_string QFileInfo_FilePath(const QFileInfo* self); +struct miqt_string QFileInfo_AbsoluteFilePath(const QFileInfo* self); +struct miqt_string QFileInfo_CanonicalFilePath(const QFileInfo* self); +struct miqt_string QFileInfo_FileName(const QFileInfo* self); +struct miqt_string QFileInfo_BaseName(const QFileInfo* self); +struct miqt_string QFileInfo_CompleteBaseName(const QFileInfo* self); +struct miqt_string QFileInfo_Suffix(const QFileInfo* self); +struct miqt_string QFileInfo_BundleName(const QFileInfo* self); +struct miqt_string QFileInfo_CompleteSuffix(const QFileInfo* self); +struct miqt_string QFileInfo_Path(const QFileInfo* self); +struct miqt_string QFileInfo_AbsolutePath(const QFileInfo* self); +struct miqt_string QFileInfo_CanonicalPath(const QFileInfo* self); QDir* QFileInfo_Dir(const QFileInfo* self); QDir* QFileInfo_AbsoluteDir(const QFileInfo* self); bool QFileInfo_IsReadable(const QFileInfo* self); @@ -70,11 +70,11 @@ bool QFileInfo_IsShortcut(const QFileInfo* self); bool QFileInfo_IsJunction(const QFileInfo* self); bool QFileInfo_IsRoot(const QFileInfo* self); bool QFileInfo_IsBundle(const QFileInfo* self); -struct miqt_string* QFileInfo_ReadLink(const QFileInfo* self); -struct miqt_string* QFileInfo_SymLinkTarget(const QFileInfo* self); -struct miqt_string* QFileInfo_Owner(const QFileInfo* self); +struct miqt_string QFileInfo_ReadLink(const QFileInfo* self); +struct miqt_string QFileInfo_SymLinkTarget(const QFileInfo* self); +struct miqt_string QFileInfo_Owner(const QFileInfo* self); unsigned int QFileInfo_OwnerId(const QFileInfo* self); -struct miqt_string* QFileInfo_Group(const QFileInfo* self); +struct miqt_string QFileInfo_Group(const QFileInfo* self); unsigned int QFileInfo_GroupId(const QFileInfo* self); bool QFileInfo_Permission(const QFileInfo* self, int permissions); int QFileInfo_Permissions(const QFileInfo* self); diff --git a/qt/gen_qfileselector.cpp b/qt/gen_qfileselector.cpp index 521b1d56..145ecbd3 100644 --- a/qt/gen_qfileselector.cpp +++ b/qt/gen_qfileselector.cpp @@ -26,26 +26,38 @@ void* QFileSelector_Metacast(QFileSelector* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QFileSelector_Tr(const char* s) { +struct miqt_string QFileSelector_Tr(const char* s) { QString _ret = QFileSelector::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFileSelector_TrUtf8(const char* s) { +struct miqt_string QFileSelector_TrUtf8(const char* s) { QString _ret = QFileSelector::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFileSelector_Select(const QFileSelector* self, struct miqt_string* filePath) { - QString filePath_QString = QString::fromUtf8(&filePath->data, filePath->len); +struct miqt_string QFileSelector_Select(const QFileSelector* self, struct miqt_string filePath) { + QString filePath_QString = QString::fromUtf8(filePath.data, filePath.len); QString _ret = self->select(filePath_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QUrl* QFileSelector_SelectWithFilePath(const QFileSelector* self, QUrl* filePath) { @@ -55,12 +67,16 @@ QUrl* QFileSelector_SelectWithFilePath(const QFileSelector* self, QUrl* filePath struct miqt_array* QFileSelector_ExtraSelectors(const QFileSelector* self) { QStringList _ret = self->extraSelectors(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -68,12 +84,12 @@ struct miqt_array* QFileSelector_ExtraSelectors(const QFileSelector* self) { return _out; } -void QFileSelector_SetExtraSelectors(QFileSelector* self, struct miqt_array* /* of struct miqt_string* */ list) { +void QFileSelector_SetExtraSelectors(QFileSelector* self, struct miqt_array* /* of struct miqt_string */ list) { QStringList list_QList; list_QList.reserve(list->len); - struct miqt_string** list_arr = static_cast(list->data); + struct miqt_string* list_arr = static_cast(list->data); for(size_t i = 0; i < list->len; ++i) { - QString list_arr_i_QString = QString::fromUtf8(&list_arr[i]->data, list_arr[i]->len); + QString list_arr_i_QString = QString::fromUtf8(list_arr[i].data, list_arr[i].len); list_QList.push_back(list_arr_i_QString); } self->setExtraSelectors(list_QList); @@ -82,12 +98,16 @@ void QFileSelector_SetExtraSelectors(QFileSelector* self, struct miqt_array* /* struct miqt_array* QFileSelector_AllSelectors(const QFileSelector* self) { QStringList _ret = self->allSelectors(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -95,32 +115,48 @@ struct miqt_array* QFileSelector_AllSelectors(const QFileSelector* self) { return _out; } -struct miqt_string* QFileSelector_Tr2(const char* s, const char* c) { +struct miqt_string QFileSelector_Tr2(const char* s, const char* c) { QString _ret = QFileSelector::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFileSelector_Tr3(const char* s, const char* c, int n) { +struct miqt_string QFileSelector_Tr3(const char* s, const char* c, int n) { QString _ret = QFileSelector::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFileSelector_TrUtf82(const char* s, const char* c) { +struct miqt_string QFileSelector_TrUtf82(const char* s, const char* c) { QString _ret = QFileSelector::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFileSelector_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QFileSelector_TrUtf83(const char* s, const char* c, int n) { QString _ret = QFileSelector::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QFileSelector_Delete(QFileSelector* self) { diff --git a/qt/gen_qfileselector.go b/qt/gen_qfileselector.go index 734fd795..96296256 100644 --- a/qt/gen_qfileselector.go +++ b/qt/gen_qfileselector.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -63,33 +62,35 @@ func (this *QFileSelector) MetaObject() *QMetaObject { func (this *QFileSelector) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QFileSelector_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QFileSelector_Metacast(this.h, param1_Cstring)) } func QFileSelector_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QFileSelector_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFileSelector_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QFileSelector_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QFileSelector_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFileSelector_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QFileSelector) Select(filePath string) string { - filePath_ms := libmiqt.Strdupg(filePath) - defer C.free(filePath_ms) - var _ms *C.struct_miqt_string = C.QFileSelector_Select(this.h, (*C.struct_miqt_string)(filePath_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + filePath_ms := C.struct_miqt_string{} + filePath_ms.data = C.CString(filePath) + filePath_ms.len = C.size_t(len(filePath)) + defer C.free(unsafe.Pointer(filePath_ms.data)) + var _ms C.struct_miqt_string = C.QFileSelector_Select(this.h, filePath_ms) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -103,11 +104,11 @@ func (this *QFileSelector) SelectWithFilePath(filePath *QUrl) *QUrl { func (this *QFileSelector) ExtraSelectors() []string { var _ma *C.struct_miqt_array = C.QFileSelector_ExtraSelectors(this.h) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -116,12 +117,14 @@ func (this *QFileSelector) ExtraSelectors() []string { func (this *QFileSelector) SetExtraSelectors(list []string) { // For the C ABI, malloc a C array of raw pointers - list_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(list)))) + list_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(list)))) defer C.free(unsafe.Pointer(list_CArray)) for i := range list { - list_i_ms := libmiqt.Strdupg(list[i]) - defer C.free(list_i_ms) - list_CArray[i] = (*C.struct_miqt_string)(list_i_ms) + list_i_ms := C.struct_miqt_string{} + list_i_ms.data = C.CString(list[i]) + list_i_ms.len = C.size_t(len(list[i])) + defer C.free(unsafe.Pointer(list_i_ms.data)) + list_CArray[i] = list_i_ms } list_ma := &C.struct_miqt_array{len: C.size_t(len(list)), data: unsafe.Pointer(list_CArray)} defer runtime.KeepAlive(unsafe.Pointer(list_ma)) @@ -131,11 +134,11 @@ func (this *QFileSelector) SetExtraSelectors(list []string) { func (this *QFileSelector) AllSelectors() []string { var _ma *C.struct_miqt_array = C.QFileSelector_AllSelectors(this.h) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -147,9 +150,9 @@ func QFileSelector_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFileSelector_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFileSelector_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -158,9 +161,9 @@ func QFileSelector_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFileSelector_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFileSelector_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -169,9 +172,9 @@ func QFileSelector_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFileSelector_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFileSelector_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -180,9 +183,9 @@ func QFileSelector_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFileSelector_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFileSelector_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qfileselector.h b/qt/gen_qfileselector.h index be3dfa70..7ec676a2 100644 --- a/qt/gen_qfileselector.h +++ b/qt/gen_qfileselector.h @@ -29,17 +29,17 @@ QFileSelector* QFileSelector_new(); QFileSelector* QFileSelector_new2(QObject* parent); QMetaObject* QFileSelector_MetaObject(const QFileSelector* self); void* QFileSelector_Metacast(QFileSelector* self, const char* param1); -struct miqt_string* QFileSelector_Tr(const char* s); -struct miqt_string* QFileSelector_TrUtf8(const char* s); -struct miqt_string* QFileSelector_Select(const QFileSelector* self, struct miqt_string* filePath); +struct miqt_string QFileSelector_Tr(const char* s); +struct miqt_string QFileSelector_TrUtf8(const char* s); +struct miqt_string QFileSelector_Select(const QFileSelector* self, struct miqt_string filePath); QUrl* QFileSelector_SelectWithFilePath(const QFileSelector* self, QUrl* filePath); struct miqt_array* QFileSelector_ExtraSelectors(const QFileSelector* self); -void QFileSelector_SetExtraSelectors(QFileSelector* self, struct miqt_array* /* of struct miqt_string* */ list); +void QFileSelector_SetExtraSelectors(QFileSelector* self, struct miqt_array* /* of struct miqt_string */ list); struct miqt_array* QFileSelector_AllSelectors(const QFileSelector* self); -struct miqt_string* QFileSelector_Tr2(const char* s, const char* c); -struct miqt_string* QFileSelector_Tr3(const char* s, const char* c, int n); -struct miqt_string* QFileSelector_TrUtf82(const char* s, const char* c); -struct miqt_string* QFileSelector_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QFileSelector_Tr2(const char* s, const char* c); +struct miqt_string QFileSelector_Tr3(const char* s, const char* c, int n); +struct miqt_string QFileSelector_TrUtf82(const char* s, const char* c); +struct miqt_string QFileSelector_TrUtf83(const char* s, const char* c, int n); void QFileSelector_Delete(QFileSelector* self); #ifdef __cplusplus diff --git a/qt/gen_qfilesystemmodel.cpp b/qt/gen_qfilesystemmodel.cpp index 69c5a1a7..cb265dd2 100644 --- a/qt/gen_qfilesystemmodel.cpp +++ b/qt/gen_qfilesystemmodel.cpp @@ -33,22 +33,30 @@ void* QFileSystemModel_Metacast(QFileSystemModel* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QFileSystemModel_Tr(const char* s) { +struct miqt_string QFileSystemModel_Tr(const char* s) { QString _ret = QFileSystemModel::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFileSystemModel_TrUtf8(const char* s) { +struct miqt_string QFileSystemModel_TrUtf8(const char* s) { QString _ret = QFileSystemModel::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QFileSystemModel_RootPathChanged(QFileSystemModel* self, struct miqt_string* newPath) { - QString newPath_QString = QString::fromUtf8(&newPath->data, newPath->len); +void QFileSystemModel_RootPathChanged(QFileSystemModel* self, struct miqt_string newPath) { + QString newPath_QString = QString::fromUtf8(newPath.data, newPath.len); self->rootPathChanged(newPath_QString); } @@ -57,15 +65,19 @@ void QFileSystemModel_connect_RootPathChanged(QFileSystemModel* self, intptr_t s const QString newPath_ret = newPath; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray newPath_b = newPath_ret.toUtf8(); - struct miqt_string* sigval1 = miqt_strdup(newPath_b.data(), newPath_b.length()); + struct miqt_string newPath_ms; + newPath_ms.len = newPath_b.length(); + newPath_ms.data = static_cast(malloc(newPath_ms.len)); + memcpy(newPath_ms.data, newPath_b.data(), newPath_ms.len); + struct miqt_string sigval1 = newPath_ms; miqt_exec_callback_QFileSystemModel_RootPathChanged(slot, sigval1); }); } -void QFileSystemModel_FileRenamed(QFileSystemModel* self, struct miqt_string* path, struct miqt_string* oldName, struct miqt_string* newName) { - QString path_QString = QString::fromUtf8(&path->data, path->len); - QString oldName_QString = QString::fromUtf8(&oldName->data, oldName->len); - QString newName_QString = QString::fromUtf8(&newName->data, newName->len); +void QFileSystemModel_FileRenamed(QFileSystemModel* self, struct miqt_string path, struct miqt_string oldName, struct miqt_string newName) { + QString path_QString = QString::fromUtf8(path.data, path.len); + QString oldName_QString = QString::fromUtf8(oldName.data, oldName.len); + QString newName_QString = QString::fromUtf8(newName.data, newName.len); self->fileRenamed(path_QString, oldName_QString, newName_QString); } @@ -74,21 +86,33 @@ void QFileSystemModel_connect_FileRenamed(QFileSystemModel* self, intptr_t slot) const QString path_ret = path; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray path_b = path_ret.toUtf8(); - struct miqt_string* sigval1 = miqt_strdup(path_b.data(), path_b.length()); + struct miqt_string path_ms; + path_ms.len = path_b.length(); + path_ms.data = static_cast(malloc(path_ms.len)); + memcpy(path_ms.data, path_b.data(), path_ms.len); + struct miqt_string sigval1 = path_ms; const QString oldName_ret = oldName; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray oldName_b = oldName_ret.toUtf8(); - struct miqt_string* sigval2 = miqt_strdup(oldName_b.data(), oldName_b.length()); + struct miqt_string oldName_ms; + oldName_ms.len = oldName_b.length(); + oldName_ms.data = static_cast(malloc(oldName_ms.len)); + memcpy(oldName_ms.data, oldName_b.data(), oldName_ms.len); + struct miqt_string sigval2 = oldName_ms; const QString newName_ret = newName; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray newName_b = newName_ret.toUtf8(); - struct miqt_string* sigval3 = miqt_strdup(newName_b.data(), newName_b.length()); + struct miqt_string newName_ms; + newName_ms.len = newName_b.length(); + newName_ms.data = static_cast(malloc(newName_ms.len)); + memcpy(newName_ms.data, newName_b.data(), newName_ms.len); + struct miqt_string sigval3 = newName_ms; miqt_exec_callback_QFileSystemModel_FileRenamed(slot, sigval1, sigval2, sigval3); }); } -void QFileSystemModel_DirectoryLoaded(QFileSystemModel* self, struct miqt_string* path) { - QString path_QString = QString::fromUtf8(&path->data, path->len); +void QFileSystemModel_DirectoryLoaded(QFileSystemModel* self, struct miqt_string path) { + QString path_QString = QString::fromUtf8(path.data, path.len); self->directoryLoaded(path_QString); } @@ -97,7 +121,11 @@ void QFileSystemModel_connect_DirectoryLoaded(QFileSystemModel* self, intptr_t s const QString path_ret = path; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray path_b = path_ret.toUtf8(); - struct miqt_string* sigval1 = miqt_strdup(path_b.data(), path_b.length()); + struct miqt_string path_ms; + path_ms.len = path_b.length(); + path_ms.data = static_cast(malloc(path_ms.len)); + memcpy(path_ms.data, path_b.data(), path_ms.len); + struct miqt_string sigval1 = path_ms; miqt_exec_callback_QFileSystemModel_DirectoryLoaded(slot, sigval1); }); } @@ -106,8 +134,8 @@ QModelIndex* QFileSystemModel_Index(const QFileSystemModel* self, int row, int c return new QModelIndex(self->index(static_cast(row), static_cast(column))); } -QModelIndex* QFileSystemModel_IndexWithPath(const QFileSystemModel* self, struct miqt_string* path) { - QString path_QString = QString::fromUtf8(&path->data, path->len); +QModelIndex* QFileSystemModel_IndexWithPath(const QFileSystemModel* self, struct miqt_string path) { + QString path_QString = QString::fromUtf8(path.data, path.len); return new QModelIndex(self->index(path_QString)); } @@ -167,12 +195,16 @@ void QFileSystemModel_Sort(QFileSystemModel* self, int column) { struct miqt_array* QFileSystemModel_MimeTypes(const QFileSystemModel* self) { QStringList _ret = self->mimeTypes(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -199,16 +231,20 @@ int QFileSystemModel_SupportedDropActions(const QFileSystemModel* self) { return static_cast(_ret); } -QModelIndex* QFileSystemModel_SetRootPath(QFileSystemModel* self, struct miqt_string* path) { - QString path_QString = QString::fromUtf8(&path->data, path->len); +QModelIndex* QFileSystemModel_SetRootPath(QFileSystemModel* self, struct miqt_string path) { + QString path_QString = QString::fromUtf8(path.data, path.len); return new QModelIndex(self->setRootPath(path_QString)); } -struct miqt_string* QFileSystemModel_RootPath(const QFileSystemModel* self) { +struct miqt_string QFileSystemModel_RootPath(const QFileSystemModel* self) { QString _ret = self->rootPath(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QDir* QFileSystemModel_RootDirectory(const QFileSystemModel* self) { @@ -256,12 +292,12 @@ bool QFileSystemModel_NameFilterDisables(const QFileSystemModel* self) { return self->nameFilterDisables(); } -void QFileSystemModel_SetNameFilters(QFileSystemModel* self, struct miqt_array* /* of struct miqt_string* */ filters) { +void QFileSystemModel_SetNameFilters(QFileSystemModel* self, struct miqt_array* /* of struct miqt_string */ filters) { QStringList filters_QList; filters_QList.reserve(filters->len); - struct miqt_string** filters_arr = static_cast(filters->data); + struct miqt_string* filters_arr = static_cast(filters->data); for(size_t i = 0; i < filters->len; ++i) { - QString filters_arr_i_QString = QString::fromUtf8(&filters_arr[i]->data, filters_arr[i]->len); + QString filters_arr_i_QString = QString::fromUtf8(filters_arr[i].data, filters_arr[i].len); filters_QList.push_back(filters_arr_i_QString); } self->setNameFilters(filters_QList); @@ -270,12 +306,16 @@ void QFileSystemModel_SetNameFilters(QFileSystemModel* self, struct miqt_array* struct miqt_array* QFileSystemModel_NameFilters(const QFileSystemModel* self) { QStringList _ret = self->nameFilters(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -300,11 +340,15 @@ int QFileSystemModel_Options(const QFileSystemModel* self) { return static_cast(_ret); } -struct miqt_string* QFileSystemModel_FilePath(const QFileSystemModel* self, QModelIndex* index) { +struct miqt_string QFileSystemModel_FilePath(const QFileSystemModel* self, QModelIndex* index) { QString _ret = self->filePath(*index); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } bool QFileSystemModel_IsDir(const QFileSystemModel* self, QModelIndex* index) { @@ -316,19 +360,23 @@ long long QFileSystemModel_Size(const QFileSystemModel* self, QModelIndex* index return static_cast(_ret); } -struct miqt_string* QFileSystemModel_Type(const QFileSystemModel* self, QModelIndex* index) { +struct miqt_string QFileSystemModel_Type(const QFileSystemModel* self, QModelIndex* index) { QString _ret = self->type(*index); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QDateTime* QFileSystemModel_LastModified(const QFileSystemModel* self, QModelIndex* index) { return new QDateTime(self->lastModified(*index)); } -QModelIndex* QFileSystemModel_Mkdir(QFileSystemModel* self, QModelIndex* parent, struct miqt_string* name) { - QString name_QString = QString::fromUtf8(&name->data, name->len); +QModelIndex* QFileSystemModel_Mkdir(QFileSystemModel* self, QModelIndex* parent, struct miqt_string name) { + QString name_QString = QString::fromUtf8(name.data, name.len); return new QModelIndex(self->mkdir(*parent, name_QString)); } @@ -336,11 +384,15 @@ bool QFileSystemModel_Rmdir(QFileSystemModel* self, QModelIndex* index) { return self->rmdir(*index); } -struct miqt_string* QFileSystemModel_FileName(const QFileSystemModel* self, QModelIndex* index) { +struct miqt_string QFileSystemModel_FileName(const QFileSystemModel* self, QModelIndex* index) { QString _ret = self->fileName(*index); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QIcon* QFileSystemModel_FileIcon(const QFileSystemModel* self, QModelIndex* index) { @@ -360,40 +412,56 @@ bool QFileSystemModel_Remove(QFileSystemModel* self, QModelIndex* index) { return self->remove(*index); } -struct miqt_string* QFileSystemModel_Tr2(const char* s, const char* c) { +struct miqt_string QFileSystemModel_Tr2(const char* s, const char* c) { QString _ret = QFileSystemModel::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFileSystemModel_Tr3(const char* s, const char* c, int n) { +struct miqt_string QFileSystemModel_Tr3(const char* s, const char* c, int n) { QString _ret = QFileSystemModel::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFileSystemModel_TrUtf82(const char* s, const char* c) { +struct miqt_string QFileSystemModel_TrUtf82(const char* s, const char* c) { QString _ret = QFileSystemModel::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFileSystemModel_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QFileSystemModel_TrUtf83(const char* s, const char* c, int n) { QString _ret = QFileSystemModel::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QModelIndex* QFileSystemModel_Index3(const QFileSystemModel* self, int row, int column, QModelIndex* parent) { return new QModelIndex(self->index(static_cast(row), static_cast(column), *parent)); } -QModelIndex* QFileSystemModel_Index2(const QFileSystemModel* self, struct miqt_string* path, int column) { - QString path_QString = QString::fromUtf8(&path->data, path->len); +QModelIndex* QFileSystemModel_Index2(const QFileSystemModel* self, struct miqt_string path, int column) { + QString path_QString = QString::fromUtf8(path.data, path.len); return new QModelIndex(self->index(path_QString, static_cast(column))); } diff --git a/qt/gen_qfilesystemmodel.go b/qt/gen_qfilesystemmodel.go index c1b31ea4..b18dc76f 100644 --- a/qt/gen_qfilesystemmodel.go +++ b/qt/gen_qfilesystemmodel.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "runtime/cgo" "unsafe" @@ -81,109 +80,119 @@ func (this *QFileSystemModel) MetaObject() *QMetaObject { func (this *QFileSystemModel) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QFileSystemModel_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QFileSystemModel_Metacast(this.h, param1_Cstring)) } func QFileSystemModel_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QFileSystemModel_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFileSystemModel_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QFileSystemModel_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QFileSystemModel_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFileSystemModel_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QFileSystemModel) RootPathChanged(newPath string) { - newPath_ms := libmiqt.Strdupg(newPath) - defer C.free(newPath_ms) - C.QFileSystemModel_RootPathChanged(this.h, (*C.struct_miqt_string)(newPath_ms)) + newPath_ms := C.struct_miqt_string{} + newPath_ms.data = C.CString(newPath) + newPath_ms.len = C.size_t(len(newPath)) + defer C.free(unsafe.Pointer(newPath_ms.data)) + C.QFileSystemModel_RootPathChanged(this.h, newPath_ms) } func (this *QFileSystemModel) OnRootPathChanged(slot func(newPath string)) { C.QFileSystemModel_connect_RootPathChanged(this.h, C.intptr_t(cgo.NewHandle(slot))) } //export miqt_exec_callback_QFileSystemModel_RootPathChanged -func miqt_exec_callback_QFileSystemModel_RootPathChanged(cb C.intptr_t, newPath *C.struct_miqt_string) { +func miqt_exec_callback_QFileSystemModel_RootPathChanged(cb C.intptr_t, newPath C.struct_miqt_string) { gofunc, ok := cgo.Handle(cb).Value().(func(newPath string)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") } // Convert all CABI parameters to Go parameters - var newPath_ms *C.struct_miqt_string = newPath - newPath_ret := C.GoStringN(&newPath_ms.data, C.int(int64(newPath_ms.len))) - C.free(unsafe.Pointer(newPath_ms)) + var newPath_ms C.struct_miqt_string = newPath + newPath_ret := C.GoStringN(newPath_ms.data, C.int(int64(newPath_ms.len))) + C.free(unsafe.Pointer(newPath_ms.data)) slotval1 := newPath_ret gofunc(slotval1) } func (this *QFileSystemModel) FileRenamed(path string, oldName string, newName string) { - path_ms := libmiqt.Strdupg(path) - defer C.free(path_ms) - oldName_ms := libmiqt.Strdupg(oldName) - defer C.free(oldName_ms) - newName_ms := libmiqt.Strdupg(newName) - defer C.free(newName_ms) - C.QFileSystemModel_FileRenamed(this.h, (*C.struct_miqt_string)(path_ms), (*C.struct_miqt_string)(oldName_ms), (*C.struct_miqt_string)(newName_ms)) + path_ms := C.struct_miqt_string{} + path_ms.data = C.CString(path) + path_ms.len = C.size_t(len(path)) + defer C.free(unsafe.Pointer(path_ms.data)) + oldName_ms := C.struct_miqt_string{} + oldName_ms.data = C.CString(oldName) + oldName_ms.len = C.size_t(len(oldName)) + defer C.free(unsafe.Pointer(oldName_ms.data)) + newName_ms := C.struct_miqt_string{} + newName_ms.data = C.CString(newName) + newName_ms.len = C.size_t(len(newName)) + defer C.free(unsafe.Pointer(newName_ms.data)) + C.QFileSystemModel_FileRenamed(this.h, path_ms, oldName_ms, newName_ms) } func (this *QFileSystemModel) OnFileRenamed(slot func(path string, oldName string, newName string)) { C.QFileSystemModel_connect_FileRenamed(this.h, C.intptr_t(cgo.NewHandle(slot))) } //export miqt_exec_callback_QFileSystemModel_FileRenamed -func miqt_exec_callback_QFileSystemModel_FileRenamed(cb C.intptr_t, path *C.struct_miqt_string, oldName *C.struct_miqt_string, newName *C.struct_miqt_string) { +func miqt_exec_callback_QFileSystemModel_FileRenamed(cb C.intptr_t, path C.struct_miqt_string, oldName C.struct_miqt_string, newName C.struct_miqt_string) { gofunc, ok := cgo.Handle(cb).Value().(func(path string, oldName string, newName string)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") } // Convert all CABI parameters to Go parameters - var path_ms *C.struct_miqt_string = path - path_ret := C.GoStringN(&path_ms.data, C.int(int64(path_ms.len))) - C.free(unsafe.Pointer(path_ms)) + var path_ms C.struct_miqt_string = path + path_ret := C.GoStringN(path_ms.data, C.int(int64(path_ms.len))) + C.free(unsafe.Pointer(path_ms.data)) slotval1 := path_ret - var oldName_ms *C.struct_miqt_string = oldName - oldName_ret := C.GoStringN(&oldName_ms.data, C.int(int64(oldName_ms.len))) - C.free(unsafe.Pointer(oldName_ms)) + var oldName_ms C.struct_miqt_string = oldName + oldName_ret := C.GoStringN(oldName_ms.data, C.int(int64(oldName_ms.len))) + C.free(unsafe.Pointer(oldName_ms.data)) slotval2 := oldName_ret - var newName_ms *C.struct_miqt_string = newName - newName_ret := C.GoStringN(&newName_ms.data, C.int(int64(newName_ms.len))) - C.free(unsafe.Pointer(newName_ms)) + var newName_ms C.struct_miqt_string = newName + newName_ret := C.GoStringN(newName_ms.data, C.int(int64(newName_ms.len))) + C.free(unsafe.Pointer(newName_ms.data)) slotval3 := newName_ret gofunc(slotval1, slotval2, slotval3) } func (this *QFileSystemModel) DirectoryLoaded(path string) { - path_ms := libmiqt.Strdupg(path) - defer C.free(path_ms) - C.QFileSystemModel_DirectoryLoaded(this.h, (*C.struct_miqt_string)(path_ms)) + path_ms := C.struct_miqt_string{} + path_ms.data = C.CString(path) + path_ms.len = C.size_t(len(path)) + defer C.free(unsafe.Pointer(path_ms.data)) + C.QFileSystemModel_DirectoryLoaded(this.h, path_ms) } func (this *QFileSystemModel) OnDirectoryLoaded(slot func(path string)) { C.QFileSystemModel_connect_DirectoryLoaded(this.h, C.intptr_t(cgo.NewHandle(slot))) } //export miqt_exec_callback_QFileSystemModel_DirectoryLoaded -func miqt_exec_callback_QFileSystemModel_DirectoryLoaded(cb C.intptr_t, path *C.struct_miqt_string) { +func miqt_exec_callback_QFileSystemModel_DirectoryLoaded(cb C.intptr_t, path C.struct_miqt_string) { gofunc, ok := cgo.Handle(cb).Value().(func(path string)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") } // Convert all CABI parameters to Go parameters - var path_ms *C.struct_miqt_string = path - path_ret := C.GoStringN(&path_ms.data, C.int(int64(path_ms.len))) - C.free(unsafe.Pointer(path_ms)) + var path_ms C.struct_miqt_string = path + path_ret := C.GoStringN(path_ms.data, C.int(int64(path_ms.len))) + C.free(unsafe.Pointer(path_ms.data)) slotval1 := path_ret gofunc(slotval1) @@ -197,9 +206,11 @@ func (this *QFileSystemModel) Index(row int, column int) *QModelIndex { } func (this *QFileSystemModel) IndexWithPath(path string) *QModelIndex { - path_ms := libmiqt.Strdupg(path) - defer C.free(path_ms) - _ret := C.QFileSystemModel_IndexWithPath(this.h, (*C.struct_miqt_string)(path_ms)) + path_ms := C.struct_miqt_string{} + path_ms.data = C.CString(path) + path_ms.len = C.size_t(len(path)) + defer C.free(unsafe.Pointer(path_ms.data)) + _ret := C.QFileSystemModel_IndexWithPath(this.h, path_ms) _goptr := newQModelIndex(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -275,11 +286,11 @@ func (this *QFileSystemModel) Sort(column int) { func (this *QFileSystemModel) MimeTypes() []string { var _ma *C.struct_miqt_array = C.QFileSystemModel_MimeTypes(this.h) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -307,18 +318,20 @@ func (this *QFileSystemModel) SupportedDropActions() DropAction { } func (this *QFileSystemModel) SetRootPath(path string) *QModelIndex { - path_ms := libmiqt.Strdupg(path) - defer C.free(path_ms) - _ret := C.QFileSystemModel_SetRootPath(this.h, (*C.struct_miqt_string)(path_ms)) + path_ms := C.struct_miqt_string{} + path_ms.data = C.CString(path) + path_ms.len = C.size_t(len(path)) + defer C.free(unsafe.Pointer(path_ms.data)) + _ret := C.QFileSystemModel_SetRootPath(this.h, path_ms) _goptr := newQModelIndex(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QFileSystemModel) RootPath() string { - var _ms *C.struct_miqt_string = C.QFileSystemModel_RootPath(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFileSystemModel_RootPath(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -371,12 +384,14 @@ func (this *QFileSystemModel) NameFilterDisables() bool { func (this *QFileSystemModel) SetNameFilters(filters []string) { // For the C ABI, malloc a C array of raw pointers - filters_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(filters)))) + filters_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(filters)))) defer C.free(unsafe.Pointer(filters_CArray)) for i := range filters { - filters_i_ms := libmiqt.Strdupg(filters[i]) - defer C.free(filters_i_ms) - filters_CArray[i] = (*C.struct_miqt_string)(filters_i_ms) + filters_i_ms := C.struct_miqt_string{} + filters_i_ms.data = C.CString(filters[i]) + filters_i_ms.len = C.size_t(len(filters[i])) + defer C.free(unsafe.Pointer(filters_i_ms.data)) + filters_CArray[i] = filters_i_ms } filters_ma := &C.struct_miqt_array{len: C.size_t(len(filters)), data: unsafe.Pointer(filters_CArray)} defer runtime.KeepAlive(unsafe.Pointer(filters_ma)) @@ -386,11 +401,11 @@ func (this *QFileSystemModel) SetNameFilters(filters []string) { func (this *QFileSystemModel) NameFilters() []string { var _ma *C.struct_miqt_array = C.QFileSystemModel_NameFilters(this.h) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -414,9 +429,9 @@ func (this *QFileSystemModel) Options() QFileSystemModel__Option { } func (this *QFileSystemModel) FilePath(index *QModelIndex) string { - var _ms *C.struct_miqt_string = C.QFileSystemModel_FilePath(this.h, index.cPointer()) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFileSystemModel_FilePath(this.h, index.cPointer()) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -429,9 +444,9 @@ func (this *QFileSystemModel) Size(index *QModelIndex) int64 { } func (this *QFileSystemModel) Type(index *QModelIndex) string { - var _ms *C.struct_miqt_string = C.QFileSystemModel_Type(this.h, index.cPointer()) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFileSystemModel_Type(this.h, index.cPointer()) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -443,9 +458,11 @@ func (this *QFileSystemModel) LastModified(index *QModelIndex) *QDateTime { } func (this *QFileSystemModel) Mkdir(parent *QModelIndex, name string) *QModelIndex { - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - _ret := C.QFileSystemModel_Mkdir(this.h, parent.cPointer(), (*C.struct_miqt_string)(name_ms)) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + _ret := C.QFileSystemModel_Mkdir(this.h, parent.cPointer(), name_ms) _goptr := newQModelIndex(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -456,9 +473,9 @@ func (this *QFileSystemModel) Rmdir(index *QModelIndex) bool { } func (this *QFileSystemModel) FileName(index *QModelIndex) string { - var _ms *C.struct_miqt_string = C.QFileSystemModel_FileName(this.h, index.cPointer()) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFileSystemModel_FileName(this.h, index.cPointer()) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -489,9 +506,9 @@ func QFileSystemModel_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFileSystemModel_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFileSystemModel_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -500,9 +517,9 @@ func QFileSystemModel_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFileSystemModel_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFileSystemModel_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -511,9 +528,9 @@ func QFileSystemModel_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFileSystemModel_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFileSystemModel_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -522,9 +539,9 @@ func QFileSystemModel_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFileSystemModel_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFileSystemModel_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -536,9 +553,11 @@ func (this *QFileSystemModel) Index3(row int, column int, parent *QModelIndex) * } func (this *QFileSystemModel) Index2(path string, column int) *QModelIndex { - path_ms := libmiqt.Strdupg(path) - defer C.free(path_ms) - _ret := C.QFileSystemModel_Index2(this.h, (*C.struct_miqt_string)(path_ms), (C.int)(column)) + path_ms := C.struct_miqt_string{} + path_ms.data = C.CString(path) + path_ms.len = C.size_t(len(path)) + defer C.free(unsafe.Pointer(path_ms.data)) + _ret := C.QFileSystemModel_Index2(this.h, path_ms, (C.int)(column)) _goptr := newQModelIndex(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr diff --git a/qt/gen_qfilesystemmodel.h b/qt/gen_qfilesystemmodel.h index d150f3e5..a75617b2 100644 --- a/qt/gen_qfilesystemmodel.h +++ b/qt/gen_qfilesystemmodel.h @@ -43,16 +43,16 @@ QFileSystemModel* QFileSystemModel_new(); QFileSystemModel* QFileSystemModel_new2(QObject* parent); QMetaObject* QFileSystemModel_MetaObject(const QFileSystemModel* self); void* QFileSystemModel_Metacast(QFileSystemModel* self, const char* param1); -struct miqt_string* QFileSystemModel_Tr(const char* s); -struct miqt_string* QFileSystemModel_TrUtf8(const char* s); -void QFileSystemModel_RootPathChanged(QFileSystemModel* self, struct miqt_string* newPath); +struct miqt_string QFileSystemModel_Tr(const char* s); +struct miqt_string QFileSystemModel_TrUtf8(const char* s); +void QFileSystemModel_RootPathChanged(QFileSystemModel* self, struct miqt_string newPath); void QFileSystemModel_connect_RootPathChanged(QFileSystemModel* self, intptr_t slot); -void QFileSystemModel_FileRenamed(QFileSystemModel* self, struct miqt_string* path, struct miqt_string* oldName, struct miqt_string* newName); +void QFileSystemModel_FileRenamed(QFileSystemModel* self, struct miqt_string path, struct miqt_string oldName, struct miqt_string newName); void QFileSystemModel_connect_FileRenamed(QFileSystemModel* self, intptr_t slot); -void QFileSystemModel_DirectoryLoaded(QFileSystemModel* self, struct miqt_string* path); +void QFileSystemModel_DirectoryLoaded(QFileSystemModel* self, struct miqt_string path); void QFileSystemModel_connect_DirectoryLoaded(QFileSystemModel* self, intptr_t slot); QModelIndex* QFileSystemModel_Index(const QFileSystemModel* self, int row, int column); -QModelIndex* QFileSystemModel_IndexWithPath(const QFileSystemModel* self, struct miqt_string* path); +QModelIndex* QFileSystemModel_IndexWithPath(const QFileSystemModel* self, struct miqt_string path); QModelIndex* QFileSystemModel_Parent(const QFileSystemModel* self, QModelIndex* child); QModelIndex* QFileSystemModel_Sibling(const QFileSystemModel* self, int row, int column, QModelIndex* idx); bool QFileSystemModel_HasChildren(const QFileSystemModel* self); @@ -70,8 +70,8 @@ struct miqt_array* QFileSystemModel_MimeTypes(const QFileSystemModel* self); QMimeData* QFileSystemModel_MimeData(const QFileSystemModel* self, struct miqt_array* /* of QModelIndex* */ indexes); bool QFileSystemModel_DropMimeData(QFileSystemModel* self, QMimeData* data, int action, int row, int column, QModelIndex* parent); int QFileSystemModel_SupportedDropActions(const QFileSystemModel* self); -QModelIndex* QFileSystemModel_SetRootPath(QFileSystemModel* self, struct miqt_string* path); -struct miqt_string* QFileSystemModel_RootPath(const QFileSystemModel* self); +QModelIndex* QFileSystemModel_SetRootPath(QFileSystemModel* self, struct miqt_string path); +struct miqt_string QFileSystemModel_RootPath(const QFileSystemModel* self); QDir* QFileSystemModel_RootDirectory(const QFileSystemModel* self); void QFileSystemModel_SetIconProvider(QFileSystemModel* self, QFileIconProvider* provider); QFileIconProvider* QFileSystemModel_IconProvider(const QFileSystemModel* self); @@ -83,30 +83,30 @@ void QFileSystemModel_SetReadOnly(QFileSystemModel* self, bool enable); bool QFileSystemModel_IsReadOnly(const QFileSystemModel* self); void QFileSystemModel_SetNameFilterDisables(QFileSystemModel* self, bool enable); bool QFileSystemModel_NameFilterDisables(const QFileSystemModel* self); -void QFileSystemModel_SetNameFilters(QFileSystemModel* self, struct miqt_array* /* of struct miqt_string* */ filters); +void QFileSystemModel_SetNameFilters(QFileSystemModel* self, struct miqt_array* /* of struct miqt_string */ filters); struct miqt_array* QFileSystemModel_NameFilters(const QFileSystemModel* self); void QFileSystemModel_SetOption(QFileSystemModel* self, int option); bool QFileSystemModel_TestOption(const QFileSystemModel* self, int option); void QFileSystemModel_SetOptions(QFileSystemModel* self, int options); int QFileSystemModel_Options(const QFileSystemModel* self); -struct miqt_string* QFileSystemModel_FilePath(const QFileSystemModel* self, QModelIndex* index); +struct miqt_string QFileSystemModel_FilePath(const QFileSystemModel* self, QModelIndex* index); bool QFileSystemModel_IsDir(const QFileSystemModel* self, QModelIndex* index); long long QFileSystemModel_Size(const QFileSystemModel* self, QModelIndex* index); -struct miqt_string* QFileSystemModel_Type(const QFileSystemModel* self, QModelIndex* index); +struct miqt_string QFileSystemModel_Type(const QFileSystemModel* self, QModelIndex* index); QDateTime* QFileSystemModel_LastModified(const QFileSystemModel* self, QModelIndex* index); -QModelIndex* QFileSystemModel_Mkdir(QFileSystemModel* self, QModelIndex* parent, struct miqt_string* name); +QModelIndex* QFileSystemModel_Mkdir(QFileSystemModel* self, QModelIndex* parent, struct miqt_string name); bool QFileSystemModel_Rmdir(QFileSystemModel* self, QModelIndex* index); -struct miqt_string* QFileSystemModel_FileName(const QFileSystemModel* self, QModelIndex* index); +struct miqt_string QFileSystemModel_FileName(const QFileSystemModel* self, QModelIndex* index); QIcon* QFileSystemModel_FileIcon(const QFileSystemModel* self, QModelIndex* index); int QFileSystemModel_Permissions(const QFileSystemModel* self, QModelIndex* index); QFileInfo* QFileSystemModel_FileInfo(const QFileSystemModel* self, QModelIndex* index); bool QFileSystemModel_Remove(QFileSystemModel* self, QModelIndex* index); -struct miqt_string* QFileSystemModel_Tr2(const char* s, const char* c); -struct miqt_string* QFileSystemModel_Tr3(const char* s, const char* c, int n); -struct miqt_string* QFileSystemModel_TrUtf82(const char* s, const char* c); -struct miqt_string* QFileSystemModel_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QFileSystemModel_Tr2(const char* s, const char* c); +struct miqt_string QFileSystemModel_Tr3(const char* s, const char* c, int n); +struct miqt_string QFileSystemModel_TrUtf82(const char* s, const char* c); +struct miqt_string QFileSystemModel_TrUtf83(const char* s, const char* c, int n); QModelIndex* QFileSystemModel_Index3(const QFileSystemModel* self, int row, int column, QModelIndex* parent); -QModelIndex* QFileSystemModel_Index2(const QFileSystemModel* self, struct miqt_string* path, int column); +QModelIndex* QFileSystemModel_Index2(const QFileSystemModel* self, struct miqt_string path, int column); bool QFileSystemModel_HasChildren1(const QFileSystemModel* self, QModelIndex* parent); int QFileSystemModel_RowCount1(const QFileSystemModel* self, QModelIndex* parent); int QFileSystemModel_ColumnCount1(const QFileSystemModel* self, QModelIndex* parent); diff --git a/qt/gen_qfilesystemwatcher.cpp b/qt/gen_qfilesystemwatcher.cpp index bf9871c4..5c455e33 100644 --- a/qt/gen_qfilesystemwatcher.cpp +++ b/qt/gen_qfilesystemwatcher.cpp @@ -13,12 +13,12 @@ QFileSystemWatcher* QFileSystemWatcher_new() { return new QFileSystemWatcher(); } -QFileSystemWatcher* QFileSystemWatcher_new2(struct miqt_array* /* of struct miqt_string* */ paths) { +QFileSystemWatcher* QFileSystemWatcher_new2(struct miqt_array* /* of struct miqt_string */ paths) { QStringList paths_QList; paths_QList.reserve(paths->len); - struct miqt_string** paths_arr = static_cast(paths->data); + struct miqt_string* paths_arr = static_cast(paths->data); for(size_t i = 0; i < paths->len; ++i) { - QString paths_arr_i_QString = QString::fromUtf8(&paths_arr[i]->data, paths_arr[i]->len); + QString paths_arr_i_QString = QString::fromUtf8(paths_arr[i].data, paths_arr[i].len); paths_QList.push_back(paths_arr_i_QString); } return new QFileSystemWatcher(paths_QList); @@ -28,12 +28,12 @@ QFileSystemWatcher* QFileSystemWatcher_new3(QObject* parent) { return new QFileSystemWatcher(parent); } -QFileSystemWatcher* QFileSystemWatcher_new4(struct miqt_array* /* of struct miqt_string* */ paths, QObject* parent) { +QFileSystemWatcher* QFileSystemWatcher_new4(struct miqt_array* /* of struct miqt_string */ paths, QObject* parent) { QStringList paths_QList; paths_QList.reserve(paths->len); - struct miqt_string** paths_arr = static_cast(paths->data); + struct miqt_string* paths_arr = static_cast(paths->data); for(size_t i = 0; i < paths->len; ++i) { - QString paths_arr_i_QString = QString::fromUtf8(&paths_arr[i]->data, paths_arr[i]->len); + QString paths_arr_i_QString = QString::fromUtf8(paths_arr[i].data, paths_arr[i].len); paths_QList.push_back(paths_arr_i_QString); } return new QFileSystemWatcher(paths_QList, parent); @@ -47,41 +47,53 @@ void* QFileSystemWatcher_Metacast(QFileSystemWatcher* self, const char* param1) return self->qt_metacast(param1); } -struct miqt_string* QFileSystemWatcher_Tr(const char* s) { +struct miqt_string QFileSystemWatcher_Tr(const char* s) { QString _ret = QFileSystemWatcher::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFileSystemWatcher_TrUtf8(const char* s) { +struct miqt_string QFileSystemWatcher_TrUtf8(const char* s) { QString _ret = QFileSystemWatcher::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -bool QFileSystemWatcher_AddPath(QFileSystemWatcher* self, struct miqt_string* file) { - QString file_QString = QString::fromUtf8(&file->data, file->len); +bool QFileSystemWatcher_AddPath(QFileSystemWatcher* self, struct miqt_string file) { + QString file_QString = QString::fromUtf8(file.data, file.len); return self->addPath(file_QString); } -struct miqt_array* QFileSystemWatcher_AddPaths(QFileSystemWatcher* self, struct miqt_array* /* of struct miqt_string* */ files) { +struct miqt_array* QFileSystemWatcher_AddPaths(QFileSystemWatcher* self, struct miqt_array* /* of struct miqt_string */ files) { QStringList files_QList; files_QList.reserve(files->len); - struct miqt_string** files_arr = static_cast(files->data); + struct miqt_string* files_arr = static_cast(files->data); for(size_t i = 0; i < files->len; ++i) { - QString files_arr_i_QString = QString::fromUtf8(&files_arr[i]->data, files_arr[i]->len); + QString files_arr_i_QString = QString::fromUtf8(files_arr[i].data, files_arr[i].len); files_QList.push_back(files_arr_i_QString); } QStringList _ret = self->addPaths(files_QList); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -89,27 +101,31 @@ struct miqt_array* QFileSystemWatcher_AddPaths(QFileSystemWatcher* self, struct return _out; } -bool QFileSystemWatcher_RemovePath(QFileSystemWatcher* self, struct miqt_string* file) { - QString file_QString = QString::fromUtf8(&file->data, file->len); +bool QFileSystemWatcher_RemovePath(QFileSystemWatcher* self, struct miqt_string file) { + QString file_QString = QString::fromUtf8(file.data, file.len); return self->removePath(file_QString); } -struct miqt_array* QFileSystemWatcher_RemovePaths(QFileSystemWatcher* self, struct miqt_array* /* of struct miqt_string* */ files) { +struct miqt_array* QFileSystemWatcher_RemovePaths(QFileSystemWatcher* self, struct miqt_array* /* of struct miqt_string */ files) { QStringList files_QList; files_QList.reserve(files->len); - struct miqt_string** files_arr = static_cast(files->data); + struct miqt_string* files_arr = static_cast(files->data); for(size_t i = 0; i < files->len; ++i) { - QString files_arr_i_QString = QString::fromUtf8(&files_arr[i]->data, files_arr[i]->len); + QString files_arr_i_QString = QString::fromUtf8(files_arr[i].data, files_arr[i].len); files_QList.push_back(files_arr_i_QString); } QStringList _ret = self->removePaths(files_QList); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -120,12 +136,16 @@ struct miqt_array* QFileSystemWatcher_RemovePaths(QFileSystemWatcher* self, stru struct miqt_array* QFileSystemWatcher_Files(const QFileSystemWatcher* self) { QStringList _ret = self->files(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -136,12 +156,16 @@ struct miqt_array* QFileSystemWatcher_Files(const QFileSystemWatcher* self) { struct miqt_array* QFileSystemWatcher_Directories(const QFileSystemWatcher* self) { QStringList _ret = self->directories(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -149,32 +173,48 @@ struct miqt_array* QFileSystemWatcher_Directories(const QFileSystemWatcher* self return _out; } -struct miqt_string* QFileSystemWatcher_Tr2(const char* s, const char* c) { +struct miqt_string QFileSystemWatcher_Tr2(const char* s, const char* c) { QString _ret = QFileSystemWatcher::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFileSystemWatcher_Tr3(const char* s, const char* c, int n) { +struct miqt_string QFileSystemWatcher_Tr3(const char* s, const char* c, int n) { QString _ret = QFileSystemWatcher::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFileSystemWatcher_TrUtf82(const char* s, const char* c) { +struct miqt_string QFileSystemWatcher_TrUtf82(const char* s, const char* c) { QString _ret = QFileSystemWatcher::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFileSystemWatcher_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QFileSystemWatcher_TrUtf83(const char* s, const char* c, int n) { QString _ret = QFileSystemWatcher::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QFileSystemWatcher_Delete(QFileSystemWatcher* self) { diff --git a/qt/gen_qfilesystemwatcher.go b/qt/gen_qfilesystemwatcher.go index 7d74c9f3..6c8969cd 100644 --- a/qt/gen_qfilesystemwatcher.go +++ b/qt/gen_qfilesystemwatcher.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -53,12 +52,14 @@ func NewQFileSystemWatcher() *QFileSystemWatcher { // NewQFileSystemWatcher2 constructs a new QFileSystemWatcher object. func NewQFileSystemWatcher2(paths []string) *QFileSystemWatcher { // For the C ABI, malloc a C array of raw pointers - paths_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(paths)))) + paths_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(paths)))) defer C.free(unsafe.Pointer(paths_CArray)) for i := range paths { - paths_i_ms := libmiqt.Strdupg(paths[i]) - defer C.free(paths_i_ms) - paths_CArray[i] = (*C.struct_miqt_string)(paths_i_ms) + paths_i_ms := C.struct_miqt_string{} + paths_i_ms.data = C.CString(paths[i]) + paths_i_ms.len = C.size_t(len(paths[i])) + defer C.free(unsafe.Pointer(paths_i_ms.data)) + paths_CArray[i] = paths_i_ms } paths_ma := &C.struct_miqt_array{len: C.size_t(len(paths)), data: unsafe.Pointer(paths_CArray)} defer runtime.KeepAlive(unsafe.Pointer(paths_ma)) @@ -75,12 +76,14 @@ func NewQFileSystemWatcher3(parent *QObject) *QFileSystemWatcher { // NewQFileSystemWatcher4 constructs a new QFileSystemWatcher object. func NewQFileSystemWatcher4(paths []string, parent *QObject) *QFileSystemWatcher { // For the C ABI, malloc a C array of raw pointers - paths_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(paths)))) + paths_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(paths)))) defer C.free(unsafe.Pointer(paths_CArray)) for i := range paths { - paths_i_ms := libmiqt.Strdupg(paths[i]) - defer C.free(paths_i_ms) - paths_CArray[i] = (*C.struct_miqt_string)(paths_i_ms) + paths_i_ms := C.struct_miqt_string{} + paths_i_ms.data = C.CString(paths[i]) + paths_i_ms.len = C.size_t(len(paths[i])) + defer C.free(unsafe.Pointer(paths_i_ms.data)) + paths_CArray[i] = paths_i_ms } paths_ma := &C.struct_miqt_array{len: C.size_t(len(paths)), data: unsafe.Pointer(paths_CArray)} defer runtime.KeepAlive(unsafe.Pointer(paths_ma)) @@ -95,51 +98,55 @@ func (this *QFileSystemWatcher) MetaObject() *QMetaObject { func (this *QFileSystemWatcher) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QFileSystemWatcher_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QFileSystemWatcher_Metacast(this.h, param1_Cstring)) } func QFileSystemWatcher_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QFileSystemWatcher_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFileSystemWatcher_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QFileSystemWatcher_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QFileSystemWatcher_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFileSystemWatcher_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QFileSystemWatcher) AddPath(file string) bool { - file_ms := libmiqt.Strdupg(file) - defer C.free(file_ms) - return (bool)(C.QFileSystemWatcher_AddPath(this.h, (*C.struct_miqt_string)(file_ms))) + file_ms := C.struct_miqt_string{} + file_ms.data = C.CString(file) + file_ms.len = C.size_t(len(file)) + defer C.free(unsafe.Pointer(file_ms.data)) + return (bool)(C.QFileSystemWatcher_AddPath(this.h, file_ms)) } func (this *QFileSystemWatcher) AddPaths(files []string) []string { // For the C ABI, malloc a C array of raw pointers - files_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(files)))) + files_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(files)))) defer C.free(unsafe.Pointer(files_CArray)) for i := range files { - files_i_ms := libmiqt.Strdupg(files[i]) - defer C.free(files_i_ms) - files_CArray[i] = (*C.struct_miqt_string)(files_i_ms) + files_i_ms := C.struct_miqt_string{} + files_i_ms.data = C.CString(files[i]) + files_i_ms.len = C.size_t(len(files[i])) + defer C.free(unsafe.Pointer(files_i_ms.data)) + files_CArray[i] = files_i_ms } files_ma := &C.struct_miqt_array{len: C.size_t(len(files)), data: unsafe.Pointer(files_CArray)} defer runtime.KeepAlive(unsafe.Pointer(files_ma)) var _ma *C.struct_miqt_array = C.QFileSystemWatcher_AddPaths(this.h, files_ma) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -147,29 +154,33 @@ func (this *QFileSystemWatcher) AddPaths(files []string) []string { } func (this *QFileSystemWatcher) RemovePath(file string) bool { - file_ms := libmiqt.Strdupg(file) - defer C.free(file_ms) - return (bool)(C.QFileSystemWatcher_RemovePath(this.h, (*C.struct_miqt_string)(file_ms))) + file_ms := C.struct_miqt_string{} + file_ms.data = C.CString(file) + file_ms.len = C.size_t(len(file)) + defer C.free(unsafe.Pointer(file_ms.data)) + return (bool)(C.QFileSystemWatcher_RemovePath(this.h, file_ms)) } func (this *QFileSystemWatcher) RemovePaths(files []string) []string { // For the C ABI, malloc a C array of raw pointers - files_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(files)))) + files_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(files)))) defer C.free(unsafe.Pointer(files_CArray)) for i := range files { - files_i_ms := libmiqt.Strdupg(files[i]) - defer C.free(files_i_ms) - files_CArray[i] = (*C.struct_miqt_string)(files_i_ms) + files_i_ms := C.struct_miqt_string{} + files_i_ms.data = C.CString(files[i]) + files_i_ms.len = C.size_t(len(files[i])) + defer C.free(unsafe.Pointer(files_i_ms.data)) + files_CArray[i] = files_i_ms } files_ma := &C.struct_miqt_array{len: C.size_t(len(files)), data: unsafe.Pointer(files_CArray)} defer runtime.KeepAlive(unsafe.Pointer(files_ma)) var _ma *C.struct_miqt_array = C.QFileSystemWatcher_RemovePaths(this.h, files_ma) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -179,11 +190,11 @@ func (this *QFileSystemWatcher) RemovePaths(files []string) []string { func (this *QFileSystemWatcher) Files() []string { var _ma *C.struct_miqt_array = C.QFileSystemWatcher_Files(this.h) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -193,11 +204,11 @@ func (this *QFileSystemWatcher) Files() []string { func (this *QFileSystemWatcher) Directories() []string { var _ma *C.struct_miqt_array = C.QFileSystemWatcher_Directories(this.h) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -209,9 +220,9 @@ func QFileSystemWatcher_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFileSystemWatcher_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFileSystemWatcher_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -220,9 +231,9 @@ func QFileSystemWatcher_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFileSystemWatcher_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFileSystemWatcher_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -231,9 +242,9 @@ func QFileSystemWatcher_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFileSystemWatcher_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFileSystemWatcher_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -242,9 +253,9 @@ func QFileSystemWatcher_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFileSystemWatcher_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFileSystemWatcher_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qfilesystemwatcher.h b/qt/gen_qfilesystemwatcher.h index 782c8694..f435e322 100644 --- a/qt/gen_qfilesystemwatcher.h +++ b/qt/gen_qfilesystemwatcher.h @@ -24,23 +24,23 @@ typedef struct QObject QObject; #endif QFileSystemWatcher* QFileSystemWatcher_new(); -QFileSystemWatcher* QFileSystemWatcher_new2(struct miqt_array* /* of struct miqt_string* */ paths); +QFileSystemWatcher* QFileSystemWatcher_new2(struct miqt_array* /* of struct miqt_string */ paths); QFileSystemWatcher* QFileSystemWatcher_new3(QObject* parent); -QFileSystemWatcher* QFileSystemWatcher_new4(struct miqt_array* /* of struct miqt_string* */ paths, QObject* parent); +QFileSystemWatcher* QFileSystemWatcher_new4(struct miqt_array* /* of struct miqt_string */ paths, QObject* parent); QMetaObject* QFileSystemWatcher_MetaObject(const QFileSystemWatcher* self); void* QFileSystemWatcher_Metacast(QFileSystemWatcher* self, const char* param1); -struct miqt_string* QFileSystemWatcher_Tr(const char* s); -struct miqt_string* QFileSystemWatcher_TrUtf8(const char* s); -bool QFileSystemWatcher_AddPath(QFileSystemWatcher* self, struct miqt_string* file); -struct miqt_array* QFileSystemWatcher_AddPaths(QFileSystemWatcher* self, struct miqt_array* /* of struct miqt_string* */ files); -bool QFileSystemWatcher_RemovePath(QFileSystemWatcher* self, struct miqt_string* file); -struct miqt_array* QFileSystemWatcher_RemovePaths(QFileSystemWatcher* self, struct miqt_array* /* of struct miqt_string* */ files); +struct miqt_string QFileSystemWatcher_Tr(const char* s); +struct miqt_string QFileSystemWatcher_TrUtf8(const char* s); +bool QFileSystemWatcher_AddPath(QFileSystemWatcher* self, struct miqt_string file); +struct miqt_array* QFileSystemWatcher_AddPaths(QFileSystemWatcher* self, struct miqt_array* /* of struct miqt_string */ files); +bool QFileSystemWatcher_RemovePath(QFileSystemWatcher* self, struct miqt_string file); +struct miqt_array* QFileSystemWatcher_RemovePaths(QFileSystemWatcher* self, struct miqt_array* /* of struct miqt_string */ files); struct miqt_array* QFileSystemWatcher_Files(const QFileSystemWatcher* self); struct miqt_array* QFileSystemWatcher_Directories(const QFileSystemWatcher* self); -struct miqt_string* QFileSystemWatcher_Tr2(const char* s, const char* c); -struct miqt_string* QFileSystemWatcher_Tr3(const char* s, const char* c, int n); -struct miqt_string* QFileSystemWatcher_TrUtf82(const char* s, const char* c); -struct miqt_string* QFileSystemWatcher_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QFileSystemWatcher_Tr2(const char* s, const char* c); +struct miqt_string QFileSystemWatcher_Tr3(const char* s, const char* c, int n); +struct miqt_string QFileSystemWatcher_TrUtf82(const char* s, const char* c); +struct miqt_string QFileSystemWatcher_TrUtf83(const char* s, const char* c, int n); void QFileSystemWatcher_Delete(QFileSystemWatcher* self); #ifdef __cplusplus diff --git a/qt/gen_qfinalstate.cpp b/qt/gen_qfinalstate.cpp index dc77c3cb..d56a778b 100644 --- a/qt/gen_qfinalstate.cpp +++ b/qt/gen_qfinalstate.cpp @@ -24,46 +24,70 @@ void* QFinalState_Metacast(QFinalState* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QFinalState_Tr(const char* s) { +struct miqt_string QFinalState_Tr(const char* s) { QString _ret = QFinalState::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFinalState_TrUtf8(const char* s) { +struct miqt_string QFinalState_TrUtf8(const char* s) { QString _ret = QFinalState::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFinalState_Tr2(const char* s, const char* c) { +struct miqt_string QFinalState_Tr2(const char* s, const char* c) { QString _ret = QFinalState::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFinalState_Tr3(const char* s, const char* c, int n) { +struct miqt_string QFinalState_Tr3(const char* s, const char* c, int n) { QString _ret = QFinalState::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFinalState_TrUtf82(const char* s, const char* c) { +struct miqt_string QFinalState_TrUtf82(const char* s, const char* c) { QString _ret = QFinalState::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFinalState_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QFinalState_TrUtf83(const char* s, const char* c, int n) { QString _ret = QFinalState::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QFinalState_Delete(QFinalState* self) { diff --git a/qt/gen_qfinalstate.go b/qt/gen_qfinalstate.go index d84ba934..61eef25b 100644 --- a/qt/gen_qfinalstate.go +++ b/qt/gen_qfinalstate.go @@ -62,24 +62,24 @@ func (this *QFinalState) MetaObject() *QMetaObject { func (this *QFinalState) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QFinalState_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QFinalState_Metacast(this.h, param1_Cstring)) } func QFinalState_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QFinalState_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFinalState_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QFinalState_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QFinalState_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFinalState_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -88,9 +88,9 @@ func QFinalState_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFinalState_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFinalState_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -99,9 +99,9 @@ func QFinalState_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFinalState_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFinalState_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -110,9 +110,9 @@ func QFinalState_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFinalState_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFinalState_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -121,9 +121,9 @@ func QFinalState_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFinalState_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFinalState_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qfinalstate.h b/qt/gen_qfinalstate.h index 0f68036a..6fba79f0 100644 --- a/qt/gen_qfinalstate.h +++ b/qt/gen_qfinalstate.h @@ -27,12 +27,12 @@ QFinalState* QFinalState_new(); QFinalState* QFinalState_new2(QState* parent); QMetaObject* QFinalState_MetaObject(const QFinalState* self); void* QFinalState_Metacast(QFinalState* self, const char* param1); -struct miqt_string* QFinalState_Tr(const char* s); -struct miqt_string* QFinalState_TrUtf8(const char* s); -struct miqt_string* QFinalState_Tr2(const char* s, const char* c); -struct miqt_string* QFinalState_Tr3(const char* s, const char* c, int n); -struct miqt_string* QFinalState_TrUtf82(const char* s, const char* c); -struct miqt_string* QFinalState_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QFinalState_Tr(const char* s); +struct miqt_string QFinalState_TrUtf8(const char* s); +struct miqt_string QFinalState_Tr2(const char* s, const char* c); +struct miqt_string QFinalState_Tr3(const char* s, const char* c, int n); +struct miqt_string QFinalState_TrUtf82(const char* s, const char* c); +struct miqt_string QFinalState_TrUtf83(const char* s, const char* c, int n); void QFinalState_Delete(QFinalState* self); #ifdef __cplusplus diff --git a/qt/gen_qfocusframe.cpp b/qt/gen_qfocusframe.cpp index 1f0af4fd..9138603e 100644 --- a/qt/gen_qfocusframe.cpp +++ b/qt/gen_qfocusframe.cpp @@ -24,18 +24,26 @@ void* QFocusFrame_Metacast(QFocusFrame* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QFocusFrame_Tr(const char* s) { +struct miqt_string QFocusFrame_Tr(const char* s) { QString _ret = QFocusFrame::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFocusFrame_TrUtf8(const char* s) { +struct miqt_string QFocusFrame_TrUtf8(const char* s) { QString _ret = QFocusFrame::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QFocusFrame_SetWidget(QFocusFrame* self, QWidget* widget) { @@ -46,32 +54,48 @@ QWidget* QFocusFrame_Widget(const QFocusFrame* self) { return self->widget(); } -struct miqt_string* QFocusFrame_Tr2(const char* s, const char* c) { +struct miqt_string QFocusFrame_Tr2(const char* s, const char* c) { QString _ret = QFocusFrame::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFocusFrame_Tr3(const char* s, const char* c, int n) { +struct miqt_string QFocusFrame_Tr3(const char* s, const char* c, int n) { QString _ret = QFocusFrame::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFocusFrame_TrUtf82(const char* s, const char* c) { +struct miqt_string QFocusFrame_TrUtf82(const char* s, const char* c) { QString _ret = QFocusFrame::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFocusFrame_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QFocusFrame_TrUtf83(const char* s, const char* c, int n) { QString _ret = QFocusFrame::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QFocusFrame_Delete(QFocusFrame* self) { diff --git a/qt/gen_qfocusframe.go b/qt/gen_qfocusframe.go index 4760b8f2..8998d277 100644 --- a/qt/gen_qfocusframe.go +++ b/qt/gen_qfocusframe.go @@ -62,24 +62,24 @@ func (this *QFocusFrame) MetaObject() *QMetaObject { func (this *QFocusFrame) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QFocusFrame_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QFocusFrame_Metacast(this.h, param1_Cstring)) } func QFocusFrame_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QFocusFrame_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFocusFrame_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QFocusFrame_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QFocusFrame_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFocusFrame_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -96,9 +96,9 @@ func QFocusFrame_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFocusFrame_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFocusFrame_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -107,9 +107,9 @@ func QFocusFrame_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFocusFrame_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFocusFrame_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -118,9 +118,9 @@ func QFocusFrame_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFocusFrame_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFocusFrame_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -129,9 +129,9 @@ func QFocusFrame_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFocusFrame_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFocusFrame_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qfocusframe.h b/qt/gen_qfocusframe.h index 426bb97f..5daa2165 100644 --- a/qt/gen_qfocusframe.h +++ b/qt/gen_qfocusframe.h @@ -27,14 +27,14 @@ QFocusFrame* QFocusFrame_new(); QFocusFrame* QFocusFrame_new2(QWidget* parent); QMetaObject* QFocusFrame_MetaObject(const QFocusFrame* self); void* QFocusFrame_Metacast(QFocusFrame* self, const char* param1); -struct miqt_string* QFocusFrame_Tr(const char* s); -struct miqt_string* QFocusFrame_TrUtf8(const char* s); +struct miqt_string QFocusFrame_Tr(const char* s); +struct miqt_string QFocusFrame_TrUtf8(const char* s); void QFocusFrame_SetWidget(QFocusFrame* self, QWidget* widget); QWidget* QFocusFrame_Widget(const QFocusFrame* self); -struct miqt_string* QFocusFrame_Tr2(const char* s, const char* c); -struct miqt_string* QFocusFrame_Tr3(const char* s, const char* c, int n); -struct miqt_string* QFocusFrame_TrUtf82(const char* s, const char* c); -struct miqt_string* QFocusFrame_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QFocusFrame_Tr2(const char* s, const char* c); +struct miqt_string QFocusFrame_Tr3(const char* s, const char* c, int n); +struct miqt_string QFocusFrame_TrUtf82(const char* s, const char* c); +struct miqt_string QFocusFrame_TrUtf83(const char* s, const char* c, int n); void QFocusFrame_Delete(QFocusFrame* self); #ifdef __cplusplus diff --git a/qt/gen_qfont.cpp b/qt/gen_qfont.cpp index 462f98b2..b411df63 100644 --- a/qt/gen_qfont.cpp +++ b/qt/gen_qfont.cpp @@ -12,8 +12,8 @@ QFont* QFont_new() { return new QFont(); } -QFont* QFont_new2(struct miqt_string* family) { - QString family_QString = QString::fromUtf8(&family->data, family->len); +QFont* QFont_new2(struct miqt_string family) { + QString family_QString = QString::fromUtf8(family.data, family.len); return new QFont(family_QString); } @@ -29,18 +29,18 @@ QFont* QFont_new5(QFont* font) { return new QFont(*font); } -QFont* QFont_new6(struct miqt_string* family, int pointSize) { - QString family_QString = QString::fromUtf8(&family->data, family->len); +QFont* QFont_new6(struct miqt_string family, int pointSize) { + QString family_QString = QString::fromUtf8(family.data, family.len); return new QFont(family_QString, static_cast(pointSize)); } -QFont* QFont_new7(struct miqt_string* family, int pointSize, int weight) { - QString family_QString = QString::fromUtf8(&family->data, family->len); +QFont* QFont_new7(struct miqt_string family, int pointSize, int weight) { + QString family_QString = QString::fromUtf8(family.data, family.len); return new QFont(family_QString, static_cast(pointSize), static_cast(weight)); } -QFont* QFont_new8(struct miqt_string* family, int pointSize, int weight, bool italic) { - QString family_QString = QString::fromUtf8(&family->data, family->len); +QFont* QFont_new8(struct miqt_string family, int pointSize, int weight, bool italic) { + QString family_QString = QString::fromUtf8(family.data, family.len); return new QFont(family_QString, static_cast(pointSize), static_cast(weight), italic); } @@ -48,27 +48,35 @@ void QFont_Swap(QFont* self, QFont* other) { self->swap(*other); } -struct miqt_string* QFont_Family(const QFont* self) { +struct miqt_string QFont_Family(const QFont* self) { QString _ret = self->family(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QFont_SetFamily(QFont* self, struct miqt_string* family) { - QString family_QString = QString::fromUtf8(&family->data, family->len); +void QFont_SetFamily(QFont* self, struct miqt_string family) { + QString family_QString = QString::fromUtf8(family.data, family.len); self->setFamily(family_QString); } struct miqt_array* QFont_Families(const QFont* self) { QStringList _ret = self->families(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -76,26 +84,30 @@ struct miqt_array* QFont_Families(const QFont* self) { return _out; } -void QFont_SetFamilies(QFont* self, struct miqt_array* /* of struct miqt_string* */ families) { +void QFont_SetFamilies(QFont* self, struct miqt_array* /* of struct miqt_string */ families) { QStringList families_QList; families_QList.reserve(families->len); - struct miqt_string** families_arr = static_cast(families->data); + struct miqt_string* families_arr = static_cast(families->data); for(size_t i = 0; i < families->len; ++i) { - QString families_arr_i_QString = QString::fromUtf8(&families_arr[i]->data, families_arr[i]->len); + QString families_arr_i_QString = QString::fromUtf8(families_arr[i].data, families_arr[i].len); families_QList.push_back(families_arr_i_QString); } self->setFamilies(families_QList); } -struct miqt_string* QFont_StyleName(const QFont* self) { +struct miqt_string QFont_StyleName(const QFont* self) { QString _ret = self->styleName(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QFont_SetStyleName(QFont* self, struct miqt_string* styleName) { - QString styleName_QString = QString::fromUtf8(&styleName->data, styleName->len); +void QFont_SetStyleName(QFont* self, struct miqt_string styleName) { + QString styleName_QString = QString::fromUtf8(styleName.data, styleName.len); self->setStyleName(styleName_QString); } @@ -296,55 +308,75 @@ bool QFont_IsCopyOf(const QFont* self, QFont* param1) { return self->isCopyOf(*param1); } -void QFont_SetRawName(QFont* self, struct miqt_string* rawName) { - QString rawName_QString = QString::fromUtf8(&rawName->data, rawName->len); +void QFont_SetRawName(QFont* self, struct miqt_string rawName) { + QString rawName_QString = QString::fromUtf8(rawName.data, rawName.len); self->setRawName(rawName_QString); } -struct miqt_string* QFont_RawName(const QFont* self) { +struct miqt_string QFont_RawName(const QFont* self) { QString _ret = self->rawName(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFont_Key(const QFont* self) { +struct miqt_string QFont_Key(const QFont* self) { QString _ret = self->key(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFont_ToString(const QFont* self) { +struct miqt_string QFont_ToString(const QFont* self) { QString _ret = self->toString(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -bool QFont_FromString(QFont* self, struct miqt_string* param1) { - QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); +bool QFont_FromString(QFont* self, struct miqt_string param1) { + QString param1_QString = QString::fromUtf8(param1.data, param1.len); return self->fromString(param1_QString); } -struct miqt_string* QFont_Substitute(struct miqt_string* param1) { - QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); +struct miqt_string QFont_Substitute(struct miqt_string param1) { + QString param1_QString = QString::fromUtf8(param1.data, param1.len); QString _ret = QFont::substitute(param1_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_array* QFont_Substitutes(struct miqt_string* param1) { - QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); +struct miqt_array* QFont_Substitutes(struct miqt_string param1) { + QString param1_QString = QString::fromUtf8(param1.data, param1.len); QStringList _ret = QFont::substitutes(param1_QString); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -355,12 +387,16 @@ struct miqt_array* QFont_Substitutes(struct miqt_string* param1) { struct miqt_array* QFont_Substitutions() { QStringList _ret = QFont::substitutions(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -368,26 +404,26 @@ struct miqt_array* QFont_Substitutions() { return _out; } -void QFont_InsertSubstitution(struct miqt_string* param1, struct miqt_string* param2) { - QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); - QString param2_QString = QString::fromUtf8(¶m2->data, param2->len); +void QFont_InsertSubstitution(struct miqt_string param1, struct miqt_string param2) { + QString param1_QString = QString::fromUtf8(param1.data, param1.len); + QString param2_QString = QString::fromUtf8(param2.data, param2.len); QFont::insertSubstitution(param1_QString, param2_QString); } -void QFont_InsertSubstitutions(struct miqt_string* param1, struct miqt_array* /* of struct miqt_string* */ param2) { - QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); +void QFont_InsertSubstitutions(struct miqt_string param1, struct miqt_array* /* of struct miqt_string */ param2) { + QString param1_QString = QString::fromUtf8(param1.data, param1.len); QStringList param2_QList; param2_QList.reserve(param2->len); - struct miqt_string** param2_arr = static_cast(param2->data); + struct miqt_string* param2_arr = static_cast(param2->data); for(size_t i = 0; i < param2->len; ++i) { - QString param2_arr_i_QString = QString::fromUtf8(¶m2_arr[i]->data, param2_arr[i]->len); + QString param2_arr_i_QString = QString::fromUtf8(param2_arr[i].data, param2_arr[i].len); param2_QList.push_back(param2_arr_i_QString); } QFont::insertSubstitutions(param1_QString, param2_QList); } -void QFont_RemoveSubstitutions(struct miqt_string* param1) { - QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); +void QFont_RemoveSubstitutions(struct miqt_string param1) { + QString param1_QString = QString::fromUtf8(param1.data, param1.len); QFont::removeSubstitutions(param1_QString); } @@ -403,25 +439,37 @@ void QFont_CacheStatistics() { QFont::cacheStatistics(); } -struct miqt_string* QFont_DefaultFamily(const QFont* self) { +struct miqt_string QFont_DefaultFamily(const QFont* self) { QString _ret = self->defaultFamily(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFont_LastResortFamily(const QFont* self) { +struct miqt_string QFont_LastResortFamily(const QFont* self) { QString _ret = self->lastResortFamily(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFont_LastResortFont(const QFont* self) { +struct miqt_string QFont_LastResortFont(const QFont* self) { QString _ret = self->lastResortFont(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QFont* QFont_Resolve(const QFont* self, QFont* param1) { diff --git a/qt/gen_qfont.go b/qt/gen_qfont.go index 973d9c7d..d5ee0000 100644 --- a/qt/gen_qfont.go +++ b/qt/gen_qfont.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -176,9 +175,11 @@ func NewQFont() *QFont { // NewQFont2 constructs a new QFont object. func NewQFont2(family string) *QFont { - family_ms := libmiqt.Strdupg(family) - defer C.free(family_ms) - ret := C.QFont_new2((*C.struct_miqt_string)(family_ms)) + family_ms := C.struct_miqt_string{} + family_ms.data = C.CString(family) + family_ms.len = C.size_t(len(family)) + defer C.free(unsafe.Pointer(family_ms.data)) + ret := C.QFont_new2(family_ms) return newQFont(ret) } @@ -202,25 +203,31 @@ func NewQFont5(font *QFont) *QFont { // NewQFont6 constructs a new QFont object. func NewQFont6(family string, pointSize int) *QFont { - family_ms := libmiqt.Strdupg(family) - defer C.free(family_ms) - ret := C.QFont_new6((*C.struct_miqt_string)(family_ms), (C.int)(pointSize)) + family_ms := C.struct_miqt_string{} + family_ms.data = C.CString(family) + family_ms.len = C.size_t(len(family)) + defer C.free(unsafe.Pointer(family_ms.data)) + ret := C.QFont_new6(family_ms, (C.int)(pointSize)) return newQFont(ret) } // NewQFont7 constructs a new QFont object. func NewQFont7(family string, pointSize int, weight int) *QFont { - family_ms := libmiqt.Strdupg(family) - defer C.free(family_ms) - ret := C.QFont_new7((*C.struct_miqt_string)(family_ms), (C.int)(pointSize), (C.int)(weight)) + family_ms := C.struct_miqt_string{} + family_ms.data = C.CString(family) + family_ms.len = C.size_t(len(family)) + defer C.free(unsafe.Pointer(family_ms.data)) + ret := C.QFont_new7(family_ms, (C.int)(pointSize), (C.int)(weight)) return newQFont(ret) } // NewQFont8 constructs a new QFont object. func NewQFont8(family string, pointSize int, weight int, italic bool) *QFont { - family_ms := libmiqt.Strdupg(family) - defer C.free(family_ms) - ret := C.QFont_new8((*C.struct_miqt_string)(family_ms), (C.int)(pointSize), (C.int)(weight), (C.bool)(italic)) + family_ms := C.struct_miqt_string{} + family_ms.data = C.CString(family) + family_ms.len = C.size_t(len(family)) + defer C.free(unsafe.Pointer(family_ms.data)) + ret := C.QFont_new8(family_ms, (C.int)(pointSize), (C.int)(weight), (C.bool)(italic)) return newQFont(ret) } @@ -229,26 +236,28 @@ func (this *QFont) Swap(other *QFont) { } func (this *QFont) Family() string { - var _ms *C.struct_miqt_string = C.QFont_Family(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFont_Family(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QFont) SetFamily(family string) { - family_ms := libmiqt.Strdupg(family) - defer C.free(family_ms) - C.QFont_SetFamily(this.h, (*C.struct_miqt_string)(family_ms)) + family_ms := C.struct_miqt_string{} + family_ms.data = C.CString(family) + family_ms.len = C.size_t(len(family)) + defer C.free(unsafe.Pointer(family_ms.data)) + C.QFont_SetFamily(this.h, family_ms) } func (this *QFont) Families() []string { var _ma *C.struct_miqt_array = C.QFont_Families(this.h) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -257,12 +266,14 @@ func (this *QFont) Families() []string { func (this *QFont) SetFamilies(families []string) { // For the C ABI, malloc a C array of raw pointers - families_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(families)))) + families_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(families)))) defer C.free(unsafe.Pointer(families_CArray)) for i := range families { - families_i_ms := libmiqt.Strdupg(families[i]) - defer C.free(families_i_ms) - families_CArray[i] = (*C.struct_miqt_string)(families_i_ms) + families_i_ms := C.struct_miqt_string{} + families_i_ms.data = C.CString(families[i]) + families_i_ms.len = C.size_t(len(families[i])) + defer C.free(unsafe.Pointer(families_i_ms.data)) + families_CArray[i] = families_i_ms } families_ma := &C.struct_miqt_array{len: C.size_t(len(families)), data: unsafe.Pointer(families_CArray)} defer runtime.KeepAlive(unsafe.Pointer(families_ma)) @@ -270,16 +281,18 @@ func (this *QFont) SetFamilies(families []string) { } func (this *QFont) StyleName() string { - var _ms *C.struct_miqt_string = C.QFont_StyleName(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFont_StyleName(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QFont) SetStyleName(styleName string) { - styleName_ms := libmiqt.Strdupg(styleName) - defer C.free(styleName_ms) - C.QFont_SetStyleName(this.h, (*C.struct_miqt_string)(styleName_ms)) + styleName_ms := C.struct_miqt_string{} + styleName_ms.data = C.CString(styleName) + styleName_ms.len = C.size_t(len(styleName)) + defer C.free(unsafe.Pointer(styleName_ms.data)) + C.QFont_SetStyleName(this.h, styleName_ms) } func (this *QFont) PointSize() int { @@ -471,57 +484,65 @@ func (this *QFont) IsCopyOf(param1 *QFont) bool { } func (this *QFont) SetRawName(rawName string) { - rawName_ms := libmiqt.Strdupg(rawName) - defer C.free(rawName_ms) - C.QFont_SetRawName(this.h, (*C.struct_miqt_string)(rawName_ms)) + rawName_ms := C.struct_miqt_string{} + rawName_ms.data = C.CString(rawName) + rawName_ms.len = C.size_t(len(rawName)) + defer C.free(unsafe.Pointer(rawName_ms.data)) + C.QFont_SetRawName(this.h, rawName_ms) } func (this *QFont) RawName() string { - var _ms *C.struct_miqt_string = C.QFont_RawName(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFont_RawName(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QFont) Key() string { - var _ms *C.struct_miqt_string = C.QFont_Key(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFont_Key(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QFont) ToString() string { - var _ms *C.struct_miqt_string = C.QFont_ToString(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFont_ToString(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QFont) FromString(param1 string) bool { - param1_ms := libmiqt.Strdupg(param1) - defer C.free(param1_ms) - return (bool)(C.QFont_FromString(this.h, (*C.struct_miqt_string)(param1_ms))) + param1_ms := C.struct_miqt_string{} + param1_ms.data = C.CString(param1) + param1_ms.len = C.size_t(len(param1)) + defer C.free(unsafe.Pointer(param1_ms.data)) + return (bool)(C.QFont_FromString(this.h, param1_ms)) } func QFont_Substitute(param1 string) string { - param1_ms := libmiqt.Strdupg(param1) - defer C.free(param1_ms) - var _ms *C.struct_miqt_string = C.QFont_Substitute((*C.struct_miqt_string)(param1_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + param1_ms := C.struct_miqt_string{} + param1_ms.data = C.CString(param1) + param1_ms.len = C.size_t(len(param1)) + defer C.free(unsafe.Pointer(param1_ms.data)) + var _ms C.struct_miqt_string = C.QFont_Substitute(param1_ms) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QFont_Substitutes(param1 string) []string { - param1_ms := libmiqt.Strdupg(param1) - defer C.free(param1_ms) - var _ma *C.struct_miqt_array = C.QFont_Substitutes((*C.struct_miqt_string)(param1_ms)) + param1_ms := C.struct_miqt_string{} + param1_ms.data = C.CString(param1) + param1_ms.len = C.size_t(len(param1)) + defer C.free(unsafe.Pointer(param1_ms.data)) + var _ma *C.struct_miqt_array = C.QFont_Substitutes(param1_ms) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -531,11 +552,11 @@ func QFont_Substitutes(param1 string) []string { func QFont_Substitutions() []string { var _ma *C.struct_miqt_array = C.QFont_Substitutions() _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -543,33 +564,43 @@ func QFont_Substitutions() []string { } func QFont_InsertSubstitution(param1 string, param2 string) { - param1_ms := libmiqt.Strdupg(param1) - defer C.free(param1_ms) - param2_ms := libmiqt.Strdupg(param2) - defer C.free(param2_ms) - C.QFont_InsertSubstitution((*C.struct_miqt_string)(param1_ms), (*C.struct_miqt_string)(param2_ms)) + param1_ms := C.struct_miqt_string{} + param1_ms.data = C.CString(param1) + param1_ms.len = C.size_t(len(param1)) + defer C.free(unsafe.Pointer(param1_ms.data)) + param2_ms := C.struct_miqt_string{} + param2_ms.data = C.CString(param2) + param2_ms.len = C.size_t(len(param2)) + defer C.free(unsafe.Pointer(param2_ms.data)) + C.QFont_InsertSubstitution(param1_ms, param2_ms) } func QFont_InsertSubstitutions(param1 string, param2 []string) { - param1_ms := libmiqt.Strdupg(param1) - defer C.free(param1_ms) + param1_ms := C.struct_miqt_string{} + param1_ms.data = C.CString(param1) + param1_ms.len = C.size_t(len(param1)) + defer C.free(unsafe.Pointer(param1_ms.data)) // For the C ABI, malloc a C array of raw pointers - param2_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(param2)))) + param2_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(param2)))) defer C.free(unsafe.Pointer(param2_CArray)) for i := range param2 { - param2_i_ms := libmiqt.Strdupg(param2[i]) - defer C.free(param2_i_ms) - param2_CArray[i] = (*C.struct_miqt_string)(param2_i_ms) + param2_i_ms := C.struct_miqt_string{} + param2_i_ms.data = C.CString(param2[i]) + param2_i_ms.len = C.size_t(len(param2[i])) + defer C.free(unsafe.Pointer(param2_i_ms.data)) + param2_CArray[i] = param2_i_ms } param2_ma := &C.struct_miqt_array{len: C.size_t(len(param2)), data: unsafe.Pointer(param2_CArray)} defer runtime.KeepAlive(unsafe.Pointer(param2_ma)) - C.QFont_InsertSubstitutions((*C.struct_miqt_string)(param1_ms), param2_ma) + C.QFont_InsertSubstitutions(param1_ms, param2_ma) } func QFont_RemoveSubstitutions(param1 string) { - param1_ms := libmiqt.Strdupg(param1) - defer C.free(param1_ms) - C.QFont_RemoveSubstitutions((*C.struct_miqt_string)(param1_ms)) + param1_ms := C.struct_miqt_string{} + param1_ms.data = C.CString(param1) + param1_ms.len = C.size_t(len(param1)) + defer C.free(unsafe.Pointer(param1_ms.data)) + C.QFont_RemoveSubstitutions(param1_ms) } func QFont_Initialize() { @@ -585,23 +616,23 @@ func QFont_CacheStatistics() { } func (this *QFont) DefaultFamily() string { - var _ms *C.struct_miqt_string = C.QFont_DefaultFamily(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFont_DefaultFamily(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QFont) LastResortFamily() string { - var _ms *C.struct_miqt_string = C.QFont_LastResortFamily(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFont_LastResortFamily(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QFont) LastResortFont() string { - var _ms *C.struct_miqt_string = C.QFont_LastResortFont(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFont_LastResortFont(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qfont.h b/qt/gen_qfont.h index 8dffc9be..8f92f31d 100644 --- a/qt/gen_qfont.h +++ b/qt/gen_qfont.h @@ -22,20 +22,20 @@ typedef struct QPaintDevice QPaintDevice; #endif QFont* QFont_new(); -QFont* QFont_new2(struct miqt_string* family); +QFont* QFont_new2(struct miqt_string family); QFont* QFont_new3(QFont* font, QPaintDevice* pd); QFont* QFont_new4(QFont* font, QPaintDevice* pd); QFont* QFont_new5(QFont* font); -QFont* QFont_new6(struct miqt_string* family, int pointSize); -QFont* QFont_new7(struct miqt_string* family, int pointSize, int weight); -QFont* QFont_new8(struct miqt_string* family, int pointSize, int weight, bool italic); +QFont* QFont_new6(struct miqt_string family, int pointSize); +QFont* QFont_new7(struct miqt_string family, int pointSize, int weight); +QFont* QFont_new8(struct miqt_string family, int pointSize, int weight, bool italic); void QFont_Swap(QFont* self, QFont* other); -struct miqt_string* QFont_Family(const QFont* self); -void QFont_SetFamily(QFont* self, struct miqt_string* family); +struct miqt_string QFont_Family(const QFont* self); +void QFont_SetFamily(QFont* self, struct miqt_string family); struct miqt_array* QFont_Families(const QFont* self); -void QFont_SetFamilies(QFont* self, struct miqt_array* /* of struct miqt_string* */ families); -struct miqt_string* QFont_StyleName(const QFont* self); -void QFont_SetStyleName(QFont* self, struct miqt_string* styleName); +void QFont_SetFamilies(QFont* self, struct miqt_array* /* of struct miqt_string */ families); +struct miqt_string QFont_StyleName(const QFont* self); +void QFont_SetStyleName(QFont* self, struct miqt_string styleName); int QFont_PointSize(const QFont* self); void QFont_SetPointSize(QFont* self, int pointSize); double QFont_PointSizeF(const QFont* self); @@ -83,23 +83,23 @@ bool QFont_OperatorEqual(const QFont* self, QFont* param1); bool QFont_OperatorNotEqual(const QFont* self, QFont* param1); bool QFont_OperatorLesser(const QFont* self, QFont* param1); bool QFont_IsCopyOf(const QFont* self, QFont* param1); -void QFont_SetRawName(QFont* self, struct miqt_string* rawName); -struct miqt_string* QFont_RawName(const QFont* self); -struct miqt_string* QFont_Key(const QFont* self); -struct miqt_string* QFont_ToString(const QFont* self); -bool QFont_FromString(QFont* self, struct miqt_string* param1); -struct miqt_string* QFont_Substitute(struct miqt_string* param1); -struct miqt_array* QFont_Substitutes(struct miqt_string* param1); +void QFont_SetRawName(QFont* self, struct miqt_string rawName); +struct miqt_string QFont_RawName(const QFont* self); +struct miqt_string QFont_Key(const QFont* self); +struct miqt_string QFont_ToString(const QFont* self); +bool QFont_FromString(QFont* self, struct miqt_string param1); +struct miqt_string QFont_Substitute(struct miqt_string param1); +struct miqt_array* QFont_Substitutes(struct miqt_string param1); struct miqt_array* QFont_Substitutions(); -void QFont_InsertSubstitution(struct miqt_string* param1, struct miqt_string* param2); -void QFont_InsertSubstitutions(struct miqt_string* param1, struct miqt_array* /* of struct miqt_string* */ param2); -void QFont_RemoveSubstitutions(struct miqt_string* param1); +void QFont_InsertSubstitution(struct miqt_string param1, struct miqt_string param2); +void QFont_InsertSubstitutions(struct miqt_string param1, struct miqt_array* /* of struct miqt_string */ param2); +void QFont_RemoveSubstitutions(struct miqt_string param1); void QFont_Initialize(); void QFont_Cleanup(); void QFont_CacheStatistics(); -struct miqt_string* QFont_DefaultFamily(const QFont* self); -struct miqt_string* QFont_LastResortFamily(const QFont* self); -struct miqt_string* QFont_LastResortFont(const QFont* self); +struct miqt_string QFont_DefaultFamily(const QFont* self); +struct miqt_string QFont_LastResortFamily(const QFont* self); +struct miqt_string QFont_LastResortFont(const QFont* self); QFont* QFont_Resolve(const QFont* self, QFont* param1); unsigned int QFont_Resolve2(const QFont* self); void QFont_ResolveWithMask(QFont* self, unsigned int mask); diff --git a/qt/gen_qfontcombobox.cpp b/qt/gen_qfontcombobox.cpp index bc8c9a33..623115de 100644 --- a/qt/gen_qfontcombobox.cpp +++ b/qt/gen_qfontcombobox.cpp @@ -26,18 +26,26 @@ void* QFontComboBox_Metacast(QFontComboBox* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QFontComboBox_Tr(const char* s) { +struct miqt_string QFontComboBox_Tr(const char* s) { QString _ret = QFontComboBox::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFontComboBox_TrUtf8(const char* s) { +struct miqt_string QFontComboBox_TrUtf8(const char* s) { QString _ret = QFontComboBox::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QFontComboBox_SetWritingSystem(QFontComboBox* self, int writingSystem) { @@ -83,32 +91,48 @@ void QFontComboBox_connect_CurrentFontChanged(QFontComboBox* self, intptr_t slot }); } -struct miqt_string* QFontComboBox_Tr2(const char* s, const char* c) { +struct miqt_string QFontComboBox_Tr2(const char* s, const char* c) { QString _ret = QFontComboBox::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFontComboBox_Tr3(const char* s, const char* c, int n) { +struct miqt_string QFontComboBox_Tr3(const char* s, const char* c, int n) { QString _ret = QFontComboBox::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFontComboBox_TrUtf82(const char* s, const char* c) { +struct miqt_string QFontComboBox_TrUtf82(const char* s, const char* c) { QString _ret = QFontComboBox::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFontComboBox_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QFontComboBox_TrUtf83(const char* s, const char* c, int n) { QString _ret = QFontComboBox::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QFontComboBox_Delete(QFontComboBox* self) { diff --git a/qt/gen_qfontcombobox.go b/qt/gen_qfontcombobox.go index 2f6790bc..52f0d5c4 100644 --- a/qt/gen_qfontcombobox.go +++ b/qt/gen_qfontcombobox.go @@ -73,24 +73,24 @@ func (this *QFontComboBox) MetaObject() *QMetaObject { func (this *QFontComboBox) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QFontComboBox_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QFontComboBox_Metacast(this.h, param1_Cstring)) } func QFontComboBox_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QFontComboBox_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFontComboBox_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QFontComboBox_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QFontComboBox_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFontComboBox_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -153,9 +153,9 @@ func QFontComboBox_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFontComboBox_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFontComboBox_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -164,9 +164,9 @@ func QFontComboBox_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFontComboBox_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFontComboBox_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -175,9 +175,9 @@ func QFontComboBox_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFontComboBox_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFontComboBox_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -186,9 +186,9 @@ func QFontComboBox_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFontComboBox_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFontComboBox_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qfontcombobox.h b/qt/gen_qfontcombobox.h index 1d3691e6..f149e1d4 100644 --- a/qt/gen_qfontcombobox.h +++ b/qt/gen_qfontcombobox.h @@ -31,8 +31,8 @@ QFontComboBox* QFontComboBox_new(); QFontComboBox* QFontComboBox_new2(QWidget* parent); QMetaObject* QFontComboBox_MetaObject(const QFontComboBox* self); void* QFontComboBox_Metacast(QFontComboBox* self, const char* param1); -struct miqt_string* QFontComboBox_Tr(const char* s); -struct miqt_string* QFontComboBox_TrUtf8(const char* s); +struct miqt_string QFontComboBox_Tr(const char* s); +struct miqt_string QFontComboBox_TrUtf8(const char* s); void QFontComboBox_SetWritingSystem(QFontComboBox* self, int writingSystem); int QFontComboBox_WritingSystem(const QFontComboBox* self); void QFontComboBox_SetFontFilters(QFontComboBox* self, int filters); @@ -42,10 +42,10 @@ QSize* QFontComboBox_SizeHint(const QFontComboBox* self); void QFontComboBox_SetCurrentFont(QFontComboBox* self, QFont* f); void QFontComboBox_CurrentFontChanged(QFontComboBox* self, QFont* f); void QFontComboBox_connect_CurrentFontChanged(QFontComboBox* self, intptr_t slot); -struct miqt_string* QFontComboBox_Tr2(const char* s, const char* c); -struct miqt_string* QFontComboBox_Tr3(const char* s, const char* c, int n); -struct miqt_string* QFontComboBox_TrUtf82(const char* s, const char* c); -struct miqt_string* QFontComboBox_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QFontComboBox_Tr2(const char* s, const char* c); +struct miqt_string QFontComboBox_Tr3(const char* s, const char* c, int n); +struct miqt_string QFontComboBox_TrUtf82(const char* s, const char* c); +struct miqt_string QFontComboBox_TrUtf83(const char* s, const char* c, int n); void QFontComboBox_Delete(QFontComboBox* self); #ifdef __cplusplus diff --git a/qt/gen_qfontdatabase.cpp b/qt/gen_qfontdatabase.cpp index 21ae583e..7acb2175 100644 --- a/qt/gen_qfontdatabase.cpp +++ b/qt/gen_qfontdatabase.cpp @@ -41,8 +41,8 @@ struct miqt_array* QFontDatabase_WritingSystems(const QFontDatabase* self) { return _out; } -struct miqt_array* QFontDatabase_WritingSystemsWithFamily(const QFontDatabase* self, struct miqt_string* family) { - QString family_QString = QString::fromUtf8(&family->data, family->len); +struct miqt_array* QFontDatabase_WritingSystemsWithFamily(const QFontDatabase* self, struct miqt_string family) { + QString family_QString = QString::fromUtf8(family.data, family.len); QList _ret = self->writingSystems(family_QString); // Convert QList<> from C++ memory to manually-managed C memory int* _arr = static_cast(malloc(sizeof(int) * _ret.length())); @@ -59,12 +59,16 @@ struct miqt_array* QFontDatabase_WritingSystemsWithFamily(const QFontDatabase* s struct miqt_array* QFontDatabase_Families(const QFontDatabase* self) { QStringList _ret = self->families(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -72,16 +76,20 @@ struct miqt_array* QFontDatabase_Families(const QFontDatabase* self) { return _out; } -struct miqt_array* QFontDatabase_Styles(const QFontDatabase* self, struct miqt_string* family) { - QString family_QString = QString::fromUtf8(&family->data, family->len); +struct miqt_array* QFontDatabase_Styles(const QFontDatabase* self, struct miqt_string family) { + QString family_QString = QString::fromUtf8(family.data, family.len); QStringList _ret = self->styles(family_QString); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -89,8 +97,8 @@ struct miqt_array* QFontDatabase_Styles(const QFontDatabase* self, struct miqt_s return _out; } -struct miqt_array* QFontDatabase_PointSizes(QFontDatabase* self, struct miqt_string* family) { - QString family_QString = QString::fromUtf8(&family->data, family->len); +struct miqt_array* QFontDatabase_PointSizes(QFontDatabase* self, struct miqt_string family) { + QString family_QString = QString::fromUtf8(family.data, family.len); QList _ret = self->pointSizes(family_QString); // Convert QList<> from C++ memory to manually-managed C memory int* _arr = static_cast(malloc(sizeof(int) * _ret.length())); @@ -103,9 +111,9 @@ struct miqt_array* QFontDatabase_PointSizes(QFontDatabase* self, struct miqt_str return _out; } -struct miqt_array* QFontDatabase_SmoothSizes(QFontDatabase* self, struct miqt_string* family, struct miqt_string* style) { - QString family_QString = QString::fromUtf8(&family->data, family->len); - QString style_QString = QString::fromUtf8(&style->data, style->len); +struct miqt_array* QFontDatabase_SmoothSizes(QFontDatabase* self, struct miqt_string family, struct miqt_string style) { + QString family_QString = QString::fromUtf8(family.data, family.len); + QString style_QString = QString::fromUtf8(style.data, style.len); QList _ret = self->smoothSizes(family_QString, style_QString); // Convert QList<> from C++ memory to manually-managed C memory int* _arr = static_cast(malloc(sizeof(int) * _ret.length())); @@ -118,106 +126,127 @@ struct miqt_array* QFontDatabase_SmoothSizes(QFontDatabase* self, struct miqt_st return _out; } -struct miqt_string* QFontDatabase_StyleString(QFontDatabase* self, QFont* font) { +struct miqt_string QFontDatabase_StyleString(QFontDatabase* self, QFont* font) { QString _ret = self->styleString(*font); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFontDatabase_StyleStringWithFontInfo(QFontDatabase* self, QFontInfo* fontInfo) { +struct miqt_string QFontDatabase_StyleStringWithFontInfo(QFontDatabase* self, QFontInfo* fontInfo) { QString _ret = self->styleString(*fontInfo); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -QFont* QFontDatabase_Font(const QFontDatabase* self, struct miqt_string* family, struct miqt_string* style, int pointSize) { - QString family_QString = QString::fromUtf8(&family->data, family->len); - QString style_QString = QString::fromUtf8(&style->data, style->len); +QFont* QFontDatabase_Font(const QFontDatabase* self, struct miqt_string family, struct miqt_string style, int pointSize) { + QString family_QString = QString::fromUtf8(family.data, family.len); + QString style_QString = QString::fromUtf8(style.data, style.len); return new QFont(self->font(family_QString, style_QString, static_cast(pointSize))); } -bool QFontDatabase_IsBitmapScalable(const QFontDatabase* self, struct miqt_string* family) { - QString family_QString = QString::fromUtf8(&family->data, family->len); +bool QFontDatabase_IsBitmapScalable(const QFontDatabase* self, struct miqt_string family) { + QString family_QString = QString::fromUtf8(family.data, family.len); return self->isBitmapScalable(family_QString); } -bool QFontDatabase_IsSmoothlyScalable(const QFontDatabase* self, struct miqt_string* family) { - QString family_QString = QString::fromUtf8(&family->data, family->len); +bool QFontDatabase_IsSmoothlyScalable(const QFontDatabase* self, struct miqt_string family) { + QString family_QString = QString::fromUtf8(family.data, family.len); return self->isSmoothlyScalable(family_QString); } -bool QFontDatabase_IsScalable(const QFontDatabase* self, struct miqt_string* family) { - QString family_QString = QString::fromUtf8(&family->data, family->len); +bool QFontDatabase_IsScalable(const QFontDatabase* self, struct miqt_string family) { + QString family_QString = QString::fromUtf8(family.data, family.len); return self->isScalable(family_QString); } -bool QFontDatabase_IsFixedPitch(const QFontDatabase* self, struct miqt_string* family) { - QString family_QString = QString::fromUtf8(&family->data, family->len); +bool QFontDatabase_IsFixedPitch(const QFontDatabase* self, struct miqt_string family) { + QString family_QString = QString::fromUtf8(family.data, family.len); return self->isFixedPitch(family_QString); } -bool QFontDatabase_Italic(const QFontDatabase* self, struct miqt_string* family, struct miqt_string* style) { - QString family_QString = QString::fromUtf8(&family->data, family->len); - QString style_QString = QString::fromUtf8(&style->data, style->len); +bool QFontDatabase_Italic(const QFontDatabase* self, struct miqt_string family, struct miqt_string style) { + QString family_QString = QString::fromUtf8(family.data, family.len); + QString style_QString = QString::fromUtf8(style.data, style.len); return self->italic(family_QString, style_QString); } -bool QFontDatabase_Bold(const QFontDatabase* self, struct miqt_string* family, struct miqt_string* style) { - QString family_QString = QString::fromUtf8(&family->data, family->len); - QString style_QString = QString::fromUtf8(&style->data, style->len); +bool QFontDatabase_Bold(const QFontDatabase* self, struct miqt_string family, struct miqt_string style) { + QString family_QString = QString::fromUtf8(family.data, family.len); + QString style_QString = QString::fromUtf8(style.data, style.len); return self->bold(family_QString, style_QString); } -int QFontDatabase_Weight(const QFontDatabase* self, struct miqt_string* family, struct miqt_string* style) { - QString family_QString = QString::fromUtf8(&family->data, family->len); - QString style_QString = QString::fromUtf8(&style->data, style->len); +int QFontDatabase_Weight(const QFontDatabase* self, struct miqt_string family, struct miqt_string style) { + QString family_QString = QString::fromUtf8(family.data, family.len); + QString style_QString = QString::fromUtf8(style.data, style.len); return self->weight(family_QString, style_QString); } -bool QFontDatabase_HasFamily(const QFontDatabase* self, struct miqt_string* family) { - QString family_QString = QString::fromUtf8(&family->data, family->len); +bool QFontDatabase_HasFamily(const QFontDatabase* self, struct miqt_string family) { + QString family_QString = QString::fromUtf8(family.data, family.len); return self->hasFamily(family_QString); } -bool QFontDatabase_IsPrivateFamily(const QFontDatabase* self, struct miqt_string* family) { - QString family_QString = QString::fromUtf8(&family->data, family->len); +bool QFontDatabase_IsPrivateFamily(const QFontDatabase* self, struct miqt_string family) { + QString family_QString = QString::fromUtf8(family.data, family.len); return self->isPrivateFamily(family_QString); } -struct miqt_string* QFontDatabase_WritingSystemName(int writingSystem) { +struct miqt_string QFontDatabase_WritingSystemName(int writingSystem) { QString _ret = QFontDatabase::writingSystemName(static_cast(writingSystem)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFontDatabase_WritingSystemSample(int writingSystem) { +struct miqt_string QFontDatabase_WritingSystemSample(int writingSystem) { QString _ret = QFontDatabase::writingSystemSample(static_cast(writingSystem)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -int QFontDatabase_AddApplicationFont(struct miqt_string* fileName) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +int QFontDatabase_AddApplicationFont(struct miqt_string fileName) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); return QFontDatabase::addApplicationFont(fileName_QString); } -int QFontDatabase_AddApplicationFontFromData(QByteArray* fontData) { - return QFontDatabase::addApplicationFontFromData(*fontData); +int QFontDatabase_AddApplicationFontFromData(struct miqt_string fontData) { + QByteArray fontData_QByteArray(fontData.data, fontData.len); + return QFontDatabase::addApplicationFontFromData(fontData_QByteArray); } struct miqt_array* QFontDatabase_ApplicationFontFamilies(int id) { QStringList _ret = QFontDatabase::applicationFontFamilies(static_cast(id)); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -244,12 +273,16 @@ QFont* QFontDatabase_SystemFont(int typeVal) { struct miqt_array* QFontDatabase_Families1(const QFontDatabase* self, int writingSystem) { QStringList _ret = self->families(static_cast(writingSystem)); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -257,9 +290,9 @@ struct miqt_array* QFontDatabase_Families1(const QFontDatabase* self, int writin return _out; } -struct miqt_array* QFontDatabase_PointSizes2(QFontDatabase* self, struct miqt_string* family, struct miqt_string* style) { - QString family_QString = QString::fromUtf8(&family->data, family->len); - QString style_QString = QString::fromUtf8(&style->data, style->len); +struct miqt_array* QFontDatabase_PointSizes2(QFontDatabase* self, struct miqt_string family, struct miqt_string style) { + QString family_QString = QString::fromUtf8(family.data, family.len); + QString style_QString = QString::fromUtf8(style.data, style.len); QList _ret = self->pointSizes(family_QString, style_QString); // Convert QList<> from C++ memory to manually-managed C memory int* _arr = static_cast(malloc(sizeof(int) * _ret.length())); @@ -272,27 +305,27 @@ struct miqt_array* QFontDatabase_PointSizes2(QFontDatabase* self, struct miqt_st return _out; } -bool QFontDatabase_IsBitmapScalable2(const QFontDatabase* self, struct miqt_string* family, struct miqt_string* style) { - QString family_QString = QString::fromUtf8(&family->data, family->len); - QString style_QString = QString::fromUtf8(&style->data, style->len); +bool QFontDatabase_IsBitmapScalable2(const QFontDatabase* self, struct miqt_string family, struct miqt_string style) { + QString family_QString = QString::fromUtf8(family.data, family.len); + QString style_QString = QString::fromUtf8(style.data, style.len); return self->isBitmapScalable(family_QString, style_QString); } -bool QFontDatabase_IsSmoothlyScalable2(const QFontDatabase* self, struct miqt_string* family, struct miqt_string* style) { - QString family_QString = QString::fromUtf8(&family->data, family->len); - QString style_QString = QString::fromUtf8(&style->data, style->len); +bool QFontDatabase_IsSmoothlyScalable2(const QFontDatabase* self, struct miqt_string family, struct miqt_string style) { + QString family_QString = QString::fromUtf8(family.data, family.len); + QString style_QString = QString::fromUtf8(style.data, style.len); return self->isSmoothlyScalable(family_QString, style_QString); } -bool QFontDatabase_IsScalable2(const QFontDatabase* self, struct miqt_string* family, struct miqt_string* style) { - QString family_QString = QString::fromUtf8(&family->data, family->len); - QString style_QString = QString::fromUtf8(&style->data, style->len); +bool QFontDatabase_IsScalable2(const QFontDatabase* self, struct miqt_string family, struct miqt_string style) { + QString family_QString = QString::fromUtf8(family.data, family.len); + QString style_QString = QString::fromUtf8(style.data, style.len); return self->isScalable(family_QString, style_QString); } -bool QFontDatabase_IsFixedPitch2(const QFontDatabase* self, struct miqt_string* family, struct miqt_string* style) { - QString family_QString = QString::fromUtf8(&family->data, family->len); - QString style_QString = QString::fromUtf8(&style->data, style->len); +bool QFontDatabase_IsFixedPitch2(const QFontDatabase* self, struct miqt_string family, struct miqt_string style) { + QString family_QString = QString::fromUtf8(family.data, family.len); + QString style_QString = QString::fromUtf8(style.data, style.len); return self->isFixedPitch(family_QString, style_QString); } diff --git a/qt/gen_qfontdatabase.go b/qt/gen_qfontdatabase.go index d786600b..ef28b499 100644 --- a/qt/gen_qfontdatabase.go +++ b/qt/gen_qfontdatabase.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -122,9 +121,11 @@ func (this *QFontDatabase) WritingSystems() []QFontDatabase__WritingSystem { } func (this *QFontDatabase) WritingSystemsWithFamily(family string) []QFontDatabase__WritingSystem { - family_ms := libmiqt.Strdupg(family) - defer C.free(family_ms) - var _ma *C.struct_miqt_array = C.QFontDatabase_WritingSystemsWithFamily(this.h, (*C.struct_miqt_string)(family_ms)) + family_ms := C.struct_miqt_string{} + family_ms.data = C.CString(family) + family_ms.len = C.size_t(len(family)) + defer C.free(unsafe.Pointer(family_ms.data)) + var _ma *C.struct_miqt_array = C.QFontDatabase_WritingSystemsWithFamily(this.h, family_ms) _ret := make([]QFontDatabase__WritingSystem, int(_ma.len)) _outCast := (*[0xffff]C.int)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -137,11 +138,11 @@ func (this *QFontDatabase) WritingSystemsWithFamily(family string) []QFontDataba func (this *QFontDatabase) Families() []string { var _ma *C.struct_miqt_array = C.QFontDatabase_Families(this.h) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -149,15 +150,17 @@ func (this *QFontDatabase) Families() []string { } func (this *QFontDatabase) Styles(family string) []string { - family_ms := libmiqt.Strdupg(family) - defer C.free(family_ms) - var _ma *C.struct_miqt_array = C.QFontDatabase_Styles(this.h, (*C.struct_miqt_string)(family_ms)) + family_ms := C.struct_miqt_string{} + family_ms.data = C.CString(family) + family_ms.len = C.size_t(len(family)) + defer C.free(unsafe.Pointer(family_ms.data)) + var _ma *C.struct_miqt_array = C.QFontDatabase_Styles(this.h, family_ms) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -165,9 +168,11 @@ func (this *QFontDatabase) Styles(family string) []string { } func (this *QFontDatabase) PointSizes(family string) []int { - family_ms := libmiqt.Strdupg(family) - defer C.free(family_ms) - var _ma *C.struct_miqt_array = C.QFontDatabase_PointSizes(this.h, (*C.struct_miqt_string)(family_ms)) + family_ms := C.struct_miqt_string{} + family_ms.data = C.CString(family) + family_ms.len = C.size_t(len(family)) + defer C.free(unsafe.Pointer(family_ms.data)) + var _ma *C.struct_miqt_array = C.QFontDatabase_PointSizes(this.h, family_ms) _ret := make([]int, int(_ma.len)) _outCast := (*[0xffff]C.int)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -178,11 +183,15 @@ func (this *QFontDatabase) PointSizes(family string) []int { } func (this *QFontDatabase) SmoothSizes(family string, style string) []int { - family_ms := libmiqt.Strdupg(family) - defer C.free(family_ms) - style_ms := libmiqt.Strdupg(style) - defer C.free(style_ms) - var _ma *C.struct_miqt_array = C.QFontDatabase_SmoothSizes(this.h, (*C.struct_miqt_string)(family_ms), (*C.struct_miqt_string)(style_ms)) + family_ms := C.struct_miqt_string{} + family_ms.data = C.CString(family) + family_ms.len = C.size_t(len(family)) + defer C.free(unsafe.Pointer(family_ms.data)) + style_ms := C.struct_miqt_string{} + style_ms.data = C.CString(style) + style_ms.len = C.size_t(len(style)) + defer C.free(unsafe.Pointer(style_ms.data)) + var _ma *C.struct_miqt_array = C.QFontDatabase_SmoothSizes(this.h, family_ms, style_ms) _ret := make([]int, int(_ma.len)) _outCast := (*[0xffff]C.int)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -193,122 +202,155 @@ func (this *QFontDatabase) SmoothSizes(family string, style string) []int { } func (this *QFontDatabase) StyleString(font *QFont) string { - var _ms *C.struct_miqt_string = C.QFontDatabase_StyleString(this.h, font.cPointer()) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFontDatabase_StyleString(this.h, font.cPointer()) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QFontDatabase) StyleStringWithFontInfo(fontInfo *QFontInfo) string { - var _ms *C.struct_miqt_string = C.QFontDatabase_StyleStringWithFontInfo(this.h, fontInfo.cPointer()) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFontDatabase_StyleStringWithFontInfo(this.h, fontInfo.cPointer()) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QFontDatabase) Font(family string, style string, pointSize int) *QFont { - family_ms := libmiqt.Strdupg(family) - defer C.free(family_ms) - style_ms := libmiqt.Strdupg(style) - defer C.free(style_ms) - _ret := C.QFontDatabase_Font(this.h, (*C.struct_miqt_string)(family_ms), (*C.struct_miqt_string)(style_ms), (C.int)(pointSize)) + family_ms := C.struct_miqt_string{} + family_ms.data = C.CString(family) + family_ms.len = C.size_t(len(family)) + defer C.free(unsafe.Pointer(family_ms.data)) + style_ms := C.struct_miqt_string{} + style_ms.data = C.CString(style) + style_ms.len = C.size_t(len(style)) + defer C.free(unsafe.Pointer(style_ms.data)) + _ret := C.QFontDatabase_Font(this.h, family_ms, style_ms, (C.int)(pointSize)) _goptr := newQFont(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QFontDatabase) IsBitmapScalable(family string) bool { - family_ms := libmiqt.Strdupg(family) - defer C.free(family_ms) - return (bool)(C.QFontDatabase_IsBitmapScalable(this.h, (*C.struct_miqt_string)(family_ms))) + family_ms := C.struct_miqt_string{} + family_ms.data = C.CString(family) + family_ms.len = C.size_t(len(family)) + defer C.free(unsafe.Pointer(family_ms.data)) + return (bool)(C.QFontDatabase_IsBitmapScalable(this.h, family_ms)) } func (this *QFontDatabase) IsSmoothlyScalable(family string) bool { - family_ms := libmiqt.Strdupg(family) - defer C.free(family_ms) - return (bool)(C.QFontDatabase_IsSmoothlyScalable(this.h, (*C.struct_miqt_string)(family_ms))) + family_ms := C.struct_miqt_string{} + family_ms.data = C.CString(family) + family_ms.len = C.size_t(len(family)) + defer C.free(unsafe.Pointer(family_ms.data)) + return (bool)(C.QFontDatabase_IsSmoothlyScalable(this.h, family_ms)) } func (this *QFontDatabase) IsScalable(family string) bool { - family_ms := libmiqt.Strdupg(family) - defer C.free(family_ms) - return (bool)(C.QFontDatabase_IsScalable(this.h, (*C.struct_miqt_string)(family_ms))) + family_ms := C.struct_miqt_string{} + family_ms.data = C.CString(family) + family_ms.len = C.size_t(len(family)) + defer C.free(unsafe.Pointer(family_ms.data)) + return (bool)(C.QFontDatabase_IsScalable(this.h, family_ms)) } func (this *QFontDatabase) IsFixedPitch(family string) bool { - family_ms := libmiqt.Strdupg(family) - defer C.free(family_ms) - return (bool)(C.QFontDatabase_IsFixedPitch(this.h, (*C.struct_miqt_string)(family_ms))) + family_ms := C.struct_miqt_string{} + family_ms.data = C.CString(family) + family_ms.len = C.size_t(len(family)) + defer C.free(unsafe.Pointer(family_ms.data)) + return (bool)(C.QFontDatabase_IsFixedPitch(this.h, family_ms)) } func (this *QFontDatabase) Italic(family string, style string) bool { - family_ms := libmiqt.Strdupg(family) - defer C.free(family_ms) - style_ms := libmiqt.Strdupg(style) - defer C.free(style_ms) - return (bool)(C.QFontDatabase_Italic(this.h, (*C.struct_miqt_string)(family_ms), (*C.struct_miqt_string)(style_ms))) + family_ms := C.struct_miqt_string{} + family_ms.data = C.CString(family) + family_ms.len = C.size_t(len(family)) + defer C.free(unsafe.Pointer(family_ms.data)) + style_ms := C.struct_miqt_string{} + style_ms.data = C.CString(style) + style_ms.len = C.size_t(len(style)) + defer C.free(unsafe.Pointer(style_ms.data)) + return (bool)(C.QFontDatabase_Italic(this.h, family_ms, style_ms)) } func (this *QFontDatabase) Bold(family string, style string) bool { - family_ms := libmiqt.Strdupg(family) - defer C.free(family_ms) - style_ms := libmiqt.Strdupg(style) - defer C.free(style_ms) - return (bool)(C.QFontDatabase_Bold(this.h, (*C.struct_miqt_string)(family_ms), (*C.struct_miqt_string)(style_ms))) + family_ms := C.struct_miqt_string{} + family_ms.data = C.CString(family) + family_ms.len = C.size_t(len(family)) + defer C.free(unsafe.Pointer(family_ms.data)) + style_ms := C.struct_miqt_string{} + style_ms.data = C.CString(style) + style_ms.len = C.size_t(len(style)) + defer C.free(unsafe.Pointer(style_ms.data)) + return (bool)(C.QFontDatabase_Bold(this.h, family_ms, style_ms)) } func (this *QFontDatabase) Weight(family string, style string) int { - family_ms := libmiqt.Strdupg(family) - defer C.free(family_ms) - style_ms := libmiqt.Strdupg(style) - defer C.free(style_ms) - return (int)(C.QFontDatabase_Weight(this.h, (*C.struct_miqt_string)(family_ms), (*C.struct_miqt_string)(style_ms))) + family_ms := C.struct_miqt_string{} + family_ms.data = C.CString(family) + family_ms.len = C.size_t(len(family)) + defer C.free(unsafe.Pointer(family_ms.data)) + style_ms := C.struct_miqt_string{} + style_ms.data = C.CString(style) + style_ms.len = C.size_t(len(style)) + defer C.free(unsafe.Pointer(style_ms.data)) + return (int)(C.QFontDatabase_Weight(this.h, family_ms, style_ms)) } func (this *QFontDatabase) HasFamily(family string) bool { - family_ms := libmiqt.Strdupg(family) - defer C.free(family_ms) - return (bool)(C.QFontDatabase_HasFamily(this.h, (*C.struct_miqt_string)(family_ms))) + family_ms := C.struct_miqt_string{} + family_ms.data = C.CString(family) + family_ms.len = C.size_t(len(family)) + defer C.free(unsafe.Pointer(family_ms.data)) + return (bool)(C.QFontDatabase_HasFamily(this.h, family_ms)) } func (this *QFontDatabase) IsPrivateFamily(family string) bool { - family_ms := libmiqt.Strdupg(family) - defer C.free(family_ms) - return (bool)(C.QFontDatabase_IsPrivateFamily(this.h, (*C.struct_miqt_string)(family_ms))) + family_ms := C.struct_miqt_string{} + family_ms.data = C.CString(family) + family_ms.len = C.size_t(len(family)) + defer C.free(unsafe.Pointer(family_ms.data)) + return (bool)(C.QFontDatabase_IsPrivateFamily(this.h, family_ms)) } func QFontDatabase_WritingSystemName(writingSystem QFontDatabase__WritingSystem) string { - var _ms *C.struct_miqt_string = C.QFontDatabase_WritingSystemName((C.int)(writingSystem)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFontDatabase_WritingSystemName((C.int)(writingSystem)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QFontDatabase_WritingSystemSample(writingSystem QFontDatabase__WritingSystem) string { - var _ms *C.struct_miqt_string = C.QFontDatabase_WritingSystemSample((C.int)(writingSystem)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFontDatabase_WritingSystemSample((C.int)(writingSystem)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QFontDatabase_AddApplicationFont(fileName string) int { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - return (int)(C.QFontDatabase_AddApplicationFont((*C.struct_miqt_string)(fileName_ms))) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + return (int)(C.QFontDatabase_AddApplicationFont(fileName_ms)) } -func QFontDatabase_AddApplicationFontFromData(fontData *QByteArray) int { - return (int)(C.QFontDatabase_AddApplicationFontFromData(fontData.cPointer())) +func QFontDatabase_AddApplicationFontFromData(fontData []byte) int { + fontData_alias := C.struct_miqt_string{} + fontData_alias.data = (*C.char)(unsafe.Pointer(&fontData[0])) + fontData_alias.len = C.size_t(len(fontData)) + return (int)(C.QFontDatabase_AddApplicationFontFromData(fontData_alias)) } func QFontDatabase_ApplicationFontFamilies(id int) []string { var _ma *C.struct_miqt_array = C.QFontDatabase_ApplicationFontFamilies((C.int)(id)) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -337,11 +379,11 @@ func QFontDatabase_SystemFont(typeVal QFontDatabase__SystemFont) *QFont { func (this *QFontDatabase) Families1(writingSystem QFontDatabase__WritingSystem) []string { var _ma *C.struct_miqt_array = C.QFontDatabase_Families1(this.h, (C.int)(writingSystem)) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -349,11 +391,15 @@ func (this *QFontDatabase) Families1(writingSystem QFontDatabase__WritingSystem) } func (this *QFontDatabase) PointSizes2(family string, style string) []int { - family_ms := libmiqt.Strdupg(family) - defer C.free(family_ms) - style_ms := libmiqt.Strdupg(style) - defer C.free(style_ms) - var _ma *C.struct_miqt_array = C.QFontDatabase_PointSizes2(this.h, (*C.struct_miqt_string)(family_ms), (*C.struct_miqt_string)(style_ms)) + family_ms := C.struct_miqt_string{} + family_ms.data = C.CString(family) + family_ms.len = C.size_t(len(family)) + defer C.free(unsafe.Pointer(family_ms.data)) + style_ms := C.struct_miqt_string{} + style_ms.data = C.CString(style) + style_ms.len = C.size_t(len(style)) + defer C.free(unsafe.Pointer(style_ms.data)) + var _ma *C.struct_miqt_array = C.QFontDatabase_PointSizes2(this.h, family_ms, style_ms) _ret := make([]int, int(_ma.len)) _outCast := (*[0xffff]C.int)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -364,35 +410,51 @@ func (this *QFontDatabase) PointSizes2(family string, style string) []int { } func (this *QFontDatabase) IsBitmapScalable2(family string, style string) bool { - family_ms := libmiqt.Strdupg(family) - defer C.free(family_ms) - style_ms := libmiqt.Strdupg(style) - defer C.free(style_ms) - return (bool)(C.QFontDatabase_IsBitmapScalable2(this.h, (*C.struct_miqt_string)(family_ms), (*C.struct_miqt_string)(style_ms))) + family_ms := C.struct_miqt_string{} + family_ms.data = C.CString(family) + family_ms.len = C.size_t(len(family)) + defer C.free(unsafe.Pointer(family_ms.data)) + style_ms := C.struct_miqt_string{} + style_ms.data = C.CString(style) + style_ms.len = C.size_t(len(style)) + defer C.free(unsafe.Pointer(style_ms.data)) + return (bool)(C.QFontDatabase_IsBitmapScalable2(this.h, family_ms, style_ms)) } func (this *QFontDatabase) IsSmoothlyScalable2(family string, style string) bool { - family_ms := libmiqt.Strdupg(family) - defer C.free(family_ms) - style_ms := libmiqt.Strdupg(style) - defer C.free(style_ms) - return (bool)(C.QFontDatabase_IsSmoothlyScalable2(this.h, (*C.struct_miqt_string)(family_ms), (*C.struct_miqt_string)(style_ms))) + family_ms := C.struct_miqt_string{} + family_ms.data = C.CString(family) + family_ms.len = C.size_t(len(family)) + defer C.free(unsafe.Pointer(family_ms.data)) + style_ms := C.struct_miqt_string{} + style_ms.data = C.CString(style) + style_ms.len = C.size_t(len(style)) + defer C.free(unsafe.Pointer(style_ms.data)) + return (bool)(C.QFontDatabase_IsSmoothlyScalable2(this.h, family_ms, style_ms)) } func (this *QFontDatabase) IsScalable2(family string, style string) bool { - family_ms := libmiqt.Strdupg(family) - defer C.free(family_ms) - style_ms := libmiqt.Strdupg(style) - defer C.free(style_ms) - return (bool)(C.QFontDatabase_IsScalable2(this.h, (*C.struct_miqt_string)(family_ms), (*C.struct_miqt_string)(style_ms))) + family_ms := C.struct_miqt_string{} + family_ms.data = C.CString(family) + family_ms.len = C.size_t(len(family)) + defer C.free(unsafe.Pointer(family_ms.data)) + style_ms := C.struct_miqt_string{} + style_ms.data = C.CString(style) + style_ms.len = C.size_t(len(style)) + defer C.free(unsafe.Pointer(style_ms.data)) + return (bool)(C.QFontDatabase_IsScalable2(this.h, family_ms, style_ms)) } func (this *QFontDatabase) IsFixedPitch2(family string, style string) bool { - family_ms := libmiqt.Strdupg(family) - defer C.free(family_ms) - style_ms := libmiqt.Strdupg(style) - defer C.free(style_ms) - return (bool)(C.QFontDatabase_IsFixedPitch2(this.h, (*C.struct_miqt_string)(family_ms), (*C.struct_miqt_string)(style_ms))) + family_ms := C.struct_miqt_string{} + family_ms.data = C.CString(family) + family_ms.len = C.size_t(len(family)) + defer C.free(unsafe.Pointer(family_ms.data)) + style_ms := C.struct_miqt_string{} + style_ms.data = C.CString(style) + style_ms.len = C.size_t(len(style)) + defer C.free(unsafe.Pointer(style_ms.data)) + return (bool)(C.QFontDatabase_IsFixedPitch2(this.h, family_ms, style_ms)) } // Delete this object from C++ memory. diff --git a/qt/gen_qfontdatabase.h b/qt/gen_qfontdatabase.h index 8a355496..2ef8a941 100644 --- a/qt/gen_qfontdatabase.h +++ b/qt/gen_qfontdatabase.h @@ -28,38 +28,38 @@ typedef struct QFontInfo QFontInfo; QFontDatabase* QFontDatabase_new(); struct miqt_array* QFontDatabase_StandardSizes(); struct miqt_array* QFontDatabase_WritingSystems(const QFontDatabase* self); -struct miqt_array* QFontDatabase_WritingSystemsWithFamily(const QFontDatabase* self, struct miqt_string* family); +struct miqt_array* QFontDatabase_WritingSystemsWithFamily(const QFontDatabase* self, struct miqt_string family); struct miqt_array* QFontDatabase_Families(const QFontDatabase* self); -struct miqt_array* QFontDatabase_Styles(const QFontDatabase* self, struct miqt_string* family); -struct miqt_array* QFontDatabase_PointSizes(QFontDatabase* self, struct miqt_string* family); -struct miqt_array* QFontDatabase_SmoothSizes(QFontDatabase* self, struct miqt_string* family, struct miqt_string* style); -struct miqt_string* QFontDatabase_StyleString(QFontDatabase* self, QFont* font); -struct miqt_string* QFontDatabase_StyleStringWithFontInfo(QFontDatabase* self, QFontInfo* fontInfo); -QFont* QFontDatabase_Font(const QFontDatabase* self, struct miqt_string* family, struct miqt_string* style, int pointSize); -bool QFontDatabase_IsBitmapScalable(const QFontDatabase* self, struct miqt_string* family); -bool QFontDatabase_IsSmoothlyScalable(const QFontDatabase* self, struct miqt_string* family); -bool QFontDatabase_IsScalable(const QFontDatabase* self, struct miqt_string* family); -bool QFontDatabase_IsFixedPitch(const QFontDatabase* self, struct miqt_string* family); -bool QFontDatabase_Italic(const QFontDatabase* self, struct miqt_string* family, struct miqt_string* style); -bool QFontDatabase_Bold(const QFontDatabase* self, struct miqt_string* family, struct miqt_string* style); -int QFontDatabase_Weight(const QFontDatabase* self, struct miqt_string* family, struct miqt_string* style); -bool QFontDatabase_HasFamily(const QFontDatabase* self, struct miqt_string* family); -bool QFontDatabase_IsPrivateFamily(const QFontDatabase* self, struct miqt_string* family); -struct miqt_string* QFontDatabase_WritingSystemName(int writingSystem); -struct miqt_string* QFontDatabase_WritingSystemSample(int writingSystem); -int QFontDatabase_AddApplicationFont(struct miqt_string* fileName); -int QFontDatabase_AddApplicationFontFromData(QByteArray* fontData); +struct miqt_array* QFontDatabase_Styles(const QFontDatabase* self, struct miqt_string family); +struct miqt_array* QFontDatabase_PointSizes(QFontDatabase* self, struct miqt_string family); +struct miqt_array* QFontDatabase_SmoothSizes(QFontDatabase* self, struct miqt_string family, struct miqt_string style); +struct miqt_string QFontDatabase_StyleString(QFontDatabase* self, QFont* font); +struct miqt_string QFontDatabase_StyleStringWithFontInfo(QFontDatabase* self, QFontInfo* fontInfo); +QFont* QFontDatabase_Font(const QFontDatabase* self, struct miqt_string family, struct miqt_string style, int pointSize); +bool QFontDatabase_IsBitmapScalable(const QFontDatabase* self, struct miqt_string family); +bool QFontDatabase_IsSmoothlyScalable(const QFontDatabase* self, struct miqt_string family); +bool QFontDatabase_IsScalable(const QFontDatabase* self, struct miqt_string family); +bool QFontDatabase_IsFixedPitch(const QFontDatabase* self, struct miqt_string family); +bool QFontDatabase_Italic(const QFontDatabase* self, struct miqt_string family, struct miqt_string style); +bool QFontDatabase_Bold(const QFontDatabase* self, struct miqt_string family, struct miqt_string style); +int QFontDatabase_Weight(const QFontDatabase* self, struct miqt_string family, struct miqt_string style); +bool QFontDatabase_HasFamily(const QFontDatabase* self, struct miqt_string family); +bool QFontDatabase_IsPrivateFamily(const QFontDatabase* self, struct miqt_string family); +struct miqt_string QFontDatabase_WritingSystemName(int writingSystem); +struct miqt_string QFontDatabase_WritingSystemSample(int writingSystem); +int QFontDatabase_AddApplicationFont(struct miqt_string fileName); +int QFontDatabase_AddApplicationFontFromData(struct miqt_string fontData); struct miqt_array* QFontDatabase_ApplicationFontFamilies(int id); bool QFontDatabase_RemoveApplicationFont(int id); bool QFontDatabase_RemoveAllApplicationFonts(); bool QFontDatabase_SupportsThreadedFontRendering(); QFont* QFontDatabase_SystemFont(int typeVal); struct miqt_array* QFontDatabase_Families1(const QFontDatabase* self, int writingSystem); -struct miqt_array* QFontDatabase_PointSizes2(QFontDatabase* self, struct miqt_string* family, struct miqt_string* style); -bool QFontDatabase_IsBitmapScalable2(const QFontDatabase* self, struct miqt_string* family, struct miqt_string* style); -bool QFontDatabase_IsSmoothlyScalable2(const QFontDatabase* self, struct miqt_string* family, struct miqt_string* style); -bool QFontDatabase_IsScalable2(const QFontDatabase* self, struct miqt_string* family, struct miqt_string* style); -bool QFontDatabase_IsFixedPitch2(const QFontDatabase* self, struct miqt_string* family, struct miqt_string* style); +struct miqt_array* QFontDatabase_PointSizes2(QFontDatabase* self, struct miqt_string family, struct miqt_string style); +bool QFontDatabase_IsBitmapScalable2(const QFontDatabase* self, struct miqt_string family, struct miqt_string style); +bool QFontDatabase_IsSmoothlyScalable2(const QFontDatabase* self, struct miqt_string family, struct miqt_string style); +bool QFontDatabase_IsScalable2(const QFontDatabase* self, struct miqt_string family, struct miqt_string style); +bool QFontDatabase_IsFixedPitch2(const QFontDatabase* self, struct miqt_string family, struct miqt_string style); void QFontDatabase_Delete(QFontDatabase* self); #ifdef __cplusplus diff --git a/qt/gen_qfontdialog.cpp b/qt/gen_qfontdialog.cpp index 25c82155..656087ba 100644 --- a/qt/gen_qfontdialog.cpp +++ b/qt/gen_qfontdialog.cpp @@ -33,18 +33,26 @@ void* QFontDialog_Metacast(QFontDialog* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QFontDialog_Tr(const char* s) { +struct miqt_string QFontDialog_Tr(const char* s) { QString _ret = QFontDialog::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFontDialog_TrUtf8(const char* s) { +struct miqt_string QFontDialog_TrUtf8(const char* s) { QString _ret = QFontDialog::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QFontDialog_SetCurrentFont(QFontDialog* self, QFont* font) { @@ -114,32 +122,48 @@ void QFontDialog_connect_FontSelected(QFontDialog* self, intptr_t slot) { }); } -struct miqt_string* QFontDialog_Tr2(const char* s, const char* c) { +struct miqt_string QFontDialog_Tr2(const char* s, const char* c) { QString _ret = QFontDialog::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFontDialog_Tr3(const char* s, const char* c, int n) { +struct miqt_string QFontDialog_Tr3(const char* s, const char* c, int n) { QString _ret = QFontDialog::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFontDialog_TrUtf82(const char* s, const char* c) { +struct miqt_string QFontDialog_TrUtf82(const char* s, const char* c) { QString _ret = QFontDialog::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFontDialog_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QFontDialog_TrUtf83(const char* s, const char* c, int n) { QString _ret = QFontDialog::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QFontDialog_SetOption2(QFontDialog* self, int option, bool on) { @@ -154,13 +178,13 @@ QFont* QFontDialog_GetFont3(bool* ok, QFont* initial, QWidget* parent) { return new QFont(QFontDialog::getFont(ok, *initial, parent)); } -QFont* QFontDialog_GetFont4(bool* ok, QFont* initial, QWidget* parent, struct miqt_string* title) { - QString title_QString = QString::fromUtf8(&title->data, title->len); +QFont* QFontDialog_GetFont4(bool* ok, QFont* initial, QWidget* parent, struct miqt_string title) { + QString title_QString = QString::fromUtf8(title.data, title.len); return new QFont(QFontDialog::getFont(ok, *initial, parent, title_QString)); } -QFont* QFontDialog_GetFont5(bool* ok, QFont* initial, QWidget* parent, struct miqt_string* title, int options) { - QString title_QString = QString::fromUtf8(&title->data, title->len); +QFont* QFontDialog_GetFont5(bool* ok, QFont* initial, QWidget* parent, struct miqt_string title, int options) { + QString title_QString = QString::fromUtf8(title.data, title.len); return new QFont(QFontDialog::getFont(ok, *initial, parent, title_QString, static_cast(options))); } diff --git a/qt/gen_qfontdialog.go b/qt/gen_qfontdialog.go index 8402cc8c..68d237c3 100644 --- a/qt/gen_qfontdialog.go +++ b/qt/gen_qfontdialog.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "runtime/cgo" "unsafe" @@ -87,24 +86,24 @@ func (this *QFontDialog) MetaObject() *QMetaObject { func (this *QFontDialog) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QFontDialog_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QFontDialog_Metacast(this.h, param1_Cstring)) } func QFontDialog_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QFontDialog_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFontDialog_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QFontDialog_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QFontDialog_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFontDialog_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -205,9 +204,9 @@ func QFontDialog_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFontDialog_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFontDialog_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -216,9 +215,9 @@ func QFontDialog_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFontDialog_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFontDialog_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -227,9 +226,9 @@ func QFontDialog_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFontDialog_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFontDialog_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -238,9 +237,9 @@ func QFontDialog_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFontDialog_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFontDialog_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -263,18 +262,22 @@ func QFontDialog_GetFont3(ok *bool, initial *QFont, parent *QWidget) *QFont { } func QFontDialog_GetFont4(ok *bool, initial *QFont, parent *QWidget, title string) *QFont { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - _ret := C.QFontDialog_GetFont4((*C.bool)(unsafe.Pointer(ok)), initial.cPointer(), parent.cPointer(), (*C.struct_miqt_string)(title_ms)) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + _ret := C.QFontDialog_GetFont4((*C.bool)(unsafe.Pointer(ok)), initial.cPointer(), parent.cPointer(), title_ms) _goptr := newQFont(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func QFontDialog_GetFont5(ok *bool, initial *QFont, parent *QWidget, title string, options QFontDialog__FontDialogOption) *QFont { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - _ret := C.QFontDialog_GetFont5((*C.bool)(unsafe.Pointer(ok)), initial.cPointer(), parent.cPointer(), (*C.struct_miqt_string)(title_ms), (C.int)(options)) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + _ret := C.QFontDialog_GetFont5((*C.bool)(unsafe.Pointer(ok)), initial.cPointer(), parent.cPointer(), title_ms, (C.int)(options)) _goptr := newQFont(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr diff --git a/qt/gen_qfontdialog.h b/qt/gen_qfontdialog.h index 7727c66e..734efe5d 100644 --- a/qt/gen_qfontdialog.h +++ b/qt/gen_qfontdialog.h @@ -31,8 +31,8 @@ QFontDialog* QFontDialog_new3(QWidget* parent); QFontDialog* QFontDialog_new4(QFont* initial, QWidget* parent); QMetaObject* QFontDialog_MetaObject(const QFontDialog* self); void* QFontDialog_Metacast(QFontDialog* self, const char* param1); -struct miqt_string* QFontDialog_Tr(const char* s); -struct miqt_string* QFontDialog_TrUtf8(const char* s); +struct miqt_string QFontDialog_Tr(const char* s); +struct miqt_string QFontDialog_TrUtf8(const char* s); void QFontDialog_SetCurrentFont(QFontDialog* self, QFont* font); QFont* QFontDialog_CurrentFont(const QFontDialog* self); QFont* QFontDialog_SelectedFont(const QFontDialog* self); @@ -47,15 +47,15 @@ void QFontDialog_CurrentFontChanged(QFontDialog* self, QFont* font); void QFontDialog_connect_CurrentFontChanged(QFontDialog* self, intptr_t slot); void QFontDialog_FontSelected(QFontDialog* self, QFont* font); void QFontDialog_connect_FontSelected(QFontDialog* self, intptr_t slot); -struct miqt_string* QFontDialog_Tr2(const char* s, const char* c); -struct miqt_string* QFontDialog_Tr3(const char* s, const char* c, int n); -struct miqt_string* QFontDialog_TrUtf82(const char* s, const char* c); -struct miqt_string* QFontDialog_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QFontDialog_Tr2(const char* s, const char* c); +struct miqt_string QFontDialog_Tr3(const char* s, const char* c, int n); +struct miqt_string QFontDialog_TrUtf82(const char* s, const char* c); +struct miqt_string QFontDialog_TrUtf83(const char* s, const char* c, int n); void QFontDialog_SetOption2(QFontDialog* self, int option, bool on); QFont* QFontDialog_GetFont22(bool* ok, QWidget* parent); QFont* QFontDialog_GetFont3(bool* ok, QFont* initial, QWidget* parent); -QFont* QFontDialog_GetFont4(bool* ok, QFont* initial, QWidget* parent, struct miqt_string* title); -QFont* QFontDialog_GetFont5(bool* ok, QFont* initial, QWidget* parent, struct miqt_string* title, int options); +QFont* QFontDialog_GetFont4(bool* ok, QFont* initial, QWidget* parent, struct miqt_string title); +QFont* QFontDialog_GetFont5(bool* ok, QFont* initial, QWidget* parent, struct miqt_string title, int options); void QFontDialog_Delete(QFontDialog* self); #ifdef __cplusplus diff --git a/qt/gen_qfontinfo.cpp b/qt/gen_qfontinfo.cpp index be9c1f8e..37fcac2f 100644 --- a/qt/gen_qfontinfo.cpp +++ b/qt/gen_qfontinfo.cpp @@ -23,18 +23,26 @@ void QFontInfo_Swap(QFontInfo* self, QFontInfo* other) { self->swap(*other); } -struct miqt_string* QFontInfo_Family(const QFontInfo* self) { +struct miqt_string QFontInfo_Family(const QFontInfo* self) { QString _ret = self->family(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFontInfo_StyleName(const QFontInfo* self) { +struct miqt_string QFontInfo_StyleName(const QFontInfo* self) { QString _ret = self->styleName(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QFontInfo_PixelSize(const QFontInfo* self) { diff --git a/qt/gen_qfontinfo.go b/qt/gen_qfontinfo.go index cad433d9..a5bbc69f 100644 --- a/qt/gen_qfontinfo.go +++ b/qt/gen_qfontinfo.go @@ -63,16 +63,16 @@ func (this *QFontInfo) Swap(other *QFontInfo) { } func (this *QFontInfo) Family() string { - var _ms *C.struct_miqt_string = C.QFontInfo_Family(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFontInfo_Family(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QFontInfo) StyleName() string { - var _ms *C.struct_miqt_string = C.QFontInfo_StyleName(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFontInfo_StyleName(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qfontinfo.h b/qt/gen_qfontinfo.h index 9a03c156..410c0e43 100644 --- a/qt/gen_qfontinfo.h +++ b/qt/gen_qfontinfo.h @@ -25,8 +25,8 @@ QFontInfo* QFontInfo_new(QFont* param1); QFontInfo* QFontInfo_new2(QFontInfo* param1); void QFontInfo_OperatorAssign(QFontInfo* self, QFontInfo* param1); void QFontInfo_Swap(QFontInfo* self, QFontInfo* other); -struct miqt_string* QFontInfo_Family(const QFontInfo* self); -struct miqt_string* QFontInfo_StyleName(const QFontInfo* self); +struct miqt_string QFontInfo_Family(const QFontInfo* self); +struct miqt_string QFontInfo_StyleName(const QFontInfo* self); int QFontInfo_PixelSize(const QFontInfo* self); int QFontInfo_PointSize(const QFontInfo* self); double QFontInfo_PointSizeF(const QFontInfo* self); diff --git a/qt/gen_qfontmetrics.cpp b/qt/gen_qfontmetrics.cpp index 936076a1..37955539 100644 --- a/qt/gen_qfontmetrics.cpp +++ b/qt/gen_qfontmetrics.cpp @@ -94,13 +94,13 @@ int QFontMetrics_RightBearing(const QFontMetrics* self, QChar* param1) { return self->rightBearing(*param1); } -int QFontMetrics_Width(const QFontMetrics* self, struct miqt_string* param1) { - QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); +int QFontMetrics_Width(const QFontMetrics* self, struct miqt_string param1) { + QString param1_QString = QString::fromUtf8(param1.data, param1.len); return self->width(param1_QString); } -int QFontMetrics_Width2(const QFontMetrics* self, struct miqt_string* param1, int lenVal, int flags) { - QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); +int QFontMetrics_Width2(const QFontMetrics* self, struct miqt_string param1, int lenVal, int flags) { + QString param1_QString = QString::fromUtf8(param1.data, param1.len); return self->width(param1_QString, static_cast(lenVal), static_cast(flags)); } @@ -108,8 +108,8 @@ int QFontMetrics_WidthWithQChar(const QFontMetrics* self, QChar* param1) { return self->width(*param1); } -int QFontMetrics_HorizontalAdvance(const QFontMetrics* self, struct miqt_string* param1) { - QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); +int QFontMetrics_HorizontalAdvance(const QFontMetrics* self, struct miqt_string param1) { + QString param1_QString = QString::fromUtf8(param1.data, param1.len); return self->horizontalAdvance(param1_QString); } @@ -117,8 +117,8 @@ int QFontMetrics_HorizontalAdvanceWithQChar(const QFontMetrics* self, QChar* par return self->horizontalAdvance(*param1); } -int QFontMetrics_CharWidth(const QFontMetrics* self, struct miqt_string* str, int pos) { - QString str_QString = QString::fromUtf8(&str->data, str->len); +int QFontMetrics_CharWidth(const QFontMetrics* self, struct miqt_string str, int pos) { + QString str_QString = QString::fromUtf8(str.data, str.len); return self->charWidth(str_QString, static_cast(pos)); } @@ -126,37 +126,41 @@ QRect* QFontMetrics_BoundingRect(const QFontMetrics* self, QChar* param1) { return new QRect(self->boundingRect(*param1)); } -QRect* QFontMetrics_BoundingRectWithText(const QFontMetrics* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QRect* QFontMetrics_BoundingRectWithText(const QFontMetrics* self, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QRect(self->boundingRect(text_QString)); } -QRect* QFontMetrics_BoundingRect2(const QFontMetrics* self, QRect* r, int flags, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QRect* QFontMetrics_BoundingRect2(const QFontMetrics* self, QRect* r, int flags, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QRect(self->boundingRect(*r, static_cast(flags), text_QString)); } -QRect* QFontMetrics_BoundingRect3(const QFontMetrics* self, int x, int y, int w, int h, int flags, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QRect* QFontMetrics_BoundingRect3(const QFontMetrics* self, int x, int y, int w, int h, int flags, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QRect(self->boundingRect(static_cast(x), static_cast(y), static_cast(w), static_cast(h), static_cast(flags), text_QString)); } -QSize* QFontMetrics_Size(const QFontMetrics* self, int flags, struct miqt_string* str) { - QString str_QString = QString::fromUtf8(&str->data, str->len); +QSize* QFontMetrics_Size(const QFontMetrics* self, int flags, struct miqt_string str) { + QString str_QString = QString::fromUtf8(str.data, str.len); return new QSize(self->size(static_cast(flags), str_QString)); } -QRect* QFontMetrics_TightBoundingRect(const QFontMetrics* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QRect* QFontMetrics_TightBoundingRect(const QFontMetrics* self, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QRect(self->tightBoundingRect(text_QString)); } -struct miqt_string* QFontMetrics_ElidedText(const QFontMetrics* self, struct miqt_string* text, int mode, int width) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +struct miqt_string QFontMetrics_ElidedText(const QFontMetrics* self, struct miqt_string text, int mode, int width) { + QString text_QString = QString::fromUtf8(text.data, text.len); QString _ret = self->elidedText(text_QString, static_cast(mode), static_cast(width)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QFontMetrics_UnderlinePos(const QFontMetrics* self) { @@ -188,52 +192,56 @@ bool QFontMetrics_OperatorNotEqual(const QFontMetrics* self, QFontMetrics* other return self->operator!=(*other); } -int QFontMetrics_Width22(const QFontMetrics* self, struct miqt_string* param1, int lenVal) { - QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); +int QFontMetrics_Width22(const QFontMetrics* self, struct miqt_string param1, int lenVal) { + QString param1_QString = QString::fromUtf8(param1.data, param1.len); return self->width(param1_QString, static_cast(lenVal)); } -int QFontMetrics_HorizontalAdvance2(const QFontMetrics* self, struct miqt_string* param1, int lenVal) { - QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); +int QFontMetrics_HorizontalAdvance2(const QFontMetrics* self, struct miqt_string param1, int lenVal) { + QString param1_QString = QString::fromUtf8(param1.data, param1.len); return self->horizontalAdvance(param1_QString, static_cast(lenVal)); } -QRect* QFontMetrics_BoundingRect4(const QFontMetrics* self, QRect* r, int flags, struct miqt_string* text, int tabstops) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QRect* QFontMetrics_BoundingRect4(const QFontMetrics* self, QRect* r, int flags, struct miqt_string text, int tabstops) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QRect(self->boundingRect(*r, static_cast(flags), text_QString, static_cast(tabstops))); } -QRect* QFontMetrics_BoundingRect5(const QFontMetrics* self, QRect* r, int flags, struct miqt_string* text, int tabstops, int* tabarray) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QRect* QFontMetrics_BoundingRect5(const QFontMetrics* self, QRect* r, int flags, struct miqt_string text, int tabstops, int* tabarray) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QRect(self->boundingRect(*r, static_cast(flags), text_QString, static_cast(tabstops), static_cast(tabarray))); } -QRect* QFontMetrics_BoundingRect7(const QFontMetrics* self, int x, int y, int w, int h, int flags, struct miqt_string* text, int tabstops) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QRect* QFontMetrics_BoundingRect7(const QFontMetrics* self, int x, int y, int w, int h, int flags, struct miqt_string text, int tabstops) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QRect(self->boundingRect(static_cast(x), static_cast(y), static_cast(w), static_cast(h), static_cast(flags), text_QString, static_cast(tabstops))); } -QRect* QFontMetrics_BoundingRect8(const QFontMetrics* self, int x, int y, int w, int h, int flags, struct miqt_string* text, int tabstops, int* tabarray) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QRect* QFontMetrics_BoundingRect8(const QFontMetrics* self, int x, int y, int w, int h, int flags, struct miqt_string text, int tabstops, int* tabarray) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QRect(self->boundingRect(static_cast(x), static_cast(y), static_cast(w), static_cast(h), static_cast(flags), text_QString, static_cast(tabstops), static_cast(tabarray))); } -QSize* QFontMetrics_Size3(const QFontMetrics* self, int flags, struct miqt_string* str, int tabstops) { - QString str_QString = QString::fromUtf8(&str->data, str->len); +QSize* QFontMetrics_Size3(const QFontMetrics* self, int flags, struct miqt_string str, int tabstops) { + QString str_QString = QString::fromUtf8(str.data, str.len); return new QSize(self->size(static_cast(flags), str_QString, static_cast(tabstops))); } -QSize* QFontMetrics_Size4(const QFontMetrics* self, int flags, struct miqt_string* str, int tabstops, int* tabarray) { - QString str_QString = QString::fromUtf8(&str->data, str->len); +QSize* QFontMetrics_Size4(const QFontMetrics* self, int flags, struct miqt_string str, int tabstops, int* tabarray) { + QString str_QString = QString::fromUtf8(str.data, str.len); return new QSize(self->size(static_cast(flags), str_QString, static_cast(tabstops), static_cast(tabarray))); } -struct miqt_string* QFontMetrics_ElidedText4(const QFontMetrics* self, struct miqt_string* text, int mode, int width, int flags) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +struct miqt_string QFontMetrics_ElidedText4(const QFontMetrics* self, struct miqt_string text, int mode, int width, int flags) { + QString text_QString = QString::fromUtf8(text.data, text.len); QString _ret = self->elidedText(text_QString, static_cast(mode), static_cast(width), static_cast(flags)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QFontMetrics_Delete(QFontMetrics* self) { @@ -341,8 +349,8 @@ double QFontMetricsF_RightBearing(const QFontMetricsF* self, QChar* param1) { return static_cast(_ret); } -double QFontMetricsF_Width(const QFontMetricsF* self, struct miqt_string* stringVal) { - QString stringVal_QString = QString::fromUtf8(&stringVal->data, stringVal->len); +double QFontMetricsF_Width(const QFontMetricsF* self, struct miqt_string stringVal) { + QString stringVal_QString = QString::fromUtf8(stringVal.data, stringVal.len); qreal _ret = self->width(stringVal_QString); return static_cast(_ret); } @@ -352,8 +360,8 @@ double QFontMetricsF_WidthWithQChar(const QFontMetricsF* self, QChar* param1) { return static_cast(_ret); } -double QFontMetricsF_HorizontalAdvance(const QFontMetricsF* self, struct miqt_string* stringVal) { - QString stringVal_QString = QString::fromUtf8(&stringVal->data, stringVal->len); +double QFontMetricsF_HorizontalAdvance(const QFontMetricsF* self, struct miqt_string stringVal) { + QString stringVal_QString = QString::fromUtf8(stringVal.data, stringVal.len); qreal _ret = self->horizontalAdvance(stringVal_QString); return static_cast(_ret); } @@ -363,8 +371,8 @@ double QFontMetricsF_HorizontalAdvanceWithQChar(const QFontMetricsF* self, QChar return static_cast(_ret); } -QRectF* QFontMetricsF_BoundingRect(const QFontMetricsF* self, struct miqt_string* stringVal) { - QString stringVal_QString = QString::fromUtf8(&stringVal->data, stringVal->len); +QRectF* QFontMetricsF_BoundingRect(const QFontMetricsF* self, struct miqt_string stringVal) { + QString stringVal_QString = QString::fromUtf8(stringVal.data, stringVal.len); return new QRectF(self->boundingRect(stringVal_QString)); } @@ -372,27 +380,31 @@ QRectF* QFontMetricsF_BoundingRectWithQChar(const QFontMetricsF* self, QChar* pa return new QRectF(self->boundingRect(*param1)); } -QRectF* QFontMetricsF_BoundingRect2(const QFontMetricsF* self, QRectF* r, int flags, struct miqt_string* stringVal) { - QString stringVal_QString = QString::fromUtf8(&stringVal->data, stringVal->len); +QRectF* QFontMetricsF_BoundingRect2(const QFontMetricsF* self, QRectF* r, int flags, struct miqt_string stringVal) { + QString stringVal_QString = QString::fromUtf8(stringVal.data, stringVal.len); return new QRectF(self->boundingRect(*r, static_cast(flags), stringVal_QString)); } -QSizeF* QFontMetricsF_Size(const QFontMetricsF* self, int flags, struct miqt_string* str) { - QString str_QString = QString::fromUtf8(&str->data, str->len); +QSizeF* QFontMetricsF_Size(const QFontMetricsF* self, int flags, struct miqt_string str) { + QString str_QString = QString::fromUtf8(str.data, str.len); return new QSizeF(self->size(static_cast(flags), str_QString)); } -QRectF* QFontMetricsF_TightBoundingRect(const QFontMetricsF* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QRectF* QFontMetricsF_TightBoundingRect(const QFontMetricsF* self, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QRectF(self->tightBoundingRect(text_QString)); } -struct miqt_string* QFontMetricsF_ElidedText(const QFontMetricsF* self, struct miqt_string* text, int mode, double width) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +struct miqt_string QFontMetricsF_ElidedText(const QFontMetricsF* self, struct miqt_string text, int mode, double width) { + QString text_QString = QString::fromUtf8(text.data, text.len); QString _ret = self->elidedText(text_QString, static_cast(mode), static_cast(width)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } double QFontMetricsF_UnderlinePos(const QFontMetricsF* self) { @@ -428,38 +440,42 @@ bool QFontMetricsF_OperatorNotEqual(const QFontMetricsF* self, QFontMetricsF* ot return self->operator!=(*other); } -double QFontMetricsF_HorizontalAdvance2(const QFontMetricsF* self, struct miqt_string* stringVal, int length) { - QString stringVal_QString = QString::fromUtf8(&stringVal->data, stringVal->len); +double QFontMetricsF_HorizontalAdvance2(const QFontMetricsF* self, struct miqt_string stringVal, int length) { + QString stringVal_QString = QString::fromUtf8(stringVal.data, stringVal.len); qreal _ret = self->horizontalAdvance(stringVal_QString, static_cast(length)); return static_cast(_ret); } -QRectF* QFontMetricsF_BoundingRect4(const QFontMetricsF* self, QRectF* r, int flags, struct miqt_string* stringVal, int tabstops) { - QString stringVal_QString = QString::fromUtf8(&stringVal->data, stringVal->len); +QRectF* QFontMetricsF_BoundingRect4(const QFontMetricsF* self, QRectF* r, int flags, struct miqt_string stringVal, int tabstops) { + QString stringVal_QString = QString::fromUtf8(stringVal.data, stringVal.len); return new QRectF(self->boundingRect(*r, static_cast(flags), stringVal_QString, static_cast(tabstops))); } -QRectF* QFontMetricsF_BoundingRect5(const QFontMetricsF* self, QRectF* r, int flags, struct miqt_string* stringVal, int tabstops, int* tabarray) { - QString stringVal_QString = QString::fromUtf8(&stringVal->data, stringVal->len); +QRectF* QFontMetricsF_BoundingRect5(const QFontMetricsF* self, QRectF* r, int flags, struct miqt_string stringVal, int tabstops, int* tabarray) { + QString stringVal_QString = QString::fromUtf8(stringVal.data, stringVal.len); return new QRectF(self->boundingRect(*r, static_cast(flags), stringVal_QString, static_cast(tabstops), static_cast(tabarray))); } -QSizeF* QFontMetricsF_Size3(const QFontMetricsF* self, int flags, struct miqt_string* str, int tabstops) { - QString str_QString = QString::fromUtf8(&str->data, str->len); +QSizeF* QFontMetricsF_Size3(const QFontMetricsF* self, int flags, struct miqt_string str, int tabstops) { + QString str_QString = QString::fromUtf8(str.data, str.len); return new QSizeF(self->size(static_cast(flags), str_QString, static_cast(tabstops))); } -QSizeF* QFontMetricsF_Size4(const QFontMetricsF* self, int flags, struct miqt_string* str, int tabstops, int* tabarray) { - QString str_QString = QString::fromUtf8(&str->data, str->len); +QSizeF* QFontMetricsF_Size4(const QFontMetricsF* self, int flags, struct miqt_string str, int tabstops, int* tabarray) { + QString str_QString = QString::fromUtf8(str.data, str.len); return new QSizeF(self->size(static_cast(flags), str_QString, static_cast(tabstops), static_cast(tabarray))); } -struct miqt_string* QFontMetricsF_ElidedText4(const QFontMetricsF* self, struct miqt_string* text, int mode, double width, int flags) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +struct miqt_string QFontMetricsF_ElidedText4(const QFontMetricsF* self, struct miqt_string text, int mode, double width, int flags) { + QString text_QString = QString::fromUtf8(text.data, text.len); QString _ret = self->elidedText(text_QString, static_cast(mode), static_cast(width), static_cast(flags)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QFontMetricsF_Delete(QFontMetricsF* self) { diff --git a/qt/gen_qfontmetrics.go b/qt/gen_qfontmetrics.go index b2e303b5..0050c6b8 100644 --- a/qt/gen_qfontmetrics.go +++ b/qt/gen_qfontmetrics.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -130,15 +129,19 @@ func (this *QFontMetrics) RightBearing(param1 QChar) int { } func (this *QFontMetrics) Width(param1 string) int { - param1_ms := libmiqt.Strdupg(param1) - defer C.free(param1_ms) - return (int)(C.QFontMetrics_Width(this.h, (*C.struct_miqt_string)(param1_ms))) + param1_ms := C.struct_miqt_string{} + param1_ms.data = C.CString(param1) + param1_ms.len = C.size_t(len(param1)) + defer C.free(unsafe.Pointer(param1_ms.data)) + return (int)(C.QFontMetrics_Width(this.h, param1_ms)) } func (this *QFontMetrics) Width2(param1 string, lenVal int, flags int) int { - param1_ms := libmiqt.Strdupg(param1) - defer C.free(param1_ms) - return (int)(C.QFontMetrics_Width2(this.h, (*C.struct_miqt_string)(param1_ms), (C.int)(lenVal), (C.int)(flags))) + param1_ms := C.struct_miqt_string{} + param1_ms.data = C.CString(param1) + param1_ms.len = C.size_t(len(param1)) + defer C.free(unsafe.Pointer(param1_ms.data)) + return (int)(C.QFontMetrics_Width2(this.h, param1_ms, (C.int)(lenVal), (C.int)(flags))) } func (this *QFontMetrics) WidthWithQChar(param1 QChar) int { @@ -146,9 +149,11 @@ func (this *QFontMetrics) WidthWithQChar(param1 QChar) int { } func (this *QFontMetrics) HorizontalAdvance(param1 string) int { - param1_ms := libmiqt.Strdupg(param1) - defer C.free(param1_ms) - return (int)(C.QFontMetrics_HorizontalAdvance(this.h, (*C.struct_miqt_string)(param1_ms))) + param1_ms := C.struct_miqt_string{} + param1_ms.data = C.CString(param1) + param1_ms.len = C.size_t(len(param1)) + defer C.free(unsafe.Pointer(param1_ms.data)) + return (int)(C.QFontMetrics_HorizontalAdvance(this.h, param1_ms)) } func (this *QFontMetrics) HorizontalAdvanceWithQChar(param1 QChar) int { @@ -156,9 +161,11 @@ func (this *QFontMetrics) HorizontalAdvanceWithQChar(param1 QChar) int { } func (this *QFontMetrics) CharWidth(str string, pos int) int { - str_ms := libmiqt.Strdupg(str) - defer C.free(str_ms) - return (int)(C.QFontMetrics_CharWidth(this.h, (*C.struct_miqt_string)(str_ms), (C.int)(pos))) + str_ms := C.struct_miqt_string{} + str_ms.data = C.CString(str) + str_ms.len = C.size_t(len(str)) + defer C.free(unsafe.Pointer(str_ms.data)) + return (int)(C.QFontMetrics_CharWidth(this.h, str_ms, (C.int)(pos))) } func (this *QFontMetrics) BoundingRect(param1 QChar) *QRect { @@ -169,56 +176,68 @@ func (this *QFontMetrics) BoundingRect(param1 QChar) *QRect { } func (this *QFontMetrics) BoundingRectWithText(text string) *QRect { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - _ret := C.QFontMetrics_BoundingRectWithText(this.h, (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + _ret := C.QFontMetrics_BoundingRectWithText(this.h, text_ms) _goptr := newQRect(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QFontMetrics) BoundingRect2(r *QRect, flags int, text string) *QRect { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - _ret := C.QFontMetrics_BoundingRect2(this.h, r.cPointer(), (C.int)(flags), (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + _ret := C.QFontMetrics_BoundingRect2(this.h, r.cPointer(), (C.int)(flags), text_ms) _goptr := newQRect(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QFontMetrics) BoundingRect3(x int, y int, w int, h int, flags int, text string) *QRect { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - _ret := C.QFontMetrics_BoundingRect3(this.h, (C.int)(x), (C.int)(y), (C.int)(w), (C.int)(h), (C.int)(flags), (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + _ret := C.QFontMetrics_BoundingRect3(this.h, (C.int)(x), (C.int)(y), (C.int)(w), (C.int)(h), (C.int)(flags), text_ms) _goptr := newQRect(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QFontMetrics) Size(flags int, str string) *QSize { - str_ms := libmiqt.Strdupg(str) - defer C.free(str_ms) - _ret := C.QFontMetrics_Size(this.h, (C.int)(flags), (*C.struct_miqt_string)(str_ms)) + str_ms := C.struct_miqt_string{} + str_ms.data = C.CString(str) + str_ms.len = C.size_t(len(str)) + defer C.free(unsafe.Pointer(str_ms.data)) + _ret := C.QFontMetrics_Size(this.h, (C.int)(flags), str_ms) _goptr := newQSize(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QFontMetrics) TightBoundingRect(text string) *QRect { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - _ret := C.QFontMetrics_TightBoundingRect(this.h, (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + _ret := C.QFontMetrics_TightBoundingRect(this.h, text_ms) _goptr := newQRect(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QFontMetrics) ElidedText(text string, mode TextElideMode, width int) string { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - var _ms *C.struct_miqt_string = C.QFontMetrics_ElidedText(this.h, (*C.struct_miqt_string)(text_ms), (C.int)(mode), (C.int)(width)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + var _ms C.struct_miqt_string = C.QFontMetrics_ElidedText(this.h, text_ms, (C.int)(mode), (C.int)(width)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -251,77 +270,95 @@ func (this *QFontMetrics) OperatorNotEqual(other *QFontMetrics) bool { } func (this *QFontMetrics) Width22(param1 string, lenVal int) int { - param1_ms := libmiqt.Strdupg(param1) - defer C.free(param1_ms) - return (int)(C.QFontMetrics_Width22(this.h, (*C.struct_miqt_string)(param1_ms), (C.int)(lenVal))) + param1_ms := C.struct_miqt_string{} + param1_ms.data = C.CString(param1) + param1_ms.len = C.size_t(len(param1)) + defer C.free(unsafe.Pointer(param1_ms.data)) + return (int)(C.QFontMetrics_Width22(this.h, param1_ms, (C.int)(lenVal))) } func (this *QFontMetrics) HorizontalAdvance2(param1 string, lenVal int) int { - param1_ms := libmiqt.Strdupg(param1) - defer C.free(param1_ms) - return (int)(C.QFontMetrics_HorizontalAdvance2(this.h, (*C.struct_miqt_string)(param1_ms), (C.int)(lenVal))) + param1_ms := C.struct_miqt_string{} + param1_ms.data = C.CString(param1) + param1_ms.len = C.size_t(len(param1)) + defer C.free(unsafe.Pointer(param1_ms.data)) + return (int)(C.QFontMetrics_HorizontalAdvance2(this.h, param1_ms, (C.int)(lenVal))) } func (this *QFontMetrics) BoundingRect4(r *QRect, flags int, text string, tabstops int) *QRect { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - _ret := C.QFontMetrics_BoundingRect4(this.h, r.cPointer(), (C.int)(flags), (*C.struct_miqt_string)(text_ms), (C.int)(tabstops)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + _ret := C.QFontMetrics_BoundingRect4(this.h, r.cPointer(), (C.int)(flags), text_ms, (C.int)(tabstops)) _goptr := newQRect(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QFontMetrics) BoundingRect5(r *QRect, flags int, text string, tabstops int, tabarray *int) *QRect { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - _ret := C.QFontMetrics_BoundingRect5(this.h, r.cPointer(), (C.int)(flags), (*C.struct_miqt_string)(text_ms), (C.int)(tabstops), (*C.int)(unsafe.Pointer(tabarray))) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + _ret := C.QFontMetrics_BoundingRect5(this.h, r.cPointer(), (C.int)(flags), text_ms, (C.int)(tabstops), (*C.int)(unsafe.Pointer(tabarray))) _goptr := newQRect(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QFontMetrics) BoundingRect7(x int, y int, w int, h int, flags int, text string, tabstops int) *QRect { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - _ret := C.QFontMetrics_BoundingRect7(this.h, (C.int)(x), (C.int)(y), (C.int)(w), (C.int)(h), (C.int)(flags), (*C.struct_miqt_string)(text_ms), (C.int)(tabstops)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + _ret := C.QFontMetrics_BoundingRect7(this.h, (C.int)(x), (C.int)(y), (C.int)(w), (C.int)(h), (C.int)(flags), text_ms, (C.int)(tabstops)) _goptr := newQRect(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QFontMetrics) BoundingRect8(x int, y int, w int, h int, flags int, text string, tabstops int, tabarray *int) *QRect { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - _ret := C.QFontMetrics_BoundingRect8(this.h, (C.int)(x), (C.int)(y), (C.int)(w), (C.int)(h), (C.int)(flags), (*C.struct_miqt_string)(text_ms), (C.int)(tabstops), (*C.int)(unsafe.Pointer(tabarray))) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + _ret := C.QFontMetrics_BoundingRect8(this.h, (C.int)(x), (C.int)(y), (C.int)(w), (C.int)(h), (C.int)(flags), text_ms, (C.int)(tabstops), (*C.int)(unsafe.Pointer(tabarray))) _goptr := newQRect(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QFontMetrics) Size3(flags int, str string, tabstops int) *QSize { - str_ms := libmiqt.Strdupg(str) - defer C.free(str_ms) - _ret := C.QFontMetrics_Size3(this.h, (C.int)(flags), (*C.struct_miqt_string)(str_ms), (C.int)(tabstops)) + str_ms := C.struct_miqt_string{} + str_ms.data = C.CString(str) + str_ms.len = C.size_t(len(str)) + defer C.free(unsafe.Pointer(str_ms.data)) + _ret := C.QFontMetrics_Size3(this.h, (C.int)(flags), str_ms, (C.int)(tabstops)) _goptr := newQSize(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QFontMetrics) Size4(flags int, str string, tabstops int, tabarray *int) *QSize { - str_ms := libmiqt.Strdupg(str) - defer C.free(str_ms) - _ret := C.QFontMetrics_Size4(this.h, (C.int)(flags), (*C.struct_miqt_string)(str_ms), (C.int)(tabstops), (*C.int)(unsafe.Pointer(tabarray))) + str_ms := C.struct_miqt_string{} + str_ms.data = C.CString(str) + str_ms.len = C.size_t(len(str)) + defer C.free(unsafe.Pointer(str_ms.data)) + _ret := C.QFontMetrics_Size4(this.h, (C.int)(flags), str_ms, (C.int)(tabstops), (*C.int)(unsafe.Pointer(tabarray))) _goptr := newQSize(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QFontMetrics) ElidedText4(text string, mode TextElideMode, width int, flags int) string { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - var _ms *C.struct_miqt_string = C.QFontMetrics_ElidedText4(this.h, (*C.struct_miqt_string)(text_ms), (C.int)(mode), (C.int)(width), (C.int)(flags)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + var _ms C.struct_miqt_string = C.QFontMetrics_ElidedText4(this.h, text_ms, (C.int)(mode), (C.int)(width), (C.int)(flags)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -465,9 +502,11 @@ func (this *QFontMetricsF) RightBearing(param1 QChar) float64 { } func (this *QFontMetricsF) Width(stringVal string) float64 { - stringVal_ms := libmiqt.Strdupg(stringVal) - defer C.free(stringVal_ms) - return (float64)(C.QFontMetricsF_Width(this.h, (*C.struct_miqt_string)(stringVal_ms))) + stringVal_ms := C.struct_miqt_string{} + stringVal_ms.data = C.CString(stringVal) + stringVal_ms.len = C.size_t(len(stringVal)) + defer C.free(unsafe.Pointer(stringVal_ms.data)) + return (float64)(C.QFontMetricsF_Width(this.h, stringVal_ms)) } func (this *QFontMetricsF) WidthWithQChar(param1 QChar) float64 { @@ -475,9 +514,11 @@ func (this *QFontMetricsF) WidthWithQChar(param1 QChar) float64 { } func (this *QFontMetricsF) HorizontalAdvance(stringVal string) float64 { - stringVal_ms := libmiqt.Strdupg(stringVal) - defer C.free(stringVal_ms) - return (float64)(C.QFontMetricsF_HorizontalAdvance(this.h, (*C.struct_miqt_string)(stringVal_ms))) + stringVal_ms := C.struct_miqt_string{} + stringVal_ms.data = C.CString(stringVal) + stringVal_ms.len = C.size_t(len(stringVal)) + defer C.free(unsafe.Pointer(stringVal_ms.data)) + return (float64)(C.QFontMetricsF_HorizontalAdvance(this.h, stringVal_ms)) } func (this *QFontMetricsF) HorizontalAdvanceWithQChar(param1 QChar) float64 { @@ -485,9 +526,11 @@ func (this *QFontMetricsF) HorizontalAdvanceWithQChar(param1 QChar) float64 { } func (this *QFontMetricsF) BoundingRect(stringVal string) *QRectF { - stringVal_ms := libmiqt.Strdupg(stringVal) - defer C.free(stringVal_ms) - _ret := C.QFontMetricsF_BoundingRect(this.h, (*C.struct_miqt_string)(stringVal_ms)) + stringVal_ms := C.struct_miqt_string{} + stringVal_ms.data = C.CString(stringVal) + stringVal_ms.len = C.size_t(len(stringVal)) + defer C.free(unsafe.Pointer(stringVal_ms.data)) + _ret := C.QFontMetricsF_BoundingRect(this.h, stringVal_ms) _goptr := newQRectF(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -501,38 +544,46 @@ func (this *QFontMetricsF) BoundingRectWithQChar(param1 QChar) *QRectF { } func (this *QFontMetricsF) BoundingRect2(r *QRectF, flags int, stringVal string) *QRectF { - stringVal_ms := libmiqt.Strdupg(stringVal) - defer C.free(stringVal_ms) - _ret := C.QFontMetricsF_BoundingRect2(this.h, r.cPointer(), (C.int)(flags), (*C.struct_miqt_string)(stringVal_ms)) + stringVal_ms := C.struct_miqt_string{} + stringVal_ms.data = C.CString(stringVal) + stringVal_ms.len = C.size_t(len(stringVal)) + defer C.free(unsafe.Pointer(stringVal_ms.data)) + _ret := C.QFontMetricsF_BoundingRect2(this.h, r.cPointer(), (C.int)(flags), stringVal_ms) _goptr := newQRectF(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QFontMetricsF) Size(flags int, str string) *QSizeF { - str_ms := libmiqt.Strdupg(str) - defer C.free(str_ms) - _ret := C.QFontMetricsF_Size(this.h, (C.int)(flags), (*C.struct_miqt_string)(str_ms)) + str_ms := C.struct_miqt_string{} + str_ms.data = C.CString(str) + str_ms.len = C.size_t(len(str)) + defer C.free(unsafe.Pointer(str_ms.data)) + _ret := C.QFontMetricsF_Size(this.h, (C.int)(flags), str_ms) _goptr := newQSizeF(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QFontMetricsF) TightBoundingRect(text string) *QRectF { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - _ret := C.QFontMetricsF_TightBoundingRect(this.h, (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + _ret := C.QFontMetricsF_TightBoundingRect(this.h, text_ms) _goptr := newQRectF(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QFontMetricsF) ElidedText(text string, mode TextElideMode, width float64) string { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - var _ms *C.struct_miqt_string = C.QFontMetricsF_ElidedText(this.h, (*C.struct_miqt_string)(text_ms), (C.int)(mode), (C.double)(width)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + var _ms C.struct_miqt_string = C.QFontMetricsF_ElidedText(this.h, text_ms, (C.int)(mode), (C.double)(width)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -565,53 +616,65 @@ func (this *QFontMetricsF) OperatorNotEqual(other *QFontMetricsF) bool { } func (this *QFontMetricsF) HorizontalAdvance2(stringVal string, length int) float64 { - stringVal_ms := libmiqt.Strdupg(stringVal) - defer C.free(stringVal_ms) - return (float64)(C.QFontMetricsF_HorizontalAdvance2(this.h, (*C.struct_miqt_string)(stringVal_ms), (C.int)(length))) + stringVal_ms := C.struct_miqt_string{} + stringVal_ms.data = C.CString(stringVal) + stringVal_ms.len = C.size_t(len(stringVal)) + defer C.free(unsafe.Pointer(stringVal_ms.data)) + return (float64)(C.QFontMetricsF_HorizontalAdvance2(this.h, stringVal_ms, (C.int)(length))) } func (this *QFontMetricsF) BoundingRect4(r *QRectF, flags int, stringVal string, tabstops int) *QRectF { - stringVal_ms := libmiqt.Strdupg(stringVal) - defer C.free(stringVal_ms) - _ret := C.QFontMetricsF_BoundingRect4(this.h, r.cPointer(), (C.int)(flags), (*C.struct_miqt_string)(stringVal_ms), (C.int)(tabstops)) + stringVal_ms := C.struct_miqt_string{} + stringVal_ms.data = C.CString(stringVal) + stringVal_ms.len = C.size_t(len(stringVal)) + defer C.free(unsafe.Pointer(stringVal_ms.data)) + _ret := C.QFontMetricsF_BoundingRect4(this.h, r.cPointer(), (C.int)(flags), stringVal_ms, (C.int)(tabstops)) _goptr := newQRectF(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QFontMetricsF) BoundingRect5(r *QRectF, flags int, stringVal string, tabstops int, tabarray *int) *QRectF { - stringVal_ms := libmiqt.Strdupg(stringVal) - defer C.free(stringVal_ms) - _ret := C.QFontMetricsF_BoundingRect5(this.h, r.cPointer(), (C.int)(flags), (*C.struct_miqt_string)(stringVal_ms), (C.int)(tabstops), (*C.int)(unsafe.Pointer(tabarray))) + stringVal_ms := C.struct_miqt_string{} + stringVal_ms.data = C.CString(stringVal) + stringVal_ms.len = C.size_t(len(stringVal)) + defer C.free(unsafe.Pointer(stringVal_ms.data)) + _ret := C.QFontMetricsF_BoundingRect5(this.h, r.cPointer(), (C.int)(flags), stringVal_ms, (C.int)(tabstops), (*C.int)(unsafe.Pointer(tabarray))) _goptr := newQRectF(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QFontMetricsF) Size3(flags int, str string, tabstops int) *QSizeF { - str_ms := libmiqt.Strdupg(str) - defer C.free(str_ms) - _ret := C.QFontMetricsF_Size3(this.h, (C.int)(flags), (*C.struct_miqt_string)(str_ms), (C.int)(tabstops)) + str_ms := C.struct_miqt_string{} + str_ms.data = C.CString(str) + str_ms.len = C.size_t(len(str)) + defer C.free(unsafe.Pointer(str_ms.data)) + _ret := C.QFontMetricsF_Size3(this.h, (C.int)(flags), str_ms, (C.int)(tabstops)) _goptr := newQSizeF(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QFontMetricsF) Size4(flags int, str string, tabstops int, tabarray *int) *QSizeF { - str_ms := libmiqt.Strdupg(str) - defer C.free(str_ms) - _ret := C.QFontMetricsF_Size4(this.h, (C.int)(flags), (*C.struct_miqt_string)(str_ms), (C.int)(tabstops), (*C.int)(unsafe.Pointer(tabarray))) + str_ms := C.struct_miqt_string{} + str_ms.data = C.CString(str) + str_ms.len = C.size_t(len(str)) + defer C.free(unsafe.Pointer(str_ms.data)) + _ret := C.QFontMetricsF_Size4(this.h, (C.int)(flags), str_ms, (C.int)(tabstops), (*C.int)(unsafe.Pointer(tabarray))) _goptr := newQSizeF(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QFontMetricsF) ElidedText4(text string, mode TextElideMode, width float64, flags int) string { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - var _ms *C.struct_miqt_string = C.QFontMetricsF_ElidedText4(this.h, (*C.struct_miqt_string)(text_ms), (C.int)(mode), (C.double)(width), (C.int)(flags)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + var _ms C.struct_miqt_string = C.QFontMetricsF_ElidedText4(this.h, text_ms, (C.int)(mode), (C.double)(width), (C.int)(flags)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qfontmetrics.h b/qt/gen_qfontmetrics.h index c2efb151..d6cfcbc0 100644 --- a/qt/gen_qfontmetrics.h +++ b/qt/gen_qfontmetrics.h @@ -55,19 +55,19 @@ bool QFontMetrics_InFont(const QFontMetrics* self, QChar* param1); bool QFontMetrics_InFontUcs4(const QFontMetrics* self, unsigned int ucs4); int QFontMetrics_LeftBearing(const QFontMetrics* self, QChar* param1); int QFontMetrics_RightBearing(const QFontMetrics* self, QChar* param1); -int QFontMetrics_Width(const QFontMetrics* self, struct miqt_string* param1); -int QFontMetrics_Width2(const QFontMetrics* self, struct miqt_string* param1, int lenVal, int flags); +int QFontMetrics_Width(const QFontMetrics* self, struct miqt_string param1); +int QFontMetrics_Width2(const QFontMetrics* self, struct miqt_string param1, int lenVal, int flags); int QFontMetrics_WidthWithQChar(const QFontMetrics* self, QChar* param1); -int QFontMetrics_HorizontalAdvance(const QFontMetrics* self, struct miqt_string* param1); +int QFontMetrics_HorizontalAdvance(const QFontMetrics* self, struct miqt_string param1); int QFontMetrics_HorizontalAdvanceWithQChar(const QFontMetrics* self, QChar* param1); -int QFontMetrics_CharWidth(const QFontMetrics* self, struct miqt_string* str, int pos); +int QFontMetrics_CharWidth(const QFontMetrics* self, struct miqt_string str, int pos); QRect* QFontMetrics_BoundingRect(const QFontMetrics* self, QChar* param1); -QRect* QFontMetrics_BoundingRectWithText(const QFontMetrics* self, struct miqt_string* text); -QRect* QFontMetrics_BoundingRect2(const QFontMetrics* self, QRect* r, int flags, struct miqt_string* text); -QRect* QFontMetrics_BoundingRect3(const QFontMetrics* self, int x, int y, int w, int h, int flags, struct miqt_string* text); -QSize* QFontMetrics_Size(const QFontMetrics* self, int flags, struct miqt_string* str); -QRect* QFontMetrics_TightBoundingRect(const QFontMetrics* self, struct miqt_string* text); -struct miqt_string* QFontMetrics_ElidedText(const QFontMetrics* self, struct miqt_string* text, int mode, int width); +QRect* QFontMetrics_BoundingRectWithText(const QFontMetrics* self, struct miqt_string text); +QRect* QFontMetrics_BoundingRect2(const QFontMetrics* self, QRect* r, int flags, struct miqt_string text); +QRect* QFontMetrics_BoundingRect3(const QFontMetrics* self, int x, int y, int w, int h, int flags, struct miqt_string text); +QSize* QFontMetrics_Size(const QFontMetrics* self, int flags, struct miqt_string str); +QRect* QFontMetrics_TightBoundingRect(const QFontMetrics* self, struct miqt_string text); +struct miqt_string QFontMetrics_ElidedText(const QFontMetrics* self, struct miqt_string text, int mode, int width); int QFontMetrics_UnderlinePos(const QFontMetrics* self); int QFontMetrics_OverlinePos(const QFontMetrics* self); int QFontMetrics_StrikeOutPos(const QFontMetrics* self); @@ -75,15 +75,15 @@ int QFontMetrics_LineWidth(const QFontMetrics* self); double QFontMetrics_FontDpi(const QFontMetrics* self); bool QFontMetrics_OperatorEqual(const QFontMetrics* self, QFontMetrics* other); bool QFontMetrics_OperatorNotEqual(const QFontMetrics* self, QFontMetrics* other); -int QFontMetrics_Width22(const QFontMetrics* self, struct miqt_string* param1, int lenVal); -int QFontMetrics_HorizontalAdvance2(const QFontMetrics* self, struct miqt_string* param1, int lenVal); -QRect* QFontMetrics_BoundingRect4(const QFontMetrics* self, QRect* r, int flags, struct miqt_string* text, int tabstops); -QRect* QFontMetrics_BoundingRect5(const QFontMetrics* self, QRect* r, int flags, struct miqt_string* text, int tabstops, int* tabarray); -QRect* QFontMetrics_BoundingRect7(const QFontMetrics* self, int x, int y, int w, int h, int flags, struct miqt_string* text, int tabstops); -QRect* QFontMetrics_BoundingRect8(const QFontMetrics* self, int x, int y, int w, int h, int flags, struct miqt_string* text, int tabstops, int* tabarray); -QSize* QFontMetrics_Size3(const QFontMetrics* self, int flags, struct miqt_string* str, int tabstops); -QSize* QFontMetrics_Size4(const QFontMetrics* self, int flags, struct miqt_string* str, int tabstops, int* tabarray); -struct miqt_string* QFontMetrics_ElidedText4(const QFontMetrics* self, struct miqt_string* text, int mode, int width, int flags); +int QFontMetrics_Width22(const QFontMetrics* self, struct miqt_string param1, int lenVal); +int QFontMetrics_HorizontalAdvance2(const QFontMetrics* self, struct miqt_string param1, int lenVal); +QRect* QFontMetrics_BoundingRect4(const QFontMetrics* self, QRect* r, int flags, struct miqt_string text, int tabstops); +QRect* QFontMetrics_BoundingRect5(const QFontMetrics* self, QRect* r, int flags, struct miqt_string text, int tabstops, int* tabarray); +QRect* QFontMetrics_BoundingRect7(const QFontMetrics* self, int x, int y, int w, int h, int flags, struct miqt_string text, int tabstops); +QRect* QFontMetrics_BoundingRect8(const QFontMetrics* self, int x, int y, int w, int h, int flags, struct miqt_string text, int tabstops, int* tabarray); +QSize* QFontMetrics_Size3(const QFontMetrics* self, int flags, struct miqt_string str, int tabstops); +QSize* QFontMetrics_Size4(const QFontMetrics* self, int flags, struct miqt_string str, int tabstops, int* tabarray); +struct miqt_string QFontMetrics_ElidedText4(const QFontMetrics* self, struct miqt_string text, int mode, int width, int flags); void QFontMetrics_Delete(QFontMetrics* self); QFontMetricsF* QFontMetricsF_new(QFont* font); @@ -108,16 +108,16 @@ bool QFontMetricsF_InFont(const QFontMetricsF* self, QChar* param1); bool QFontMetricsF_InFontUcs4(const QFontMetricsF* self, unsigned int ucs4); double QFontMetricsF_LeftBearing(const QFontMetricsF* self, QChar* param1); double QFontMetricsF_RightBearing(const QFontMetricsF* self, QChar* param1); -double QFontMetricsF_Width(const QFontMetricsF* self, struct miqt_string* stringVal); +double QFontMetricsF_Width(const QFontMetricsF* self, struct miqt_string stringVal); double QFontMetricsF_WidthWithQChar(const QFontMetricsF* self, QChar* param1); -double QFontMetricsF_HorizontalAdvance(const QFontMetricsF* self, struct miqt_string* stringVal); +double QFontMetricsF_HorizontalAdvance(const QFontMetricsF* self, struct miqt_string stringVal); double QFontMetricsF_HorizontalAdvanceWithQChar(const QFontMetricsF* self, QChar* param1); -QRectF* QFontMetricsF_BoundingRect(const QFontMetricsF* self, struct miqt_string* stringVal); +QRectF* QFontMetricsF_BoundingRect(const QFontMetricsF* self, struct miqt_string stringVal); QRectF* QFontMetricsF_BoundingRectWithQChar(const QFontMetricsF* self, QChar* param1); -QRectF* QFontMetricsF_BoundingRect2(const QFontMetricsF* self, QRectF* r, int flags, struct miqt_string* stringVal); -QSizeF* QFontMetricsF_Size(const QFontMetricsF* self, int flags, struct miqt_string* str); -QRectF* QFontMetricsF_TightBoundingRect(const QFontMetricsF* self, struct miqt_string* text); -struct miqt_string* QFontMetricsF_ElidedText(const QFontMetricsF* self, struct miqt_string* text, int mode, double width); +QRectF* QFontMetricsF_BoundingRect2(const QFontMetricsF* self, QRectF* r, int flags, struct miqt_string stringVal); +QSizeF* QFontMetricsF_Size(const QFontMetricsF* self, int flags, struct miqt_string str); +QRectF* QFontMetricsF_TightBoundingRect(const QFontMetricsF* self, struct miqt_string text); +struct miqt_string QFontMetricsF_ElidedText(const QFontMetricsF* self, struct miqt_string text, int mode, double width); double QFontMetricsF_UnderlinePos(const QFontMetricsF* self); double QFontMetricsF_OverlinePos(const QFontMetricsF* self); double QFontMetricsF_StrikeOutPos(const QFontMetricsF* self); @@ -125,12 +125,12 @@ double QFontMetricsF_LineWidth(const QFontMetricsF* self); double QFontMetricsF_FontDpi(const QFontMetricsF* self); bool QFontMetricsF_OperatorEqual(const QFontMetricsF* self, QFontMetricsF* other); bool QFontMetricsF_OperatorNotEqual(const QFontMetricsF* self, QFontMetricsF* other); -double QFontMetricsF_HorizontalAdvance2(const QFontMetricsF* self, struct miqt_string* stringVal, int length); -QRectF* QFontMetricsF_BoundingRect4(const QFontMetricsF* self, QRectF* r, int flags, struct miqt_string* stringVal, int tabstops); -QRectF* QFontMetricsF_BoundingRect5(const QFontMetricsF* self, QRectF* r, int flags, struct miqt_string* stringVal, int tabstops, int* tabarray); -QSizeF* QFontMetricsF_Size3(const QFontMetricsF* self, int flags, struct miqt_string* str, int tabstops); -QSizeF* QFontMetricsF_Size4(const QFontMetricsF* self, int flags, struct miqt_string* str, int tabstops, int* tabarray); -struct miqt_string* QFontMetricsF_ElidedText4(const QFontMetricsF* self, struct miqt_string* text, int mode, double width, int flags); +double QFontMetricsF_HorizontalAdvance2(const QFontMetricsF* self, struct miqt_string stringVal, int length); +QRectF* QFontMetricsF_BoundingRect4(const QFontMetricsF* self, QRectF* r, int flags, struct miqt_string stringVal, int tabstops); +QRectF* QFontMetricsF_BoundingRect5(const QFontMetricsF* self, QRectF* r, int flags, struct miqt_string stringVal, int tabstops, int* tabarray); +QSizeF* QFontMetricsF_Size3(const QFontMetricsF* self, int flags, struct miqt_string str, int tabstops); +QSizeF* QFontMetricsF_Size4(const QFontMetricsF* self, int flags, struct miqt_string str, int tabstops, int* tabarray); +struct miqt_string QFontMetricsF_ElidedText4(const QFontMetricsF* self, struct miqt_string text, int mode, double width, int flags); void QFontMetricsF_Delete(QFontMetricsF* self); #ifdef __cplusplus diff --git a/qt/gen_qformlayout.cpp b/qt/gen_qformlayout.cpp index 4d78bed8..b885ebc8 100644 --- a/qt/gen_qformlayout.cpp +++ b/qt/gen_qformlayout.cpp @@ -29,18 +29,26 @@ void* QFormLayout_Metacast(QFormLayout* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QFormLayout_Tr(const char* s) { +struct miqt_string QFormLayout_Tr(const char* s) { QString _ret = QFormLayout::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFormLayout_TrUtf8(const char* s) { +struct miqt_string QFormLayout_TrUtf8(const char* s) { QString _ret = QFormLayout::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QFormLayout_SetFieldGrowthPolicy(QFormLayout* self, int policy) { @@ -111,13 +119,13 @@ void QFormLayout_AddRow2(QFormLayout* self, QWidget* label, QLayout* field) { self->addRow(label, field); } -void QFormLayout_AddRow3(QFormLayout* self, struct miqt_string* labelText, QWidget* field) { - QString labelText_QString = QString::fromUtf8(&labelText->data, labelText->len); +void QFormLayout_AddRow3(QFormLayout* self, struct miqt_string labelText, QWidget* field) { + QString labelText_QString = QString::fromUtf8(labelText.data, labelText.len); self->addRow(labelText_QString, field); } -void QFormLayout_AddRow4(QFormLayout* self, struct miqt_string* labelText, QLayout* field) { - QString labelText_QString = QString::fromUtf8(&labelText->data, labelText->len); +void QFormLayout_AddRow4(QFormLayout* self, struct miqt_string labelText, QLayout* field) { + QString labelText_QString = QString::fromUtf8(labelText.data, labelText.len); self->addRow(labelText_QString, field); } @@ -137,13 +145,13 @@ void QFormLayout_InsertRow2(QFormLayout* self, int row, QWidget* label, QLayout* self->insertRow(static_cast(row), label, field); } -void QFormLayout_InsertRow3(QFormLayout* self, int row, struct miqt_string* labelText, QWidget* field) { - QString labelText_QString = QString::fromUtf8(&labelText->data, labelText->len); +void QFormLayout_InsertRow3(QFormLayout* self, int row, struct miqt_string labelText, QWidget* field) { + QString labelText_QString = QString::fromUtf8(labelText.data, labelText.len); self->insertRow(static_cast(row), labelText_QString, field); } -void QFormLayout_InsertRow4(QFormLayout* self, int row, struct miqt_string* labelText, QLayout* field) { - QString labelText_QString = QString::fromUtf8(&labelText->data, labelText->len); +void QFormLayout_InsertRow4(QFormLayout* self, int row, struct miqt_string labelText, QLayout* field) { + QString labelText_QString = QString::fromUtf8(labelText.data, labelText.len); self->insertRow(static_cast(row), labelText_QString, field); } @@ -252,32 +260,48 @@ int QFormLayout_RowCount(const QFormLayout* self) { return self->rowCount(); } -struct miqt_string* QFormLayout_Tr2(const char* s, const char* c) { +struct miqt_string QFormLayout_Tr2(const char* s, const char* c) { QString _ret = QFormLayout::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFormLayout_Tr3(const char* s, const char* c, int n) { +struct miqt_string QFormLayout_Tr3(const char* s, const char* c, int n) { QString _ret = QFormLayout::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFormLayout_TrUtf82(const char* s, const char* c) { +struct miqt_string QFormLayout_TrUtf82(const char* s, const char* c) { QString _ret = QFormLayout::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFormLayout_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QFormLayout_TrUtf83(const char* s, const char* c, int n) { QString _ret = QFormLayout::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QFormLayout_Delete(QFormLayout* self) { diff --git a/qt/gen_qformlayout.go b/qt/gen_qformlayout.go index 376dbbb5..05c9a86e 100644 --- a/qt/gen_qformlayout.go +++ b/qt/gen_qformlayout.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -87,24 +86,24 @@ func (this *QFormLayout) MetaObject() *QMetaObject { func (this *QFormLayout) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QFormLayout_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QFormLayout_Metacast(this.h, param1_Cstring)) } func QFormLayout_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QFormLayout_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFormLayout_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QFormLayout_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QFormLayout_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFormLayout_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -173,15 +172,19 @@ func (this *QFormLayout) AddRow2(label *QWidget, field *QLayout) { } func (this *QFormLayout) AddRow3(labelText string, field *QWidget) { - labelText_ms := libmiqt.Strdupg(labelText) - defer C.free(labelText_ms) - C.QFormLayout_AddRow3(this.h, (*C.struct_miqt_string)(labelText_ms), field.cPointer()) + labelText_ms := C.struct_miqt_string{} + labelText_ms.data = C.CString(labelText) + labelText_ms.len = C.size_t(len(labelText)) + defer C.free(unsafe.Pointer(labelText_ms.data)) + C.QFormLayout_AddRow3(this.h, labelText_ms, field.cPointer()) } func (this *QFormLayout) AddRow4(labelText string, field *QLayout) { - labelText_ms := libmiqt.Strdupg(labelText) - defer C.free(labelText_ms) - C.QFormLayout_AddRow4(this.h, (*C.struct_miqt_string)(labelText_ms), field.cPointer()) + labelText_ms := C.struct_miqt_string{} + labelText_ms.data = C.CString(labelText) + labelText_ms.len = C.size_t(len(labelText)) + defer C.free(unsafe.Pointer(labelText_ms.data)) + C.QFormLayout_AddRow4(this.h, labelText_ms, field.cPointer()) } func (this *QFormLayout) AddRowWithWidget(widget *QWidget) { @@ -201,15 +204,19 @@ func (this *QFormLayout) InsertRow2(row int, label *QWidget, field *QLayout) { } func (this *QFormLayout) InsertRow3(row int, labelText string, field *QWidget) { - labelText_ms := libmiqt.Strdupg(labelText) - defer C.free(labelText_ms) - C.QFormLayout_InsertRow3(this.h, (C.int)(row), (*C.struct_miqt_string)(labelText_ms), field.cPointer()) + labelText_ms := C.struct_miqt_string{} + labelText_ms.data = C.CString(labelText) + labelText_ms.len = C.size_t(len(labelText)) + defer C.free(unsafe.Pointer(labelText_ms.data)) + C.QFormLayout_InsertRow3(this.h, (C.int)(row), labelText_ms, field.cPointer()) } func (this *QFormLayout) InsertRow4(row int, labelText string, field *QLayout) { - labelText_ms := libmiqt.Strdupg(labelText) - defer C.free(labelText_ms) - C.QFormLayout_InsertRow4(this.h, (C.int)(row), (*C.struct_miqt_string)(labelText_ms), field.cPointer()) + labelText_ms := C.struct_miqt_string{} + labelText_ms.data = C.CString(labelText) + labelText_ms.len = C.size_t(len(labelText)) + defer C.free(unsafe.Pointer(labelText_ms.data)) + C.QFormLayout_InsertRow4(this.h, (C.int)(row), labelText_ms, field.cPointer()) } func (this *QFormLayout) InsertRow5(row int, widget *QWidget) { @@ -336,9 +343,9 @@ func QFormLayout_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFormLayout_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFormLayout_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -347,9 +354,9 @@ func QFormLayout_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFormLayout_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFormLayout_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -358,9 +365,9 @@ func QFormLayout_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFormLayout_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFormLayout_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -369,9 +376,9 @@ func QFormLayout_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFormLayout_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFormLayout_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qformlayout.h b/qt/gen_qformlayout.h index 0f6c9257..9f91cd09 100644 --- a/qt/gen_qformlayout.h +++ b/qt/gen_qformlayout.h @@ -41,8 +41,8 @@ QFormLayout* QFormLayout_new(); QFormLayout* QFormLayout_new2(QWidget* parent); QMetaObject* QFormLayout_MetaObject(const QFormLayout* self); void* QFormLayout_Metacast(QFormLayout* self, const char* param1); -struct miqt_string* QFormLayout_Tr(const char* s); -struct miqt_string* QFormLayout_TrUtf8(const char* s); +struct miqt_string QFormLayout_Tr(const char* s); +struct miqt_string QFormLayout_TrUtf8(const char* s); void QFormLayout_SetFieldGrowthPolicy(QFormLayout* self, int policy); int QFormLayout_FieldGrowthPolicy(const QFormLayout* self); void QFormLayout_SetRowWrapPolicy(QFormLayout* self, int policy); @@ -59,14 +59,14 @@ int QFormLayout_Spacing(const QFormLayout* self); void QFormLayout_SetSpacing(QFormLayout* self, int spacing); void QFormLayout_AddRow(QFormLayout* self, QWidget* label, QWidget* field); void QFormLayout_AddRow2(QFormLayout* self, QWidget* label, QLayout* field); -void QFormLayout_AddRow3(QFormLayout* self, struct miqt_string* labelText, QWidget* field); -void QFormLayout_AddRow4(QFormLayout* self, struct miqt_string* labelText, QLayout* field); +void QFormLayout_AddRow3(QFormLayout* self, struct miqt_string labelText, QWidget* field); +void QFormLayout_AddRow4(QFormLayout* self, struct miqt_string labelText, QLayout* field); void QFormLayout_AddRowWithWidget(QFormLayout* self, QWidget* widget); void QFormLayout_AddRowWithLayout(QFormLayout* self, QLayout* layout); void QFormLayout_InsertRow(QFormLayout* self, int row, QWidget* label, QWidget* field); void QFormLayout_InsertRow2(QFormLayout* self, int row, QWidget* label, QLayout* field); -void QFormLayout_InsertRow3(QFormLayout* self, int row, struct miqt_string* labelText, QWidget* field); -void QFormLayout_InsertRow4(QFormLayout* self, int row, struct miqt_string* labelText, QLayout* field); +void QFormLayout_InsertRow3(QFormLayout* self, int row, struct miqt_string labelText, QWidget* field); +void QFormLayout_InsertRow4(QFormLayout* self, int row, struct miqt_string labelText, QLayout* field); void QFormLayout_InsertRow5(QFormLayout* self, int row, QWidget* widget); void QFormLayout_InsertRow6(QFormLayout* self, int row, QLayout* layout); void QFormLayout_RemoveRow(QFormLayout* self, int row); @@ -93,10 +93,10 @@ int QFormLayout_HeightForWidth(const QFormLayout* self, int width); int QFormLayout_ExpandingDirections(const QFormLayout* self); int QFormLayout_Count(const QFormLayout* self); int QFormLayout_RowCount(const QFormLayout* self); -struct miqt_string* QFormLayout_Tr2(const char* s, const char* c); -struct miqt_string* QFormLayout_Tr3(const char* s, const char* c, int n); -struct miqt_string* QFormLayout_TrUtf82(const char* s, const char* c); -struct miqt_string* QFormLayout_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QFormLayout_Tr2(const char* s, const char* c); +struct miqt_string QFormLayout_Tr3(const char* s, const char* c, int n); +struct miqt_string QFormLayout_TrUtf82(const char* s, const char* c); +struct miqt_string QFormLayout_TrUtf83(const char* s, const char* c, int n); void QFormLayout_Delete(QFormLayout* self); void QFormLayout__TakeRowResult_Delete(QFormLayout__TakeRowResult* self); diff --git a/qt/gen_qframe.cpp b/qt/gen_qframe.cpp index 79f6b6c0..1c108a6a 100644 --- a/qt/gen_qframe.cpp +++ b/qt/gen_qframe.cpp @@ -30,18 +30,26 @@ void* QFrame_Metacast(QFrame* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QFrame_Tr(const char* s) { +struct miqt_string QFrame_Tr(const char* s) { QString _ret = QFrame::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFrame_TrUtf8(const char* s) { +struct miqt_string QFrame_TrUtf8(const char* s) { QString _ret = QFrame::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QFrame_FrameStyle(const QFrame* self) { @@ -102,32 +110,48 @@ void QFrame_SetFrameRect(QFrame* self, QRect* frameRect) { self->setFrameRect(*frameRect); } -struct miqt_string* QFrame_Tr2(const char* s, const char* c) { +struct miqt_string QFrame_Tr2(const char* s, const char* c) { QString _ret = QFrame::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFrame_Tr3(const char* s, const char* c, int n) { +struct miqt_string QFrame_Tr3(const char* s, const char* c, int n) { QString _ret = QFrame::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFrame_TrUtf82(const char* s, const char* c) { +struct miqt_string QFrame_TrUtf82(const char* s, const char* c) { QString _ret = QFrame::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFrame_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QFrame_TrUtf83(const char* s, const char* c, int n) { QString _ret = QFrame::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QFrame_Delete(QFrame* self) { diff --git a/qt/gen_qframe.go b/qt/gen_qframe.go index c4d3c73c..2ba19a0a 100644 --- a/qt/gen_qframe.go +++ b/qt/gen_qframe.go @@ -95,24 +95,24 @@ func (this *QFrame) MetaObject() *QMetaObject { func (this *QFrame) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QFrame_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QFrame_Metacast(this.h, param1_Cstring)) } func QFrame_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QFrame_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFrame_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QFrame_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QFrame_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFrame_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -183,9 +183,9 @@ func QFrame_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFrame_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFrame_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -194,9 +194,9 @@ func QFrame_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFrame_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFrame_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -205,9 +205,9 @@ func QFrame_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFrame_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFrame_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -216,9 +216,9 @@ func QFrame_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFrame_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFrame_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qframe.h b/qt/gen_qframe.h index c08867fb..afca8485 100644 --- a/qt/gen_qframe.h +++ b/qt/gen_qframe.h @@ -32,8 +32,8 @@ QFrame* QFrame_new2(QWidget* parent); QFrame* QFrame_new3(QWidget* parent, int f); QMetaObject* QFrame_MetaObject(const QFrame* self); void* QFrame_Metacast(QFrame* self, const char* param1); -struct miqt_string* QFrame_Tr(const char* s); -struct miqt_string* QFrame_TrUtf8(const char* s); +struct miqt_string QFrame_Tr(const char* s); +struct miqt_string QFrame_TrUtf8(const char* s); int QFrame_FrameStyle(const QFrame* self); void QFrame_SetFrameStyle(QFrame* self, int frameStyle); int QFrame_FrameWidth(const QFrame* self); @@ -48,10 +48,10 @@ int QFrame_MidLineWidth(const QFrame* self); void QFrame_SetMidLineWidth(QFrame* self, int midLineWidth); QRect* QFrame_FrameRect(const QFrame* self); void QFrame_SetFrameRect(QFrame* self, QRect* frameRect); -struct miqt_string* QFrame_Tr2(const char* s, const char* c); -struct miqt_string* QFrame_Tr3(const char* s, const char* c, int n); -struct miqt_string* QFrame_TrUtf82(const char* s, const char* c); -struct miqt_string* QFrame_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QFrame_Tr2(const char* s, const char* c); +struct miqt_string QFrame_Tr3(const char* s, const char* c, int n); +struct miqt_string QFrame_TrUtf82(const char* s, const char* c); +struct miqt_string QFrame_TrUtf83(const char* s, const char* c, int n); void QFrame_Delete(QFrame* self); #ifdef __cplusplus diff --git a/qt/gen_qfutureinterface.cpp b/qt/gen_qfutureinterface.cpp index d68d0245..060c3b02 100644 --- a/qt/gen_qfutureinterface.cpp +++ b/qt/gen_qfutureinterface.cpp @@ -75,16 +75,20 @@ int QFutureInterfaceBase_ProgressValue(const QFutureInterfaceBase* self) { return self->progressValue(); } -void QFutureInterfaceBase_SetProgressValueAndText(QFutureInterfaceBase* self, int progressValue, struct miqt_string* progressText) { - QString progressText_QString = QString::fromUtf8(&progressText->data, progressText->len); +void QFutureInterfaceBase_SetProgressValueAndText(QFutureInterfaceBase* self, int progressValue, struct miqt_string progressText) { + QString progressText_QString = QString::fromUtf8(progressText.data, progressText.len); self->setProgressValueAndText(static_cast(progressValue), progressText_QString); } -struct miqt_string* QFutureInterfaceBase_ProgressText(const QFutureInterfaceBase* self) { +struct miqt_string QFutureInterfaceBase_ProgressText(const QFutureInterfaceBase* self) { QString _ret = self->progressText(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QFutureInterfaceBase_SetExpectedResultCount(QFutureInterfaceBase* self, int resultCount) { diff --git a/qt/gen_qfutureinterface.go b/qt/gen_qfutureinterface.go index f806876c..7eac8c50 100644 --- a/qt/gen_qfutureinterface.go +++ b/qt/gen_qfutureinterface.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -126,15 +125,17 @@ func (this *QFutureInterfaceBase) ProgressValue() int { } func (this *QFutureInterfaceBase) SetProgressValueAndText(progressValue int, progressText string) { - progressText_ms := libmiqt.Strdupg(progressText) - defer C.free(progressText_ms) - C.QFutureInterfaceBase_SetProgressValueAndText(this.h, (C.int)(progressValue), (*C.struct_miqt_string)(progressText_ms)) + progressText_ms := C.struct_miqt_string{} + progressText_ms.data = C.CString(progressText) + progressText_ms.len = C.size_t(len(progressText)) + defer C.free(unsafe.Pointer(progressText_ms.data)) + C.QFutureInterfaceBase_SetProgressValueAndText(this.h, (C.int)(progressValue), progressText_ms) } func (this *QFutureInterfaceBase) ProgressText() string { - var _ms *C.struct_miqt_string = C.QFutureInterfaceBase_ProgressText(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFutureInterfaceBase_ProgressText(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qfutureinterface.h b/qt/gen_qfutureinterface.h index 3a11f4bb..a76f9a7f 100644 --- a/qt/gen_qfutureinterface.h +++ b/qt/gen_qfutureinterface.h @@ -53,8 +53,8 @@ int QFutureInterfaceBase_ProgressMaximum(const QFutureInterfaceBase* self); bool QFutureInterfaceBase_IsProgressUpdateNeeded(const QFutureInterfaceBase* self); void QFutureInterfaceBase_SetProgressValue(QFutureInterfaceBase* self, int progressValue); int QFutureInterfaceBase_ProgressValue(const QFutureInterfaceBase* self); -void QFutureInterfaceBase_SetProgressValueAndText(QFutureInterfaceBase* self, int progressValue, struct miqt_string* progressText); -struct miqt_string* QFutureInterfaceBase_ProgressText(const QFutureInterfaceBase* self); +void QFutureInterfaceBase_SetProgressValueAndText(QFutureInterfaceBase* self, int progressValue, struct miqt_string progressText); +struct miqt_string QFutureInterfaceBase_ProgressText(const QFutureInterfaceBase* self); void QFutureInterfaceBase_SetExpectedResultCount(QFutureInterfaceBase* self, int resultCount); int QFutureInterfaceBase_ExpectedResultCount(QFutureInterfaceBase* self); int QFutureInterfaceBase_ResultCount(const QFutureInterfaceBase* self); diff --git a/qt/gen_qfuturewatcher.cpp b/qt/gen_qfuturewatcher.cpp index 098696b3..2e5704c2 100644 --- a/qt/gen_qfuturewatcher.cpp +++ b/qt/gen_qfuturewatcher.cpp @@ -16,18 +16,26 @@ void* QFutureWatcherBase_Metacast(QFutureWatcherBase* self, const char* param1) return self->qt_metacast(param1); } -struct miqt_string* QFutureWatcherBase_Tr(const char* s) { +struct miqt_string QFutureWatcherBase_Tr(const char* s) { QString _ret = QFutureWatcherBase::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFutureWatcherBase_TrUtf8(const char* s) { +struct miqt_string QFutureWatcherBase_TrUtf8(const char* s) { QString _ret = QFutureWatcherBase::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QFutureWatcherBase_ProgressValue(const QFutureWatcherBase* self) { @@ -42,11 +50,15 @@ int QFutureWatcherBase_ProgressMaximum(const QFutureWatcherBase* self) { return self->progressMaximum(); } -struct miqt_string* QFutureWatcherBase_ProgressText(const QFutureWatcherBase* self) { +struct miqt_string QFutureWatcherBase_ProgressText(const QFutureWatcherBase* self) { QString _ret = self->progressText(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } bool QFutureWatcherBase_IsStarted(const QFutureWatcherBase* self) { @@ -177,8 +189,8 @@ void QFutureWatcherBase_connect_ProgressValueChanged(QFutureWatcherBase* self, i }); } -void QFutureWatcherBase_ProgressTextChanged(QFutureWatcherBase* self, struct miqt_string* progressText) { - QString progressText_QString = QString::fromUtf8(&progressText->data, progressText->len); +void QFutureWatcherBase_ProgressTextChanged(QFutureWatcherBase* self, struct miqt_string progressText) { + QString progressText_QString = QString::fromUtf8(progressText.data, progressText.len); self->progressTextChanged(progressText_QString); } @@ -187,7 +199,11 @@ void QFutureWatcherBase_connect_ProgressTextChanged(QFutureWatcherBase* self, in const QString progressText_ret = progressText; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray progressText_b = progressText_ret.toUtf8(); - struct miqt_string* sigval1 = miqt_strdup(progressText_b.data(), progressText_b.length()); + struct miqt_string progressText_ms; + progressText_ms.len = progressText_b.length(); + progressText_ms.data = static_cast(malloc(progressText_ms.len)); + memcpy(progressText_ms.data, progressText_b.data(), progressText_ms.len); + struct miqt_string sigval1 = progressText_ms; miqt_exec_callback_QFutureWatcherBase_ProgressTextChanged(slot, sigval1); }); } @@ -212,32 +228,48 @@ void QFutureWatcherBase_TogglePaused(QFutureWatcherBase* self) { self->togglePaused(); } -struct miqt_string* QFutureWatcherBase_Tr2(const char* s, const char* c) { +struct miqt_string QFutureWatcherBase_Tr2(const char* s, const char* c) { QString _ret = QFutureWatcherBase::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFutureWatcherBase_Tr3(const char* s, const char* c, int n) { +struct miqt_string QFutureWatcherBase_Tr3(const char* s, const char* c, int n) { QString _ret = QFutureWatcherBase::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFutureWatcherBase_TrUtf82(const char* s, const char* c) { +struct miqt_string QFutureWatcherBase_TrUtf82(const char* s, const char* c) { QString _ret = QFutureWatcherBase::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QFutureWatcherBase_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QFutureWatcherBase_TrUtf83(const char* s, const char* c, int n) { QString _ret = QFutureWatcherBase::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QFutureWatcherBase_Delete(QFutureWatcherBase* self) { diff --git a/qt/gen_qfuturewatcher.go b/qt/gen_qfuturewatcher.go index 63a59f77..2255b945 100644 --- a/qt/gen_qfuturewatcher.go +++ b/qt/gen_qfuturewatcher.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "runtime/cgo" "unsafe" @@ -52,24 +51,24 @@ func (this *QFutureWatcherBase) MetaObject() *QMetaObject { func (this *QFutureWatcherBase) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QFutureWatcherBase_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QFutureWatcherBase_Metacast(this.h, param1_Cstring)) } func QFutureWatcherBase_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QFutureWatcherBase_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFutureWatcherBase_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QFutureWatcherBase_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QFutureWatcherBase_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFutureWatcherBase_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -86,9 +85,9 @@ func (this *QFutureWatcherBase) ProgressMaximum() int { } func (this *QFutureWatcherBase) ProgressText() string { - var _ms *C.struct_miqt_string = C.QFutureWatcherBase_ProgressText(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFutureWatcherBase_ProgressText(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -294,25 +293,27 @@ func miqt_exec_callback_QFutureWatcherBase_ProgressValueChanged(cb C.intptr_t, p } func (this *QFutureWatcherBase) ProgressTextChanged(progressText string) { - progressText_ms := libmiqt.Strdupg(progressText) - defer C.free(progressText_ms) - C.QFutureWatcherBase_ProgressTextChanged(this.h, (*C.struct_miqt_string)(progressText_ms)) + progressText_ms := C.struct_miqt_string{} + progressText_ms.data = C.CString(progressText) + progressText_ms.len = C.size_t(len(progressText)) + defer C.free(unsafe.Pointer(progressText_ms.data)) + C.QFutureWatcherBase_ProgressTextChanged(this.h, progressText_ms) } func (this *QFutureWatcherBase) OnProgressTextChanged(slot func(progressText string)) { C.QFutureWatcherBase_connect_ProgressTextChanged(this.h, C.intptr_t(cgo.NewHandle(slot))) } //export miqt_exec_callback_QFutureWatcherBase_ProgressTextChanged -func miqt_exec_callback_QFutureWatcherBase_ProgressTextChanged(cb C.intptr_t, progressText *C.struct_miqt_string) { +func miqt_exec_callback_QFutureWatcherBase_ProgressTextChanged(cb C.intptr_t, progressText C.struct_miqt_string) { gofunc, ok := cgo.Handle(cb).Value().(func(progressText string)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") } // Convert all CABI parameters to Go parameters - var progressText_ms *C.struct_miqt_string = progressText - progressText_ret := C.GoStringN(&progressText_ms.data, C.int(int64(progressText_ms.len))) - C.free(unsafe.Pointer(progressText_ms)) + var progressText_ms C.struct_miqt_string = progressText + progressText_ret := C.GoStringN(progressText_ms.data, C.int(int64(progressText_ms.len))) + C.free(unsafe.Pointer(progressText_ms.data)) slotval1 := progressText_ret gofunc(slotval1) @@ -343,9 +344,9 @@ func QFutureWatcherBase_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFutureWatcherBase_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFutureWatcherBase_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -354,9 +355,9 @@ func QFutureWatcherBase_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFutureWatcherBase_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFutureWatcherBase_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -365,9 +366,9 @@ func QFutureWatcherBase_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFutureWatcherBase_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFutureWatcherBase_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -376,9 +377,9 @@ func QFutureWatcherBase_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFutureWatcherBase_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QFutureWatcherBase_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qfuturewatcher.h b/qt/gen_qfuturewatcher.h index 598bcf28..559f6468 100644 --- a/qt/gen_qfuturewatcher.h +++ b/qt/gen_qfuturewatcher.h @@ -25,12 +25,12 @@ typedef struct QMetaObject QMetaObject; QMetaObject* QFutureWatcherBase_MetaObject(const QFutureWatcherBase* self); void* QFutureWatcherBase_Metacast(QFutureWatcherBase* self, const char* param1); -struct miqt_string* QFutureWatcherBase_Tr(const char* s); -struct miqt_string* QFutureWatcherBase_TrUtf8(const char* s); +struct miqt_string QFutureWatcherBase_Tr(const char* s); +struct miqt_string QFutureWatcherBase_TrUtf8(const char* s); int QFutureWatcherBase_ProgressValue(const QFutureWatcherBase* self); int QFutureWatcherBase_ProgressMinimum(const QFutureWatcherBase* self); int QFutureWatcherBase_ProgressMaximum(const QFutureWatcherBase* self); -struct miqt_string* QFutureWatcherBase_ProgressText(const QFutureWatcherBase* self); +struct miqt_string QFutureWatcherBase_ProgressText(const QFutureWatcherBase* self); bool QFutureWatcherBase_IsStarted(const QFutureWatcherBase* self); bool QFutureWatcherBase_IsFinished(const QFutureWatcherBase* self); bool QFutureWatcherBase_IsRunning(const QFutureWatcherBase* self); @@ -57,17 +57,17 @@ void QFutureWatcherBase_ProgressRangeChanged(QFutureWatcherBase* self, int minim void QFutureWatcherBase_connect_ProgressRangeChanged(QFutureWatcherBase* self, intptr_t slot); void QFutureWatcherBase_ProgressValueChanged(QFutureWatcherBase* self, int progressValue); void QFutureWatcherBase_connect_ProgressValueChanged(QFutureWatcherBase* self, intptr_t slot); -void QFutureWatcherBase_ProgressTextChanged(QFutureWatcherBase* self, struct miqt_string* progressText); +void QFutureWatcherBase_ProgressTextChanged(QFutureWatcherBase* self, struct miqt_string progressText); void QFutureWatcherBase_connect_ProgressTextChanged(QFutureWatcherBase* self, intptr_t slot); void QFutureWatcherBase_Cancel(QFutureWatcherBase* self); void QFutureWatcherBase_SetPaused(QFutureWatcherBase* self, bool paused); void QFutureWatcherBase_Pause(QFutureWatcherBase* self); void QFutureWatcherBase_Resume(QFutureWatcherBase* self); void QFutureWatcherBase_TogglePaused(QFutureWatcherBase* self); -struct miqt_string* QFutureWatcherBase_Tr2(const char* s, const char* c); -struct miqt_string* QFutureWatcherBase_Tr3(const char* s, const char* c, int n); -struct miqt_string* QFutureWatcherBase_TrUtf82(const char* s, const char* c); -struct miqt_string* QFutureWatcherBase_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QFutureWatcherBase_Tr2(const char* s, const char* c); +struct miqt_string QFutureWatcherBase_Tr3(const char* s, const char* c, int n); +struct miqt_string QFutureWatcherBase_TrUtf82(const char* s, const char* c); +struct miqt_string QFutureWatcherBase_TrUtf83(const char* s, const char* c, int n); void QFutureWatcherBase_Delete(QFutureWatcherBase* self); #ifdef __cplusplus diff --git a/qt/gen_qgenericplugin.cpp b/qt/gen_qgenericplugin.cpp index 5c8d105e..a29d0cc7 100644 --- a/qt/gen_qgenericplugin.cpp +++ b/qt/gen_qgenericplugin.cpp @@ -16,52 +16,76 @@ void* QGenericPlugin_Metacast(QGenericPlugin* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QGenericPlugin_Tr(const char* s) { +struct miqt_string QGenericPlugin_Tr(const char* s) { QString _ret = QGenericPlugin::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGenericPlugin_TrUtf8(const char* s) { +struct miqt_string QGenericPlugin_TrUtf8(const char* s) { QString _ret = QGenericPlugin::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -QObject* QGenericPlugin_Create(QGenericPlugin* self, struct miqt_string* name, struct miqt_string* spec) { - QString name_QString = QString::fromUtf8(&name->data, name->len); - QString spec_QString = QString::fromUtf8(&spec->data, spec->len); +QObject* QGenericPlugin_Create(QGenericPlugin* self, struct miqt_string name, struct miqt_string spec) { + QString name_QString = QString::fromUtf8(name.data, name.len); + QString spec_QString = QString::fromUtf8(spec.data, spec.len); return self->create(name_QString, spec_QString); } -struct miqt_string* QGenericPlugin_Tr2(const char* s, const char* c) { +struct miqt_string QGenericPlugin_Tr2(const char* s, const char* c) { QString _ret = QGenericPlugin::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGenericPlugin_Tr3(const char* s, const char* c, int n) { +struct miqt_string QGenericPlugin_Tr3(const char* s, const char* c, int n) { QString _ret = QGenericPlugin::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGenericPlugin_TrUtf82(const char* s, const char* c) { +struct miqt_string QGenericPlugin_TrUtf82(const char* s, const char* c) { QString _ret = QGenericPlugin::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGenericPlugin_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QGenericPlugin_TrUtf83(const char* s, const char* c, int n) { QString _ret = QGenericPlugin::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QGenericPlugin_Delete(QGenericPlugin* self) { diff --git a/qt/gen_qgenericplugin.go b/qt/gen_qgenericplugin.go index 1f95934d..411175a2 100644 --- a/qt/gen_qgenericplugin.go +++ b/qt/gen_qgenericplugin.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -51,33 +50,37 @@ func (this *QGenericPlugin) MetaObject() *QMetaObject { func (this *QGenericPlugin) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QGenericPlugin_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QGenericPlugin_Metacast(this.h, param1_Cstring)) } func QGenericPlugin_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QGenericPlugin_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGenericPlugin_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QGenericPlugin_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QGenericPlugin_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGenericPlugin_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QGenericPlugin) Create(name string, spec string) *QObject { - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - spec_ms := libmiqt.Strdupg(spec) - defer C.free(spec_ms) - return UnsafeNewQObject(unsafe.Pointer(C.QGenericPlugin_Create(this.h, (*C.struct_miqt_string)(name_ms), (*C.struct_miqt_string)(spec_ms)))) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + spec_ms := C.struct_miqt_string{} + spec_ms.data = C.CString(spec) + spec_ms.len = C.size_t(len(spec)) + defer C.free(unsafe.Pointer(spec_ms.data)) + return UnsafeNewQObject(unsafe.Pointer(C.QGenericPlugin_Create(this.h, name_ms, spec_ms))) } func QGenericPlugin_Tr2(s string, c string) string { @@ -85,9 +88,9 @@ func QGenericPlugin_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGenericPlugin_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGenericPlugin_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -96,9 +99,9 @@ func QGenericPlugin_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGenericPlugin_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGenericPlugin_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -107,9 +110,9 @@ func QGenericPlugin_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGenericPlugin_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGenericPlugin_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -118,9 +121,9 @@ func QGenericPlugin_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGenericPlugin_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGenericPlugin_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qgenericplugin.h b/qt/gen_qgenericplugin.h index ee071b46..d92fd8f2 100644 --- a/qt/gen_qgenericplugin.h +++ b/qt/gen_qgenericplugin.h @@ -25,13 +25,13 @@ typedef struct QObject QObject; QMetaObject* QGenericPlugin_MetaObject(const QGenericPlugin* self); void* QGenericPlugin_Metacast(QGenericPlugin* self, const char* param1); -struct miqt_string* QGenericPlugin_Tr(const char* s); -struct miqt_string* QGenericPlugin_TrUtf8(const char* s); -QObject* QGenericPlugin_Create(QGenericPlugin* self, struct miqt_string* name, struct miqt_string* spec); -struct miqt_string* QGenericPlugin_Tr2(const char* s, const char* c); -struct miqt_string* QGenericPlugin_Tr3(const char* s, const char* c, int n); -struct miqt_string* QGenericPlugin_TrUtf82(const char* s, const char* c); -struct miqt_string* QGenericPlugin_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QGenericPlugin_Tr(const char* s); +struct miqt_string QGenericPlugin_TrUtf8(const char* s); +QObject* QGenericPlugin_Create(QGenericPlugin* self, struct miqt_string name, struct miqt_string spec); +struct miqt_string QGenericPlugin_Tr2(const char* s, const char* c); +struct miqt_string QGenericPlugin_Tr3(const char* s, const char* c, int n); +struct miqt_string QGenericPlugin_TrUtf82(const char* s, const char* c); +struct miqt_string QGenericPlugin_TrUtf83(const char* s, const char* c, int n); void QGenericPlugin_Delete(QGenericPlugin* self); #ifdef __cplusplus diff --git a/qt/gen_qgenericpluginfactory.cpp b/qt/gen_qgenericpluginfactory.cpp index 43aa0e44..b88a0629 100644 --- a/qt/gen_qgenericpluginfactory.cpp +++ b/qt/gen_qgenericpluginfactory.cpp @@ -11,12 +11,16 @@ struct miqt_array* QGenericPluginFactory_Keys() { QStringList _ret = QGenericPluginFactory::keys(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -24,9 +28,9 @@ struct miqt_array* QGenericPluginFactory_Keys() { return _out; } -QObject* QGenericPluginFactory_Create(struct miqt_string* param1, struct miqt_string* param2) { - QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); - QString param2_QString = QString::fromUtf8(¶m2->data, param2->len); +QObject* QGenericPluginFactory_Create(struct miqt_string param1, struct miqt_string param2) { + QString param1_QString = QString::fromUtf8(param1.data, param1.len); + QString param2_QString = QString::fromUtf8(param2.data, param2.len); return QGenericPluginFactory::create(param1_QString, param2_QString); } diff --git a/qt/gen_qgenericpluginfactory.go b/qt/gen_qgenericpluginfactory.go index 159fa59a..6947210c 100644 --- a/qt/gen_qgenericpluginfactory.go +++ b/qt/gen_qgenericpluginfactory.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -46,11 +45,11 @@ func UnsafeNewQGenericPluginFactory(h unsafe.Pointer) *QGenericPluginFactory { func QGenericPluginFactory_Keys() []string { var _ma *C.struct_miqt_array = C.QGenericPluginFactory_Keys() _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -58,11 +57,15 @@ func QGenericPluginFactory_Keys() []string { } func QGenericPluginFactory_Create(param1 string, param2 string) *QObject { - param1_ms := libmiqt.Strdupg(param1) - defer C.free(param1_ms) - param2_ms := libmiqt.Strdupg(param2) - defer C.free(param2_ms) - return UnsafeNewQObject(unsafe.Pointer(C.QGenericPluginFactory_Create((*C.struct_miqt_string)(param1_ms), (*C.struct_miqt_string)(param2_ms)))) + param1_ms := C.struct_miqt_string{} + param1_ms.data = C.CString(param1) + param1_ms.len = C.size_t(len(param1)) + defer C.free(unsafe.Pointer(param1_ms.data)) + param2_ms := C.struct_miqt_string{} + param2_ms.data = C.CString(param2) + param2_ms.len = C.size_t(len(param2)) + defer C.free(unsafe.Pointer(param2_ms.data)) + return UnsafeNewQObject(unsafe.Pointer(C.QGenericPluginFactory_Create(param1_ms, param2_ms))) } // Delete this object from C++ memory. diff --git a/qt/gen_qgenericpluginfactory.h b/qt/gen_qgenericpluginfactory.h index a1785c99..365e737a 100644 --- a/qt/gen_qgenericpluginfactory.h +++ b/qt/gen_qgenericpluginfactory.h @@ -22,7 +22,7 @@ typedef struct QObject QObject; #endif struct miqt_array* QGenericPluginFactory_Keys(); -QObject* QGenericPluginFactory_Create(struct miqt_string* param1, struct miqt_string* param2); +QObject* QGenericPluginFactory_Create(struct miqt_string param1, struct miqt_string param2); void QGenericPluginFactory_Delete(QGenericPluginFactory* self); #ifdef __cplusplus diff --git a/qt/gen_qgesture.cpp b/qt/gen_qgesture.cpp index ec8fcd9a..68a743a2 100644 --- a/qt/gen_qgesture.cpp +++ b/qt/gen_qgesture.cpp @@ -33,18 +33,26 @@ void* QGesture_Metacast(QGesture* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QGesture_Tr(const char* s) { +struct miqt_string QGesture_Tr(const char* s) { QString _ret = QGesture::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGesture_TrUtf8(const char* s) { +struct miqt_string QGesture_TrUtf8(const char* s) { QString _ret = QGesture::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QGesture_GestureType(const QGesture* self) { @@ -82,32 +90,48 @@ int QGesture_GestureCancelPolicy(const QGesture* self) { return static_cast(_ret); } -struct miqt_string* QGesture_Tr2(const char* s, const char* c) { +struct miqt_string QGesture_Tr2(const char* s, const char* c) { QString _ret = QGesture::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGesture_Tr3(const char* s, const char* c, int n) { +struct miqt_string QGesture_Tr3(const char* s, const char* c, int n) { QString _ret = QGesture::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGesture_TrUtf82(const char* s, const char* c) { +struct miqt_string QGesture_TrUtf82(const char* s, const char* c) { QString _ret = QGesture::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGesture_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QGesture_TrUtf83(const char* s, const char* c, int n) { QString _ret = QGesture::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QGesture_Delete(QGesture* self) { @@ -130,18 +154,26 @@ void* QPanGesture_Metacast(QPanGesture* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QPanGesture_Tr(const char* s) { +struct miqt_string QPanGesture_Tr(const char* s) { QString _ret = QPanGesture::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPanGesture_TrUtf8(const char* s) { +struct miqt_string QPanGesture_TrUtf8(const char* s) { QString _ret = QPanGesture::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QPointF* QPanGesture_LastOffset(const QPanGesture* self) { @@ -173,32 +205,48 @@ void QPanGesture_SetAcceleration(QPanGesture* self, double value) { self->setAcceleration(static_cast(value)); } -struct miqt_string* QPanGesture_Tr2(const char* s, const char* c) { +struct miqt_string QPanGesture_Tr2(const char* s, const char* c) { QString _ret = QPanGesture::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPanGesture_Tr3(const char* s, const char* c, int n) { +struct miqt_string QPanGesture_Tr3(const char* s, const char* c, int n) { QString _ret = QPanGesture::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPanGesture_TrUtf82(const char* s, const char* c) { +struct miqt_string QPanGesture_TrUtf82(const char* s, const char* c) { QString _ret = QPanGesture::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPanGesture_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QPanGesture_TrUtf83(const char* s, const char* c, int n) { QString _ret = QPanGesture::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QPanGesture_Delete(QPanGesture* self) { @@ -221,18 +269,26 @@ void* QPinchGesture_Metacast(QPinchGesture* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QPinchGesture_Tr(const char* s) { +struct miqt_string QPinchGesture_Tr(const char* s) { QString _ret = QPinchGesture::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPinchGesture_TrUtf8(const char* s) { +struct miqt_string QPinchGesture_TrUtf8(const char* s) { QString _ret = QPinchGesture::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QPinchGesture_TotalChangeFlags(const QPinchGesture* self) { @@ -331,32 +387,48 @@ void QPinchGesture_SetRotationAngle(QPinchGesture* self, double value) { self->setRotationAngle(static_cast(value)); } -struct miqt_string* QPinchGesture_Tr2(const char* s, const char* c) { +struct miqt_string QPinchGesture_Tr2(const char* s, const char* c) { QString _ret = QPinchGesture::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPinchGesture_Tr3(const char* s, const char* c, int n) { +struct miqt_string QPinchGesture_Tr3(const char* s, const char* c, int n) { QString _ret = QPinchGesture::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPinchGesture_TrUtf82(const char* s, const char* c) { +struct miqt_string QPinchGesture_TrUtf82(const char* s, const char* c) { QString _ret = QPinchGesture::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPinchGesture_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QPinchGesture_TrUtf83(const char* s, const char* c, int n) { QString _ret = QPinchGesture::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QPinchGesture_Delete(QPinchGesture* self) { @@ -379,18 +451,26 @@ void* QSwipeGesture_Metacast(QSwipeGesture* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QSwipeGesture_Tr(const char* s) { +struct miqt_string QSwipeGesture_Tr(const char* s) { QString _ret = QSwipeGesture::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSwipeGesture_TrUtf8(const char* s) { +struct miqt_string QSwipeGesture_TrUtf8(const char* s) { QString _ret = QSwipeGesture::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QSwipeGesture_HorizontalDirection(const QSwipeGesture* self) { @@ -412,32 +492,48 @@ void QSwipeGesture_SetSwipeAngle(QSwipeGesture* self, double value) { self->setSwipeAngle(static_cast(value)); } -struct miqt_string* QSwipeGesture_Tr2(const char* s, const char* c) { +struct miqt_string QSwipeGesture_Tr2(const char* s, const char* c) { QString _ret = QSwipeGesture::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSwipeGesture_Tr3(const char* s, const char* c, int n) { +struct miqt_string QSwipeGesture_Tr3(const char* s, const char* c, int n) { QString _ret = QSwipeGesture::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSwipeGesture_TrUtf82(const char* s, const char* c) { +struct miqt_string QSwipeGesture_TrUtf82(const char* s, const char* c) { QString _ret = QSwipeGesture::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSwipeGesture_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QSwipeGesture_TrUtf83(const char* s, const char* c, int n) { QString _ret = QSwipeGesture::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QSwipeGesture_Delete(QSwipeGesture* self) { @@ -460,18 +556,26 @@ void* QTapGesture_Metacast(QTapGesture* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QTapGesture_Tr(const char* s) { +struct miqt_string QTapGesture_Tr(const char* s) { QString _ret = QTapGesture::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTapGesture_TrUtf8(const char* s) { +struct miqt_string QTapGesture_TrUtf8(const char* s) { QString _ret = QTapGesture::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QPointF* QTapGesture_Position(const QTapGesture* self) { @@ -482,32 +586,48 @@ void QTapGesture_SetPosition(QTapGesture* self, QPointF* pos) { self->setPosition(*pos); } -struct miqt_string* QTapGesture_Tr2(const char* s, const char* c) { +struct miqt_string QTapGesture_Tr2(const char* s, const char* c) { QString _ret = QTapGesture::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTapGesture_Tr3(const char* s, const char* c, int n) { +struct miqt_string QTapGesture_Tr3(const char* s, const char* c, int n) { QString _ret = QTapGesture::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTapGesture_TrUtf82(const char* s, const char* c) { +struct miqt_string QTapGesture_TrUtf82(const char* s, const char* c) { QString _ret = QTapGesture::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTapGesture_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QTapGesture_TrUtf83(const char* s, const char* c, int n) { QString _ret = QTapGesture::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QTapGesture_Delete(QTapGesture* self) { @@ -530,18 +650,26 @@ void* QTapAndHoldGesture_Metacast(QTapAndHoldGesture* self, const char* param1) return self->qt_metacast(param1); } -struct miqt_string* QTapAndHoldGesture_Tr(const char* s) { +struct miqt_string QTapAndHoldGesture_Tr(const char* s) { QString _ret = QTapAndHoldGesture::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTapAndHoldGesture_TrUtf8(const char* s) { +struct miqt_string QTapAndHoldGesture_TrUtf8(const char* s) { QString _ret = QTapAndHoldGesture::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QPointF* QTapAndHoldGesture_Position(const QTapAndHoldGesture* self) { @@ -560,32 +688,48 @@ int QTapAndHoldGesture_Timeout() { return QTapAndHoldGesture::timeout(); } -struct miqt_string* QTapAndHoldGesture_Tr2(const char* s, const char* c) { +struct miqt_string QTapAndHoldGesture_Tr2(const char* s, const char* c) { QString _ret = QTapAndHoldGesture::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTapAndHoldGesture_Tr3(const char* s, const char* c, int n) { +struct miqt_string QTapAndHoldGesture_Tr3(const char* s, const char* c, int n) { QString _ret = QTapAndHoldGesture::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTapAndHoldGesture_TrUtf82(const char* s, const char* c) { +struct miqt_string QTapAndHoldGesture_TrUtf82(const char* s, const char* c) { QString _ret = QTapAndHoldGesture::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTapAndHoldGesture_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QTapAndHoldGesture_TrUtf83(const char* s, const char* c, int n) { QString _ret = QTapAndHoldGesture::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QTapAndHoldGesture_Delete(QTapAndHoldGesture* self) { diff --git a/qt/gen_qgesture.go b/qt/gen_qgesture.go index 26fee489..fc042bda 100644 --- a/qt/gen_qgesture.go +++ b/qt/gen_qgesture.go @@ -87,24 +87,24 @@ func (this *QGesture) MetaObject() *QMetaObject { func (this *QGesture) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QGesture_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QGesture_Metacast(this.h, param1_Cstring)) } func QGesture_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QGesture_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGesture_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QGesture_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QGesture_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGesture_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -148,9 +148,9 @@ func QGesture_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGesture_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGesture_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -159,9 +159,9 @@ func QGesture_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGesture_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGesture_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -170,9 +170,9 @@ func QGesture_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGesture_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGesture_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -181,9 +181,9 @@ func QGesture_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGesture_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGesture_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -250,24 +250,24 @@ func (this *QPanGesture) MetaObject() *QMetaObject { func (this *QPanGesture) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QPanGesture_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QPanGesture_Metacast(this.h, param1_Cstring)) } func QPanGesture_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QPanGesture_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPanGesture_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QPanGesture_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QPanGesture_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPanGesture_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -313,9 +313,9 @@ func QPanGesture_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPanGesture_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPanGesture_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -324,9 +324,9 @@ func QPanGesture_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPanGesture_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPanGesture_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -335,9 +335,9 @@ func QPanGesture_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPanGesture_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPanGesture_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -346,9 +346,9 @@ func QPanGesture_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPanGesture_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPanGesture_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -415,24 +415,24 @@ func (this *QPinchGesture) MetaObject() *QMetaObject { func (this *QPinchGesture) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QPinchGesture_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QPinchGesture_Metacast(this.h, param1_Cstring)) } func QPinchGesture_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QPinchGesture_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPinchGesture_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QPinchGesture_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QPinchGesture_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPinchGesture_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -538,9 +538,9 @@ func QPinchGesture_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPinchGesture_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPinchGesture_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -549,9 +549,9 @@ func QPinchGesture_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPinchGesture_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPinchGesture_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -560,9 +560,9 @@ func QPinchGesture_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPinchGesture_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPinchGesture_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -571,9 +571,9 @@ func QPinchGesture_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPinchGesture_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPinchGesture_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -640,24 +640,24 @@ func (this *QSwipeGesture) MetaObject() *QMetaObject { func (this *QSwipeGesture) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QSwipeGesture_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QSwipeGesture_Metacast(this.h, param1_Cstring)) } func QSwipeGesture_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QSwipeGesture_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSwipeGesture_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QSwipeGesture_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QSwipeGesture_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSwipeGesture_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -682,9 +682,9 @@ func QSwipeGesture_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSwipeGesture_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSwipeGesture_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -693,9 +693,9 @@ func QSwipeGesture_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSwipeGesture_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSwipeGesture_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -704,9 +704,9 @@ func QSwipeGesture_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSwipeGesture_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSwipeGesture_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -715,9 +715,9 @@ func QSwipeGesture_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSwipeGesture_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSwipeGesture_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -784,24 +784,24 @@ func (this *QTapGesture) MetaObject() *QMetaObject { func (this *QTapGesture) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QTapGesture_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QTapGesture_Metacast(this.h, param1_Cstring)) } func QTapGesture_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTapGesture_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTapGesture_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QTapGesture_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTapGesture_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTapGesture_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -821,9 +821,9 @@ func QTapGesture_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTapGesture_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTapGesture_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -832,9 +832,9 @@ func QTapGesture_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTapGesture_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTapGesture_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -843,9 +843,9 @@ func QTapGesture_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTapGesture_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTapGesture_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -854,9 +854,9 @@ func QTapGesture_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTapGesture_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTapGesture_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -923,24 +923,24 @@ func (this *QTapAndHoldGesture) MetaObject() *QMetaObject { func (this *QTapAndHoldGesture) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QTapAndHoldGesture_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QTapAndHoldGesture_Metacast(this.h, param1_Cstring)) } func QTapAndHoldGesture_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTapAndHoldGesture_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTapAndHoldGesture_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QTapAndHoldGesture_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTapAndHoldGesture_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTapAndHoldGesture_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -968,9 +968,9 @@ func QTapAndHoldGesture_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTapAndHoldGesture_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTapAndHoldGesture_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -979,9 +979,9 @@ func QTapAndHoldGesture_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTapAndHoldGesture_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTapAndHoldGesture_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -990,9 +990,9 @@ func QTapAndHoldGesture_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTapAndHoldGesture_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTapAndHoldGesture_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -1001,9 +1001,9 @@ func QTapAndHoldGesture_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTapAndHoldGesture_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTapAndHoldGesture_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qgesture.h b/qt/gen_qgesture.h index b7f8cf43..d2ac95c3 100644 --- a/qt/gen_qgesture.h +++ b/qt/gen_qgesture.h @@ -43,8 +43,8 @@ QGesture* QGesture_new(); QGesture* QGesture_new2(QObject* parent); QMetaObject* QGesture_MetaObject(const QGesture* self); void* QGesture_Metacast(QGesture* self, const char* param1); -struct miqt_string* QGesture_Tr(const char* s); -struct miqt_string* QGesture_TrUtf8(const char* s); +struct miqt_string QGesture_Tr(const char* s); +struct miqt_string QGesture_TrUtf8(const char* s); int QGesture_GestureType(const QGesture* self); int QGesture_State(const QGesture* self); QPointF* QGesture_HotSpot(const QGesture* self); @@ -53,18 +53,18 @@ bool QGesture_HasHotSpot(const QGesture* self); void QGesture_UnsetHotSpot(QGesture* self); void QGesture_SetGestureCancelPolicy(QGesture* self, int policy); int QGesture_GestureCancelPolicy(const QGesture* self); -struct miqt_string* QGesture_Tr2(const char* s, const char* c); -struct miqt_string* QGesture_Tr3(const char* s, const char* c, int n); -struct miqt_string* QGesture_TrUtf82(const char* s, const char* c); -struct miqt_string* QGesture_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QGesture_Tr2(const char* s, const char* c); +struct miqt_string QGesture_Tr3(const char* s, const char* c, int n); +struct miqt_string QGesture_TrUtf82(const char* s, const char* c); +struct miqt_string QGesture_TrUtf83(const char* s, const char* c, int n); void QGesture_Delete(QGesture* self); QPanGesture* QPanGesture_new(); QPanGesture* QPanGesture_new2(QObject* parent); QMetaObject* QPanGesture_MetaObject(const QPanGesture* self); void* QPanGesture_Metacast(QPanGesture* self, const char* param1); -struct miqt_string* QPanGesture_Tr(const char* s); -struct miqt_string* QPanGesture_TrUtf8(const char* s); +struct miqt_string QPanGesture_Tr(const char* s); +struct miqt_string QPanGesture_TrUtf8(const char* s); QPointF* QPanGesture_LastOffset(const QPanGesture* self); QPointF* QPanGesture_Offset(const QPanGesture* self); QPointF* QPanGesture_Delta(const QPanGesture* self); @@ -72,18 +72,18 @@ double QPanGesture_Acceleration(const QPanGesture* self); void QPanGesture_SetLastOffset(QPanGesture* self, QPointF* value); void QPanGesture_SetOffset(QPanGesture* self, QPointF* value); void QPanGesture_SetAcceleration(QPanGesture* self, double value); -struct miqt_string* QPanGesture_Tr2(const char* s, const char* c); -struct miqt_string* QPanGesture_Tr3(const char* s, const char* c, int n); -struct miqt_string* QPanGesture_TrUtf82(const char* s, const char* c); -struct miqt_string* QPanGesture_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QPanGesture_Tr2(const char* s, const char* c); +struct miqt_string QPanGesture_Tr3(const char* s, const char* c, int n); +struct miqt_string QPanGesture_TrUtf82(const char* s, const char* c); +struct miqt_string QPanGesture_TrUtf83(const char* s, const char* c, int n); void QPanGesture_Delete(QPanGesture* self); QPinchGesture* QPinchGesture_new(); QPinchGesture* QPinchGesture_new2(QObject* parent); QMetaObject* QPinchGesture_MetaObject(const QPinchGesture* self); void* QPinchGesture_Metacast(QPinchGesture* self, const char* param1); -struct miqt_string* QPinchGesture_Tr(const char* s); -struct miqt_string* QPinchGesture_TrUtf8(const char* s); +struct miqt_string QPinchGesture_Tr(const char* s); +struct miqt_string QPinchGesture_TrUtf8(const char* s); int QPinchGesture_TotalChangeFlags(const QPinchGesture* self); void QPinchGesture_SetTotalChangeFlags(QPinchGesture* self, int value); int QPinchGesture_ChangeFlags(const QPinchGesture* self); @@ -106,56 +106,56 @@ double QPinchGesture_RotationAngle(const QPinchGesture* self); void QPinchGesture_SetTotalRotationAngle(QPinchGesture* self, double value); void QPinchGesture_SetLastRotationAngle(QPinchGesture* self, double value); void QPinchGesture_SetRotationAngle(QPinchGesture* self, double value); -struct miqt_string* QPinchGesture_Tr2(const char* s, const char* c); -struct miqt_string* QPinchGesture_Tr3(const char* s, const char* c, int n); -struct miqt_string* QPinchGesture_TrUtf82(const char* s, const char* c); -struct miqt_string* QPinchGesture_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QPinchGesture_Tr2(const char* s, const char* c); +struct miqt_string QPinchGesture_Tr3(const char* s, const char* c, int n); +struct miqt_string QPinchGesture_TrUtf82(const char* s, const char* c); +struct miqt_string QPinchGesture_TrUtf83(const char* s, const char* c, int n); void QPinchGesture_Delete(QPinchGesture* self); QSwipeGesture* QSwipeGesture_new(); QSwipeGesture* QSwipeGesture_new2(QObject* parent); QMetaObject* QSwipeGesture_MetaObject(const QSwipeGesture* self); void* QSwipeGesture_Metacast(QSwipeGesture* self, const char* param1); -struct miqt_string* QSwipeGesture_Tr(const char* s); -struct miqt_string* QSwipeGesture_TrUtf8(const char* s); +struct miqt_string QSwipeGesture_Tr(const char* s); +struct miqt_string QSwipeGesture_TrUtf8(const char* s); int QSwipeGesture_HorizontalDirection(const QSwipeGesture* self); int QSwipeGesture_VerticalDirection(const QSwipeGesture* self); double QSwipeGesture_SwipeAngle(const QSwipeGesture* self); void QSwipeGesture_SetSwipeAngle(QSwipeGesture* self, double value); -struct miqt_string* QSwipeGesture_Tr2(const char* s, const char* c); -struct miqt_string* QSwipeGesture_Tr3(const char* s, const char* c, int n); -struct miqt_string* QSwipeGesture_TrUtf82(const char* s, const char* c); -struct miqt_string* QSwipeGesture_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QSwipeGesture_Tr2(const char* s, const char* c); +struct miqt_string QSwipeGesture_Tr3(const char* s, const char* c, int n); +struct miqt_string QSwipeGesture_TrUtf82(const char* s, const char* c); +struct miqt_string QSwipeGesture_TrUtf83(const char* s, const char* c, int n); void QSwipeGesture_Delete(QSwipeGesture* self); QTapGesture* QTapGesture_new(); QTapGesture* QTapGesture_new2(QObject* parent); QMetaObject* QTapGesture_MetaObject(const QTapGesture* self); void* QTapGesture_Metacast(QTapGesture* self, const char* param1); -struct miqt_string* QTapGesture_Tr(const char* s); -struct miqt_string* QTapGesture_TrUtf8(const char* s); +struct miqt_string QTapGesture_Tr(const char* s); +struct miqt_string QTapGesture_TrUtf8(const char* s); QPointF* QTapGesture_Position(const QTapGesture* self); void QTapGesture_SetPosition(QTapGesture* self, QPointF* pos); -struct miqt_string* QTapGesture_Tr2(const char* s, const char* c); -struct miqt_string* QTapGesture_Tr3(const char* s, const char* c, int n); -struct miqt_string* QTapGesture_TrUtf82(const char* s, const char* c); -struct miqt_string* QTapGesture_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QTapGesture_Tr2(const char* s, const char* c); +struct miqt_string QTapGesture_Tr3(const char* s, const char* c, int n); +struct miqt_string QTapGesture_TrUtf82(const char* s, const char* c); +struct miqt_string QTapGesture_TrUtf83(const char* s, const char* c, int n); void QTapGesture_Delete(QTapGesture* self); QTapAndHoldGesture* QTapAndHoldGesture_new(); QTapAndHoldGesture* QTapAndHoldGesture_new2(QObject* parent); QMetaObject* QTapAndHoldGesture_MetaObject(const QTapAndHoldGesture* self); void* QTapAndHoldGesture_Metacast(QTapAndHoldGesture* self, const char* param1); -struct miqt_string* QTapAndHoldGesture_Tr(const char* s); -struct miqt_string* QTapAndHoldGesture_TrUtf8(const char* s); +struct miqt_string QTapAndHoldGesture_Tr(const char* s); +struct miqt_string QTapAndHoldGesture_TrUtf8(const char* s); QPointF* QTapAndHoldGesture_Position(const QTapAndHoldGesture* self); void QTapAndHoldGesture_SetPosition(QTapAndHoldGesture* self, QPointF* pos); void QTapAndHoldGesture_SetTimeout(int msecs); int QTapAndHoldGesture_Timeout(); -struct miqt_string* QTapAndHoldGesture_Tr2(const char* s, const char* c); -struct miqt_string* QTapAndHoldGesture_Tr3(const char* s, const char* c, int n); -struct miqt_string* QTapAndHoldGesture_TrUtf82(const char* s, const char* c); -struct miqt_string* QTapAndHoldGesture_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QTapAndHoldGesture_Tr2(const char* s, const char* c); +struct miqt_string QTapAndHoldGesture_Tr3(const char* s, const char* c, int n); +struct miqt_string QTapAndHoldGesture_TrUtf82(const char* s, const char* c); +struct miqt_string QTapAndHoldGesture_TrUtf83(const char* s, const char* c, int n); void QTapAndHoldGesture_Delete(QTapAndHoldGesture* self); QGestureEvent* QGestureEvent_new(struct miqt_array* /* of QGesture* */ gestures); diff --git a/qt/gen_qgraphicsanchorlayout.cpp b/qt/gen_qgraphicsanchorlayout.cpp index 3dc4705b..84a8283b 100644 --- a/qt/gen_qgraphicsanchorlayout.cpp +++ b/qt/gen_qgraphicsanchorlayout.cpp @@ -18,18 +18,26 @@ void* QGraphicsAnchor_Metacast(QGraphicsAnchor* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QGraphicsAnchor_Tr(const char* s) { +struct miqt_string QGraphicsAnchor_Tr(const char* s) { QString _ret = QGraphicsAnchor::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGraphicsAnchor_TrUtf8(const char* s) { +struct miqt_string QGraphicsAnchor_TrUtf8(const char* s) { QString _ret = QGraphicsAnchor::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QGraphicsAnchor_SetSpacing(QGraphicsAnchor* self, double spacing) { @@ -54,32 +62,48 @@ int QGraphicsAnchor_SizePolicy(const QGraphicsAnchor* self) { return static_cast(_ret); } -struct miqt_string* QGraphicsAnchor_Tr2(const char* s, const char* c) { +struct miqt_string QGraphicsAnchor_Tr2(const char* s, const char* c) { QString _ret = QGraphicsAnchor::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGraphicsAnchor_Tr3(const char* s, const char* c, int n) { +struct miqt_string QGraphicsAnchor_Tr3(const char* s, const char* c, int n) { QString _ret = QGraphicsAnchor::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGraphicsAnchor_TrUtf82(const char* s, const char* c) { +struct miqt_string QGraphicsAnchor_TrUtf82(const char* s, const char* c) { QString _ret = QGraphicsAnchor::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGraphicsAnchor_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QGraphicsAnchor_TrUtf83(const char* s, const char* c, int n) { QString _ret = QGraphicsAnchor::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QGraphicsAnchor_Delete(QGraphicsAnchor* self) { diff --git a/qt/gen_qgraphicsanchorlayout.go b/qt/gen_qgraphicsanchorlayout.go index 1741459c..cd2754a0 100644 --- a/qt/gen_qgraphicsanchorlayout.go +++ b/qt/gen_qgraphicsanchorlayout.go @@ -50,24 +50,24 @@ func (this *QGraphicsAnchor) MetaObject() *QMetaObject { func (this *QGraphicsAnchor) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QGraphicsAnchor_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QGraphicsAnchor_Metacast(this.h, param1_Cstring)) } func QGraphicsAnchor_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsAnchor_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsAnchor_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QGraphicsAnchor_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsAnchor_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsAnchor_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -96,9 +96,9 @@ func QGraphicsAnchor_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsAnchor_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsAnchor_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -107,9 +107,9 @@ func QGraphicsAnchor_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsAnchor_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsAnchor_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -118,9 +118,9 @@ func QGraphicsAnchor_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsAnchor_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsAnchor_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -129,9 +129,9 @@ func QGraphicsAnchor_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsAnchor_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsAnchor_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qgraphicsanchorlayout.h b/qt/gen_qgraphicsanchorlayout.h index 2d6fc3fc..73d4b7f1 100644 --- a/qt/gen_qgraphicsanchorlayout.h +++ b/qt/gen_qgraphicsanchorlayout.h @@ -29,17 +29,17 @@ typedef struct QRectF QRectF; QMetaObject* QGraphicsAnchor_MetaObject(const QGraphicsAnchor* self); void* QGraphicsAnchor_Metacast(QGraphicsAnchor* self, const char* param1); -struct miqt_string* QGraphicsAnchor_Tr(const char* s); -struct miqt_string* QGraphicsAnchor_TrUtf8(const char* s); +struct miqt_string QGraphicsAnchor_Tr(const char* s); +struct miqt_string QGraphicsAnchor_TrUtf8(const char* s); void QGraphicsAnchor_SetSpacing(QGraphicsAnchor* self, double spacing); void QGraphicsAnchor_UnsetSpacing(QGraphicsAnchor* self); double QGraphicsAnchor_Spacing(const QGraphicsAnchor* self); void QGraphicsAnchor_SetSizePolicy(QGraphicsAnchor* self, int policy); int QGraphicsAnchor_SizePolicy(const QGraphicsAnchor* self); -struct miqt_string* QGraphicsAnchor_Tr2(const char* s, const char* c); -struct miqt_string* QGraphicsAnchor_Tr3(const char* s, const char* c, int n); -struct miqt_string* QGraphicsAnchor_TrUtf82(const char* s, const char* c); -struct miqt_string* QGraphicsAnchor_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QGraphicsAnchor_Tr2(const char* s, const char* c); +struct miqt_string QGraphicsAnchor_Tr3(const char* s, const char* c, int n); +struct miqt_string QGraphicsAnchor_TrUtf82(const char* s, const char* c); +struct miqt_string QGraphicsAnchor_TrUtf83(const char* s, const char* c, int n); void QGraphicsAnchor_Delete(QGraphicsAnchor* self); QGraphicsAnchorLayout* QGraphicsAnchorLayout_new(); diff --git a/qt/gen_qgraphicseffect.cpp b/qt/gen_qgraphicseffect.cpp index 87492e1e..5a87b0e6 100644 --- a/qt/gen_qgraphicseffect.cpp +++ b/qt/gen_qgraphicseffect.cpp @@ -24,18 +24,26 @@ void* QGraphicsEffect_Metacast(QGraphicsEffect* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QGraphicsEffect_Tr(const char* s) { +struct miqt_string QGraphicsEffect_Tr(const char* s) { QString _ret = QGraphicsEffect::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGraphicsEffect_TrUtf8(const char* s) { +struct miqt_string QGraphicsEffect_TrUtf8(const char* s) { QString _ret = QGraphicsEffect::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QRectF* QGraphicsEffect_BoundingRectFor(const QGraphicsEffect* self, QRectF* sourceRect) { @@ -69,32 +77,48 @@ void QGraphicsEffect_connect_EnabledChanged(QGraphicsEffect* self, intptr_t slot }); } -struct miqt_string* QGraphicsEffect_Tr2(const char* s, const char* c) { +struct miqt_string QGraphicsEffect_Tr2(const char* s, const char* c) { QString _ret = QGraphicsEffect::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGraphicsEffect_Tr3(const char* s, const char* c, int n) { +struct miqt_string QGraphicsEffect_Tr3(const char* s, const char* c, int n) { QString _ret = QGraphicsEffect::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGraphicsEffect_TrUtf82(const char* s, const char* c) { +struct miqt_string QGraphicsEffect_TrUtf82(const char* s, const char* c) { QString _ret = QGraphicsEffect::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGraphicsEffect_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QGraphicsEffect_TrUtf83(const char* s, const char* c, int n) { QString _ret = QGraphicsEffect::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QGraphicsEffect_Delete(QGraphicsEffect* self) { @@ -117,18 +141,26 @@ void* QGraphicsColorizeEffect_Metacast(QGraphicsColorizeEffect* self, const char return self->qt_metacast(param1); } -struct miqt_string* QGraphicsColorizeEffect_Tr(const char* s) { +struct miqt_string QGraphicsColorizeEffect_Tr(const char* s) { QString _ret = QGraphicsColorizeEffect::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGraphicsColorizeEffect_TrUtf8(const char* s) { +struct miqt_string QGraphicsColorizeEffect_TrUtf8(const char* s) { QString _ret = QGraphicsColorizeEffect::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QColor* QGraphicsColorizeEffect_Color(const QGraphicsColorizeEffect* self) { @@ -173,32 +205,48 @@ void QGraphicsColorizeEffect_connect_StrengthChanged(QGraphicsColorizeEffect* se }); } -struct miqt_string* QGraphicsColorizeEffect_Tr2(const char* s, const char* c) { +struct miqt_string QGraphicsColorizeEffect_Tr2(const char* s, const char* c) { QString _ret = QGraphicsColorizeEffect::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGraphicsColorizeEffect_Tr3(const char* s, const char* c, int n) { +struct miqt_string QGraphicsColorizeEffect_Tr3(const char* s, const char* c, int n) { QString _ret = QGraphicsColorizeEffect::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGraphicsColorizeEffect_TrUtf82(const char* s, const char* c) { +struct miqt_string QGraphicsColorizeEffect_TrUtf82(const char* s, const char* c) { QString _ret = QGraphicsColorizeEffect::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGraphicsColorizeEffect_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QGraphicsColorizeEffect_TrUtf83(const char* s, const char* c, int n) { QString _ret = QGraphicsColorizeEffect::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QGraphicsColorizeEffect_Delete(QGraphicsColorizeEffect* self) { @@ -221,18 +269,26 @@ void* QGraphicsBlurEffect_Metacast(QGraphicsBlurEffect* self, const char* param1 return self->qt_metacast(param1); } -struct miqt_string* QGraphicsBlurEffect_Tr(const char* s) { +struct miqt_string QGraphicsBlurEffect_Tr(const char* s) { QString _ret = QGraphicsBlurEffect::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGraphicsBlurEffect_TrUtf8(const char* s) { +struct miqt_string QGraphicsBlurEffect_TrUtf8(const char* s) { QString _ret = QGraphicsBlurEffect::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QRectF* QGraphicsBlurEffect_BoundingRectFor(const QGraphicsBlurEffect* self, QRectF* rect) { @@ -281,32 +337,48 @@ void QGraphicsBlurEffect_connect_BlurHintsChanged(QGraphicsBlurEffect* self, int }); } -struct miqt_string* QGraphicsBlurEffect_Tr2(const char* s, const char* c) { +struct miqt_string QGraphicsBlurEffect_Tr2(const char* s, const char* c) { QString _ret = QGraphicsBlurEffect::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGraphicsBlurEffect_Tr3(const char* s, const char* c, int n) { +struct miqt_string QGraphicsBlurEffect_Tr3(const char* s, const char* c, int n) { QString _ret = QGraphicsBlurEffect::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGraphicsBlurEffect_TrUtf82(const char* s, const char* c) { +struct miqt_string QGraphicsBlurEffect_TrUtf82(const char* s, const char* c) { QString _ret = QGraphicsBlurEffect::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGraphicsBlurEffect_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QGraphicsBlurEffect_TrUtf83(const char* s, const char* c, int n) { QString _ret = QGraphicsBlurEffect::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QGraphicsBlurEffect_Delete(QGraphicsBlurEffect* self) { @@ -329,18 +401,26 @@ void* QGraphicsDropShadowEffect_Metacast(QGraphicsDropShadowEffect* self, const return self->qt_metacast(param1); } -struct miqt_string* QGraphicsDropShadowEffect_Tr(const char* s) { +struct miqt_string QGraphicsDropShadowEffect_Tr(const char* s) { QString _ret = QGraphicsDropShadowEffect::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGraphicsDropShadowEffect_TrUtf8(const char* s) { +struct miqt_string QGraphicsDropShadowEffect_TrUtf8(const char* s) { QString _ret = QGraphicsDropShadowEffect::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QRectF* QGraphicsDropShadowEffect_BoundingRectFor(const QGraphicsDropShadowEffect* self, QRectF* rect) { @@ -436,32 +516,48 @@ void QGraphicsDropShadowEffect_connect_ColorChanged(QGraphicsDropShadowEffect* s }); } -struct miqt_string* QGraphicsDropShadowEffect_Tr2(const char* s, const char* c) { +struct miqt_string QGraphicsDropShadowEffect_Tr2(const char* s, const char* c) { QString _ret = QGraphicsDropShadowEffect::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGraphicsDropShadowEffect_Tr3(const char* s, const char* c, int n) { +struct miqt_string QGraphicsDropShadowEffect_Tr3(const char* s, const char* c, int n) { QString _ret = QGraphicsDropShadowEffect::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGraphicsDropShadowEffect_TrUtf82(const char* s, const char* c) { +struct miqt_string QGraphicsDropShadowEffect_TrUtf82(const char* s, const char* c) { QString _ret = QGraphicsDropShadowEffect::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGraphicsDropShadowEffect_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QGraphicsDropShadowEffect_TrUtf83(const char* s, const char* c, int n) { QString _ret = QGraphicsDropShadowEffect::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QGraphicsDropShadowEffect_Delete(QGraphicsDropShadowEffect* self) { @@ -484,18 +580,26 @@ void* QGraphicsOpacityEffect_Metacast(QGraphicsOpacityEffect* self, const char* return self->qt_metacast(param1); } -struct miqt_string* QGraphicsOpacityEffect_Tr(const char* s) { +struct miqt_string QGraphicsOpacityEffect_Tr(const char* s) { QString _ret = QGraphicsOpacityEffect::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGraphicsOpacityEffect_TrUtf8(const char* s) { +struct miqt_string QGraphicsOpacityEffect_TrUtf8(const char* s) { QString _ret = QGraphicsOpacityEffect::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } double QGraphicsOpacityEffect_Opacity(const QGraphicsOpacityEffect* self) { @@ -540,32 +644,48 @@ void QGraphicsOpacityEffect_connect_OpacityMaskChanged(QGraphicsOpacityEffect* s }); } -struct miqt_string* QGraphicsOpacityEffect_Tr2(const char* s, const char* c) { +struct miqt_string QGraphicsOpacityEffect_Tr2(const char* s, const char* c) { QString _ret = QGraphicsOpacityEffect::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGraphicsOpacityEffect_Tr3(const char* s, const char* c, int n) { +struct miqt_string QGraphicsOpacityEffect_Tr3(const char* s, const char* c, int n) { QString _ret = QGraphicsOpacityEffect::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGraphicsOpacityEffect_TrUtf82(const char* s, const char* c) { +struct miqt_string QGraphicsOpacityEffect_TrUtf82(const char* s, const char* c) { QString _ret = QGraphicsOpacityEffect::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGraphicsOpacityEffect_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QGraphicsOpacityEffect_TrUtf83(const char* s, const char* c, int n) { QString _ret = QGraphicsOpacityEffect::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QGraphicsOpacityEffect_Delete(QGraphicsOpacityEffect* self) { diff --git a/qt/gen_qgraphicseffect.go b/qt/gen_qgraphicseffect.go index f388db1e..3922c1c9 100644 --- a/qt/gen_qgraphicseffect.go +++ b/qt/gen_qgraphicseffect.go @@ -76,24 +76,24 @@ func (this *QGraphicsEffect) MetaObject() *QMetaObject { func (this *QGraphicsEffect) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QGraphicsEffect_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QGraphicsEffect_Metacast(this.h, param1_Cstring)) } func QGraphicsEffect_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsEffect_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsEffect_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QGraphicsEffect_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsEffect_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsEffect_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -148,9 +148,9 @@ func QGraphicsEffect_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsEffect_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsEffect_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -159,9 +159,9 @@ func QGraphicsEffect_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsEffect_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsEffect_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -170,9 +170,9 @@ func QGraphicsEffect_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsEffect_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsEffect_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -181,9 +181,9 @@ func QGraphicsEffect_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsEffect_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsEffect_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -250,24 +250,24 @@ func (this *QGraphicsColorizeEffect) MetaObject() *QMetaObject { func (this *QGraphicsColorizeEffect) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QGraphicsColorizeEffect_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QGraphicsColorizeEffect_Metacast(this.h, param1_Cstring)) } func QGraphicsColorizeEffect_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsColorizeEffect_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsColorizeEffect_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QGraphicsColorizeEffect_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsColorizeEffect_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsColorizeEffect_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -335,9 +335,9 @@ func QGraphicsColorizeEffect_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsColorizeEffect_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsColorizeEffect_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -346,9 +346,9 @@ func QGraphicsColorizeEffect_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsColorizeEffect_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsColorizeEffect_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -357,9 +357,9 @@ func QGraphicsColorizeEffect_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsColorizeEffect_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsColorizeEffect_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -368,9 +368,9 @@ func QGraphicsColorizeEffect_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsColorizeEffect_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsColorizeEffect_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -437,24 +437,24 @@ func (this *QGraphicsBlurEffect) MetaObject() *QMetaObject { func (this *QGraphicsBlurEffect) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QGraphicsBlurEffect_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QGraphicsBlurEffect_Metacast(this.h, param1_Cstring)) } func QGraphicsBlurEffect_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsBlurEffect_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsBlurEffect_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QGraphicsBlurEffect_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsBlurEffect_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsBlurEffect_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -526,9 +526,9 @@ func QGraphicsBlurEffect_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsBlurEffect_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsBlurEffect_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -537,9 +537,9 @@ func QGraphicsBlurEffect_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsBlurEffect_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsBlurEffect_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -548,9 +548,9 @@ func QGraphicsBlurEffect_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsBlurEffect_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsBlurEffect_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -559,9 +559,9 @@ func QGraphicsBlurEffect_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsBlurEffect_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsBlurEffect_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -628,24 +628,24 @@ func (this *QGraphicsDropShadowEffect) MetaObject() *QMetaObject { func (this *QGraphicsDropShadowEffect) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QGraphicsDropShadowEffect_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QGraphicsDropShadowEffect_Metacast(this.h, param1_Cstring)) } func QGraphicsDropShadowEffect_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsDropShadowEffect_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsDropShadowEffect_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QGraphicsDropShadowEffect_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsDropShadowEffect_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsDropShadowEffect_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -775,9 +775,9 @@ func QGraphicsDropShadowEffect_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsDropShadowEffect_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsDropShadowEffect_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -786,9 +786,9 @@ func QGraphicsDropShadowEffect_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsDropShadowEffect_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsDropShadowEffect_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -797,9 +797,9 @@ func QGraphicsDropShadowEffect_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsDropShadowEffect_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsDropShadowEffect_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -808,9 +808,9 @@ func QGraphicsDropShadowEffect_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsDropShadowEffect_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsDropShadowEffect_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -877,24 +877,24 @@ func (this *QGraphicsOpacityEffect) MetaObject() *QMetaObject { func (this *QGraphicsOpacityEffect) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QGraphicsOpacityEffect_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QGraphicsOpacityEffect_Metacast(this.h, param1_Cstring)) } func QGraphicsOpacityEffect_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsOpacityEffect_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsOpacityEffect_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QGraphicsOpacityEffect_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsOpacityEffect_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsOpacityEffect_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -962,9 +962,9 @@ func QGraphicsOpacityEffect_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsOpacityEffect_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsOpacityEffect_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -973,9 +973,9 @@ func QGraphicsOpacityEffect_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsOpacityEffect_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsOpacityEffect_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -984,9 +984,9 @@ func QGraphicsOpacityEffect_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsOpacityEffect_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsOpacityEffect_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -995,9 +995,9 @@ func QGraphicsOpacityEffect_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsOpacityEffect_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsOpacityEffect_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qgraphicseffect.h b/qt/gen_qgraphicseffect.h index 9d7c02cd..714809dc 100644 --- a/qt/gen_qgraphicseffect.h +++ b/qt/gen_qgraphicseffect.h @@ -41,8 +41,8 @@ typedef struct QRectF QRectF; QMetaObject* QGraphicsEffect_MetaObject(const QGraphicsEffect* self); void* QGraphicsEffect_Metacast(QGraphicsEffect* self, const char* param1); -struct miqt_string* QGraphicsEffect_Tr(const char* s); -struct miqt_string* QGraphicsEffect_TrUtf8(const char* s); +struct miqt_string QGraphicsEffect_Tr(const char* s); +struct miqt_string QGraphicsEffect_TrUtf8(const char* s); QRectF* QGraphicsEffect_BoundingRectFor(const QGraphicsEffect* self, QRectF* sourceRect); QRectF* QGraphicsEffect_BoundingRect(const QGraphicsEffect* self); bool QGraphicsEffect_IsEnabled(const QGraphicsEffect* self); @@ -50,18 +50,18 @@ void QGraphicsEffect_SetEnabled(QGraphicsEffect* self, bool enable); void QGraphicsEffect_Update(QGraphicsEffect* self); void QGraphicsEffect_EnabledChanged(QGraphicsEffect* self, bool enabled); void QGraphicsEffect_connect_EnabledChanged(QGraphicsEffect* self, intptr_t slot); -struct miqt_string* QGraphicsEffect_Tr2(const char* s, const char* c); -struct miqt_string* QGraphicsEffect_Tr3(const char* s, const char* c, int n); -struct miqt_string* QGraphicsEffect_TrUtf82(const char* s, const char* c); -struct miqt_string* QGraphicsEffect_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QGraphicsEffect_Tr2(const char* s, const char* c); +struct miqt_string QGraphicsEffect_Tr3(const char* s, const char* c, int n); +struct miqt_string QGraphicsEffect_TrUtf82(const char* s, const char* c); +struct miqt_string QGraphicsEffect_TrUtf83(const char* s, const char* c, int n); void QGraphicsEffect_Delete(QGraphicsEffect* self); QGraphicsColorizeEffect* QGraphicsColorizeEffect_new(); QGraphicsColorizeEffect* QGraphicsColorizeEffect_new2(QObject* parent); QMetaObject* QGraphicsColorizeEffect_MetaObject(const QGraphicsColorizeEffect* self); void* QGraphicsColorizeEffect_Metacast(QGraphicsColorizeEffect* self, const char* param1); -struct miqt_string* QGraphicsColorizeEffect_Tr(const char* s); -struct miqt_string* QGraphicsColorizeEffect_TrUtf8(const char* s); +struct miqt_string QGraphicsColorizeEffect_Tr(const char* s); +struct miqt_string QGraphicsColorizeEffect_TrUtf8(const char* s); QColor* QGraphicsColorizeEffect_Color(const QGraphicsColorizeEffect* self); double QGraphicsColorizeEffect_Strength(const QGraphicsColorizeEffect* self); void QGraphicsColorizeEffect_SetColor(QGraphicsColorizeEffect* self, QColor* c); @@ -70,18 +70,18 @@ void QGraphicsColorizeEffect_ColorChanged(QGraphicsColorizeEffect* self, QColor* void QGraphicsColorizeEffect_connect_ColorChanged(QGraphicsColorizeEffect* self, intptr_t slot); void QGraphicsColorizeEffect_StrengthChanged(QGraphicsColorizeEffect* self, double strength); void QGraphicsColorizeEffect_connect_StrengthChanged(QGraphicsColorizeEffect* self, intptr_t slot); -struct miqt_string* QGraphicsColorizeEffect_Tr2(const char* s, const char* c); -struct miqt_string* QGraphicsColorizeEffect_Tr3(const char* s, const char* c, int n); -struct miqt_string* QGraphicsColorizeEffect_TrUtf82(const char* s, const char* c); -struct miqt_string* QGraphicsColorizeEffect_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QGraphicsColorizeEffect_Tr2(const char* s, const char* c); +struct miqt_string QGraphicsColorizeEffect_Tr3(const char* s, const char* c, int n); +struct miqt_string QGraphicsColorizeEffect_TrUtf82(const char* s, const char* c); +struct miqt_string QGraphicsColorizeEffect_TrUtf83(const char* s, const char* c, int n); void QGraphicsColorizeEffect_Delete(QGraphicsColorizeEffect* self); QGraphicsBlurEffect* QGraphicsBlurEffect_new(); QGraphicsBlurEffect* QGraphicsBlurEffect_new2(QObject* parent); QMetaObject* QGraphicsBlurEffect_MetaObject(const QGraphicsBlurEffect* self); void* QGraphicsBlurEffect_Metacast(QGraphicsBlurEffect* self, const char* param1); -struct miqt_string* QGraphicsBlurEffect_Tr(const char* s); -struct miqt_string* QGraphicsBlurEffect_TrUtf8(const char* s); +struct miqt_string QGraphicsBlurEffect_Tr(const char* s); +struct miqt_string QGraphicsBlurEffect_TrUtf8(const char* s); QRectF* QGraphicsBlurEffect_BoundingRectFor(const QGraphicsBlurEffect* self, QRectF* rect); double QGraphicsBlurEffect_BlurRadius(const QGraphicsBlurEffect* self); int QGraphicsBlurEffect_BlurHints(const QGraphicsBlurEffect* self); @@ -91,18 +91,18 @@ void QGraphicsBlurEffect_BlurRadiusChanged(QGraphicsBlurEffect* self, double blu void QGraphicsBlurEffect_connect_BlurRadiusChanged(QGraphicsBlurEffect* self, intptr_t slot); void QGraphicsBlurEffect_BlurHintsChanged(QGraphicsBlurEffect* self, int hints); void QGraphicsBlurEffect_connect_BlurHintsChanged(QGraphicsBlurEffect* self, intptr_t slot); -struct miqt_string* QGraphicsBlurEffect_Tr2(const char* s, const char* c); -struct miqt_string* QGraphicsBlurEffect_Tr3(const char* s, const char* c, int n); -struct miqt_string* QGraphicsBlurEffect_TrUtf82(const char* s, const char* c); -struct miqt_string* QGraphicsBlurEffect_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QGraphicsBlurEffect_Tr2(const char* s, const char* c); +struct miqt_string QGraphicsBlurEffect_Tr3(const char* s, const char* c, int n); +struct miqt_string QGraphicsBlurEffect_TrUtf82(const char* s, const char* c); +struct miqt_string QGraphicsBlurEffect_TrUtf83(const char* s, const char* c, int n); void QGraphicsBlurEffect_Delete(QGraphicsBlurEffect* self); QGraphicsDropShadowEffect* QGraphicsDropShadowEffect_new(); QGraphicsDropShadowEffect* QGraphicsDropShadowEffect_new2(QObject* parent); QMetaObject* QGraphicsDropShadowEffect_MetaObject(const QGraphicsDropShadowEffect* self); void* QGraphicsDropShadowEffect_Metacast(QGraphicsDropShadowEffect* self, const char* param1); -struct miqt_string* QGraphicsDropShadowEffect_Tr(const char* s); -struct miqt_string* QGraphicsDropShadowEffect_TrUtf8(const char* s); +struct miqt_string QGraphicsDropShadowEffect_Tr(const char* s); +struct miqt_string QGraphicsDropShadowEffect_TrUtf8(const char* s); QRectF* QGraphicsDropShadowEffect_BoundingRectFor(const QGraphicsDropShadowEffect* self, QRectF* rect); QPointF* QGraphicsDropShadowEffect_Offset(const QGraphicsDropShadowEffect* self); double QGraphicsDropShadowEffect_XOffset(const QGraphicsDropShadowEffect* self); @@ -122,18 +122,18 @@ void QGraphicsDropShadowEffect_BlurRadiusChanged(QGraphicsDropShadowEffect* self void QGraphicsDropShadowEffect_connect_BlurRadiusChanged(QGraphicsDropShadowEffect* self, intptr_t slot); void QGraphicsDropShadowEffect_ColorChanged(QGraphicsDropShadowEffect* self, QColor* color); void QGraphicsDropShadowEffect_connect_ColorChanged(QGraphicsDropShadowEffect* self, intptr_t slot); -struct miqt_string* QGraphicsDropShadowEffect_Tr2(const char* s, const char* c); -struct miqt_string* QGraphicsDropShadowEffect_Tr3(const char* s, const char* c, int n); -struct miqt_string* QGraphicsDropShadowEffect_TrUtf82(const char* s, const char* c); -struct miqt_string* QGraphicsDropShadowEffect_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QGraphicsDropShadowEffect_Tr2(const char* s, const char* c); +struct miqt_string QGraphicsDropShadowEffect_Tr3(const char* s, const char* c, int n); +struct miqt_string QGraphicsDropShadowEffect_TrUtf82(const char* s, const char* c); +struct miqt_string QGraphicsDropShadowEffect_TrUtf83(const char* s, const char* c, int n); void QGraphicsDropShadowEffect_Delete(QGraphicsDropShadowEffect* self); QGraphicsOpacityEffect* QGraphicsOpacityEffect_new(); QGraphicsOpacityEffect* QGraphicsOpacityEffect_new2(QObject* parent); QMetaObject* QGraphicsOpacityEffect_MetaObject(const QGraphicsOpacityEffect* self); void* QGraphicsOpacityEffect_Metacast(QGraphicsOpacityEffect* self, const char* param1); -struct miqt_string* QGraphicsOpacityEffect_Tr(const char* s); -struct miqt_string* QGraphicsOpacityEffect_TrUtf8(const char* s); +struct miqt_string QGraphicsOpacityEffect_Tr(const char* s); +struct miqt_string QGraphicsOpacityEffect_TrUtf8(const char* s); double QGraphicsOpacityEffect_Opacity(const QGraphicsOpacityEffect* self); QBrush* QGraphicsOpacityEffect_OpacityMask(const QGraphicsOpacityEffect* self); void QGraphicsOpacityEffect_SetOpacity(QGraphicsOpacityEffect* self, double opacity); @@ -142,10 +142,10 @@ void QGraphicsOpacityEffect_OpacityChanged(QGraphicsOpacityEffect* self, double void QGraphicsOpacityEffect_connect_OpacityChanged(QGraphicsOpacityEffect* self, intptr_t slot); void QGraphicsOpacityEffect_OpacityMaskChanged(QGraphicsOpacityEffect* self, QBrush* mask); void QGraphicsOpacityEffect_connect_OpacityMaskChanged(QGraphicsOpacityEffect* self, intptr_t slot); -struct miqt_string* QGraphicsOpacityEffect_Tr2(const char* s, const char* c); -struct miqt_string* QGraphicsOpacityEffect_Tr3(const char* s, const char* c, int n); -struct miqt_string* QGraphicsOpacityEffect_TrUtf82(const char* s, const char* c); -struct miqt_string* QGraphicsOpacityEffect_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QGraphicsOpacityEffect_Tr2(const char* s, const char* c); +struct miqt_string QGraphicsOpacityEffect_Tr3(const char* s, const char* c, int n); +struct miqt_string QGraphicsOpacityEffect_TrUtf82(const char* s, const char* c); +struct miqt_string QGraphicsOpacityEffect_TrUtf83(const char* s, const char* c, int n); void QGraphicsOpacityEffect_Delete(QGraphicsOpacityEffect* self); #ifdef __cplusplus diff --git a/qt/gen_qgraphicsitem.cpp b/qt/gen_qgraphicsitem.cpp index f6c71eb4..9fea7c2a 100644 --- a/qt/gen_qgraphicsitem.cpp +++ b/qt/gen_qgraphicsitem.cpp @@ -155,15 +155,19 @@ bool QGraphicsItem_IsBlockedByModalPanel(const QGraphicsItem* self) { return self->isBlockedByModalPanel(); } -struct miqt_string* QGraphicsItem_ToolTip(const QGraphicsItem* self) { +struct miqt_string QGraphicsItem_ToolTip(const QGraphicsItem* self) { QString _ret = self->toolTip(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QGraphicsItem_SetToolTip(QGraphicsItem* self, struct miqt_string* toolTip) { - QString toolTip_QString = QString::fromUtf8(&toolTip->data, toolTip->len); +void QGraphicsItem_SetToolTip(QGraphicsItem* self, struct miqt_string toolTip) { + QString toolTip_QString = QString::fromUtf8(toolTip.data, toolTip.len); self->setToolTip(toolTip_QString); } @@ -846,18 +850,26 @@ void* QGraphicsObject_Metacast(QGraphicsObject* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QGraphicsObject_Tr(const char* s) { +struct miqt_string QGraphicsObject_Tr(const char* s) { QString _ret = QGraphicsObject::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGraphicsObject_TrUtf8(const char* s) { +struct miqt_string QGraphicsObject_TrUtf8(const char* s) { QString _ret = QGraphicsObject::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QGraphicsObject_GrabGesture(QGraphicsObject* self, int typeVal) { @@ -988,32 +1000,48 @@ void QGraphicsObject_connect_HeightChanged(QGraphicsObject* self, intptr_t slot) }); } -struct miqt_string* QGraphicsObject_Tr2(const char* s, const char* c) { +struct miqt_string QGraphicsObject_Tr2(const char* s, const char* c) { QString _ret = QGraphicsObject::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGraphicsObject_Tr3(const char* s, const char* c, int n) { +struct miqt_string QGraphicsObject_Tr3(const char* s, const char* c, int n) { QString _ret = QGraphicsObject::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGraphicsObject_TrUtf82(const char* s, const char* c) { +struct miqt_string QGraphicsObject_TrUtf82(const char* s, const char* c) { QString _ret = QGraphicsObject::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGraphicsObject_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QGraphicsObject_TrUtf83(const char* s, const char* c, int n) { QString _ret = QGraphicsObject::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QGraphicsObject_GrabGesture2(QGraphicsObject* self, int typeVal, int flags) { @@ -1495,8 +1523,8 @@ QGraphicsTextItem* QGraphicsTextItem_new() { return new QGraphicsTextItem(); } -QGraphicsTextItem* QGraphicsTextItem_new2(struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QGraphicsTextItem* QGraphicsTextItem_new2(struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QGraphicsTextItem(text_QString); } @@ -1504,8 +1532,8 @@ QGraphicsTextItem* QGraphicsTextItem_new3(QGraphicsItem* parent) { return new QGraphicsTextItem(parent); } -QGraphicsTextItem* QGraphicsTextItem_new4(struct miqt_string* text, QGraphicsItem* parent) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QGraphicsTextItem* QGraphicsTextItem_new4(struct miqt_string text, QGraphicsItem* parent) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QGraphicsTextItem(text_QString, parent); } @@ -1517,41 +1545,57 @@ void* QGraphicsTextItem_Metacast(QGraphicsTextItem* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QGraphicsTextItem_Tr(const char* s) { +struct miqt_string QGraphicsTextItem_Tr(const char* s) { QString _ret = QGraphicsTextItem::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGraphicsTextItem_TrUtf8(const char* s) { +struct miqt_string QGraphicsTextItem_TrUtf8(const char* s) { QString _ret = QGraphicsTextItem::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGraphicsTextItem_ToHtml(const QGraphicsTextItem* self) { +struct miqt_string QGraphicsTextItem_ToHtml(const QGraphicsTextItem* self) { QString _ret = self->toHtml(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QGraphicsTextItem_SetHtml(QGraphicsTextItem* self, struct miqt_string* html) { - QString html_QString = QString::fromUtf8(&html->data, html->len); +void QGraphicsTextItem_SetHtml(QGraphicsTextItem* self, struct miqt_string html) { + QString html_QString = QString::fromUtf8(html.data, html.len); self->setHtml(html_QString); } -struct miqt_string* QGraphicsTextItem_ToPlainText(const QGraphicsTextItem* self) { +struct miqt_string QGraphicsTextItem_ToPlainText(const QGraphicsTextItem* self) { QString _ret = self->toPlainText(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QGraphicsTextItem_SetPlainText(QGraphicsTextItem* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QGraphicsTextItem_SetPlainText(QGraphicsTextItem* self, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->setPlainText(text_QString); } @@ -1653,8 +1697,8 @@ QTextCursor* QGraphicsTextItem_TextCursor(const QGraphicsTextItem* self) { return new QTextCursor(self->textCursor()); } -void QGraphicsTextItem_LinkActivated(QGraphicsTextItem* self, struct miqt_string* param1) { - QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); +void QGraphicsTextItem_LinkActivated(QGraphicsTextItem* self, struct miqt_string param1) { + QString param1_QString = QString::fromUtf8(param1.data, param1.len); self->linkActivated(param1_QString); } @@ -1663,13 +1707,17 @@ void QGraphicsTextItem_connect_LinkActivated(QGraphicsTextItem* self, intptr_t s const QString param1_ret = param1; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray param1_b = param1_ret.toUtf8(); - struct miqt_string* sigval1 = miqt_strdup(param1_b.data(), param1_b.length()); + struct miqt_string param1_ms; + param1_ms.len = param1_b.length(); + param1_ms.data = static_cast(malloc(param1_ms.len)); + memcpy(param1_ms.data, param1_b.data(), param1_ms.len); + struct miqt_string sigval1 = param1_ms; miqt_exec_callback_QGraphicsTextItem_LinkActivated(slot, sigval1); }); } -void QGraphicsTextItem_LinkHovered(QGraphicsTextItem* self, struct miqt_string* param1) { - QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); +void QGraphicsTextItem_LinkHovered(QGraphicsTextItem* self, struct miqt_string param1) { + QString param1_QString = QString::fromUtf8(param1.data, param1.len); self->linkHovered(param1_QString); } @@ -1678,37 +1726,57 @@ void QGraphicsTextItem_connect_LinkHovered(QGraphicsTextItem* self, intptr_t slo const QString param1_ret = param1; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray param1_b = param1_ret.toUtf8(); - struct miqt_string* sigval1 = miqt_strdup(param1_b.data(), param1_b.length()); + struct miqt_string param1_ms; + param1_ms.len = param1_b.length(); + param1_ms.data = static_cast(malloc(param1_ms.len)); + memcpy(param1_ms.data, param1_b.data(), param1_ms.len); + struct miqt_string sigval1 = param1_ms; miqt_exec_callback_QGraphicsTextItem_LinkHovered(slot, sigval1); }); } -struct miqt_string* QGraphicsTextItem_Tr2(const char* s, const char* c) { +struct miqt_string QGraphicsTextItem_Tr2(const char* s, const char* c) { QString _ret = QGraphicsTextItem::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGraphicsTextItem_Tr3(const char* s, const char* c, int n) { +struct miqt_string QGraphicsTextItem_Tr3(const char* s, const char* c, int n) { QString _ret = QGraphicsTextItem::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGraphicsTextItem_TrUtf82(const char* s, const char* c) { +struct miqt_string QGraphicsTextItem_TrUtf82(const char* s, const char* c) { QString _ret = QGraphicsTextItem::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGraphicsTextItem_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QGraphicsTextItem_TrUtf83(const char* s, const char* c, int n) { QString _ret = QGraphicsTextItem::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QGraphicsTextItem_Delete(QGraphicsTextItem* self) { @@ -1719,8 +1787,8 @@ QGraphicsSimpleTextItem* QGraphicsSimpleTextItem_new() { return new QGraphicsSimpleTextItem(); } -QGraphicsSimpleTextItem* QGraphicsSimpleTextItem_new2(struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QGraphicsSimpleTextItem* QGraphicsSimpleTextItem_new2(struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QGraphicsSimpleTextItem(text_QString); } @@ -1728,21 +1796,25 @@ QGraphicsSimpleTextItem* QGraphicsSimpleTextItem_new3(QGraphicsItem* parent) { return new QGraphicsSimpleTextItem(parent); } -QGraphicsSimpleTextItem* QGraphicsSimpleTextItem_new4(struct miqt_string* text, QGraphicsItem* parent) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QGraphicsSimpleTextItem* QGraphicsSimpleTextItem_new4(struct miqt_string text, QGraphicsItem* parent) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QGraphicsSimpleTextItem(text_QString, parent); } -void QGraphicsSimpleTextItem_SetText(QGraphicsSimpleTextItem* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QGraphicsSimpleTextItem_SetText(QGraphicsSimpleTextItem* self, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->setText(text_QString); } -struct miqt_string* QGraphicsSimpleTextItem_Text(const QGraphicsSimpleTextItem* self) { +struct miqt_string QGraphicsSimpleTextItem_Text(const QGraphicsSimpleTextItem* self) { QString _ret = self->text(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QGraphicsSimpleTextItem_SetFont(QGraphicsSimpleTextItem* self, QFont* font) { diff --git a/qt/gen_qgraphicsitem.go b/qt/gen_qgraphicsitem.go index 2b99a6b8..2590f78e 100644 --- a/qt/gen_qgraphicsitem.go +++ b/qt/gen_qgraphicsitem.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "runtime/cgo" "unsafe" @@ -98,38 +97,38 @@ const ( type QGraphicsItem__ int const ( - QGraphicsItem____Type QGraphicsItem__ = 1 - QGraphicsItem____UserType QGraphicsItem__ = 65536 + QGraphicsItem__Type QGraphicsItem__ = 1 + QGraphicsItem__UserType QGraphicsItem__ = 65536 ) type QGraphicsPathItem__ int const ( - QGraphicsPathItem____Type QGraphicsPathItem__ = 2 + QGraphicsPathItem__Type QGraphicsPathItem__ = 2 ) type QGraphicsRectItem__ int const ( - QGraphicsRectItem____Type QGraphicsRectItem__ = 3 + QGraphicsRectItem__Type QGraphicsRectItem__ = 3 ) type QGraphicsEllipseItem__ int const ( - QGraphicsEllipseItem____Type QGraphicsEllipseItem__ = 4 + QGraphicsEllipseItem__Type QGraphicsEllipseItem__ = 4 ) type QGraphicsPolygonItem__ int const ( - QGraphicsPolygonItem____Type QGraphicsPolygonItem__ = 5 + QGraphicsPolygonItem__Type QGraphicsPolygonItem__ = 5 ) type QGraphicsLineItem__ int const ( - QGraphicsLineItem____Type QGraphicsLineItem__ = 6 + QGraphicsLineItem__Type QGraphicsLineItem__ = 6 ) type QGraphicsPixmapItem__ShapeMode int @@ -143,25 +142,25 @@ const ( type QGraphicsPixmapItem__ int const ( - QGraphicsPixmapItem____Type QGraphicsPixmapItem__ = 7 + QGraphicsPixmapItem__Type QGraphicsPixmapItem__ = 7 ) type QGraphicsTextItem__ int const ( - QGraphicsTextItem____Type QGraphicsTextItem__ = 8 + QGraphicsTextItem__Type QGraphicsTextItem__ = 8 ) type QGraphicsSimpleTextItem__ int const ( - QGraphicsSimpleTextItem____Type QGraphicsSimpleTextItem__ = 9 + QGraphicsSimpleTextItem__Type QGraphicsSimpleTextItem__ = 9 ) type QGraphicsItemGroup__ int const ( - QGraphicsItemGroup____Type QGraphicsItemGroup__ = 10 + QGraphicsItemGroup__Type QGraphicsItemGroup__ = 10 ) type QGraphicsItem struct { @@ -301,16 +300,18 @@ func (this *QGraphicsItem) IsBlockedByModalPanel() bool { } func (this *QGraphicsItem) ToolTip() string { - var _ms *C.struct_miqt_string = C.QGraphicsItem_ToolTip(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsItem_ToolTip(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QGraphicsItem) SetToolTip(toolTip string) { - toolTip_ms := libmiqt.Strdupg(toolTip) - defer C.free(toolTip_ms) - C.QGraphicsItem_SetToolTip(this.h, (*C.struct_miqt_string)(toolTip_ms)) + toolTip_ms := C.struct_miqt_string{} + toolTip_ms.data = C.CString(toolTip) + toolTip_ms.len = C.size_t(len(toolTip)) + defer C.free(unsafe.Pointer(toolTip_ms.data)) + C.QGraphicsItem_SetToolTip(this.h, toolTip_ms) } func (this *QGraphicsItem) Cursor() *QCursor { @@ -1165,24 +1166,24 @@ func (this *QGraphicsObject) MetaObject() *QMetaObject { func (this *QGraphicsObject) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QGraphicsObject_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QGraphicsObject_Metacast(this.h, param1_Cstring)) } func QGraphicsObject_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsObject_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsObject_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QGraphicsObject_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsObject_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsObject_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -1403,9 +1404,9 @@ func QGraphicsObject_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsObject_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsObject_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -1414,9 +1415,9 @@ func QGraphicsObject_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsObject_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsObject_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -1425,9 +1426,9 @@ func QGraphicsObject_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsObject_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsObject_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -1436,9 +1437,9 @@ func QGraphicsObject_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsObject_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsObject_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -2382,9 +2383,11 @@ func NewQGraphicsTextItem() *QGraphicsTextItem { // NewQGraphicsTextItem2 constructs a new QGraphicsTextItem object. func NewQGraphicsTextItem2(text string) *QGraphicsTextItem { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - ret := C.QGraphicsTextItem_new2((*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + ret := C.QGraphicsTextItem_new2(text_ms) return newQGraphicsTextItem(ret) } @@ -2396,9 +2399,11 @@ func NewQGraphicsTextItem3(parent *QGraphicsItem) *QGraphicsTextItem { // NewQGraphicsTextItem4 constructs a new QGraphicsTextItem object. func NewQGraphicsTextItem4(text string, parent *QGraphicsItem) *QGraphicsTextItem { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - ret := C.QGraphicsTextItem_new4((*C.struct_miqt_string)(text_ms), parent.cPointer()) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + ret := C.QGraphicsTextItem_new4(text_ms, parent.cPointer()) return newQGraphicsTextItem(ret) } @@ -2409,51 +2414,55 @@ func (this *QGraphicsTextItem) MetaObject() *QMetaObject { func (this *QGraphicsTextItem) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QGraphicsTextItem_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QGraphicsTextItem_Metacast(this.h, param1_Cstring)) } func QGraphicsTextItem_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsTextItem_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsTextItem_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QGraphicsTextItem_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsTextItem_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsTextItem_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QGraphicsTextItem) ToHtml() string { - var _ms *C.struct_miqt_string = C.QGraphicsTextItem_ToHtml(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsTextItem_ToHtml(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QGraphicsTextItem) SetHtml(html string) { - html_ms := libmiqt.Strdupg(html) - defer C.free(html_ms) - C.QGraphicsTextItem_SetHtml(this.h, (*C.struct_miqt_string)(html_ms)) + html_ms := C.struct_miqt_string{} + html_ms.data = C.CString(html) + html_ms.len = C.size_t(len(html)) + defer C.free(unsafe.Pointer(html_ms.data)) + C.QGraphicsTextItem_SetHtml(this.h, html_ms) } func (this *QGraphicsTextItem) ToPlainText() string { - var _ms *C.struct_miqt_string = C.QGraphicsTextItem_ToPlainText(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsTextItem_ToPlainText(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QGraphicsTextItem) SetPlainText(text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QGraphicsTextItem_SetPlainText(this.h, (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QGraphicsTextItem_SetPlainText(this.h, text_ms) } func (this *QGraphicsTextItem) Font() *QFont { @@ -2571,50 +2580,54 @@ func (this *QGraphicsTextItem) TextCursor() *QTextCursor { } func (this *QGraphicsTextItem) LinkActivated(param1 string) { - param1_ms := libmiqt.Strdupg(param1) - defer C.free(param1_ms) - C.QGraphicsTextItem_LinkActivated(this.h, (*C.struct_miqt_string)(param1_ms)) + param1_ms := C.struct_miqt_string{} + param1_ms.data = C.CString(param1) + param1_ms.len = C.size_t(len(param1)) + defer C.free(unsafe.Pointer(param1_ms.data)) + C.QGraphicsTextItem_LinkActivated(this.h, param1_ms) } func (this *QGraphicsTextItem) OnLinkActivated(slot func(param1 string)) { C.QGraphicsTextItem_connect_LinkActivated(this.h, C.intptr_t(cgo.NewHandle(slot))) } //export miqt_exec_callback_QGraphicsTextItem_LinkActivated -func miqt_exec_callback_QGraphicsTextItem_LinkActivated(cb C.intptr_t, param1 *C.struct_miqt_string) { +func miqt_exec_callback_QGraphicsTextItem_LinkActivated(cb C.intptr_t, param1 C.struct_miqt_string) { gofunc, ok := cgo.Handle(cb).Value().(func(param1 string)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") } // Convert all CABI parameters to Go parameters - var param1_ms *C.struct_miqt_string = param1 - param1_ret := C.GoStringN(¶m1_ms.data, C.int(int64(param1_ms.len))) - C.free(unsafe.Pointer(param1_ms)) + var param1_ms C.struct_miqt_string = param1 + param1_ret := C.GoStringN(param1_ms.data, C.int(int64(param1_ms.len))) + C.free(unsafe.Pointer(param1_ms.data)) slotval1 := param1_ret gofunc(slotval1) } func (this *QGraphicsTextItem) LinkHovered(param1 string) { - param1_ms := libmiqt.Strdupg(param1) - defer C.free(param1_ms) - C.QGraphicsTextItem_LinkHovered(this.h, (*C.struct_miqt_string)(param1_ms)) + param1_ms := C.struct_miqt_string{} + param1_ms.data = C.CString(param1) + param1_ms.len = C.size_t(len(param1)) + defer C.free(unsafe.Pointer(param1_ms.data)) + C.QGraphicsTextItem_LinkHovered(this.h, param1_ms) } func (this *QGraphicsTextItem) OnLinkHovered(slot func(param1 string)) { C.QGraphicsTextItem_connect_LinkHovered(this.h, C.intptr_t(cgo.NewHandle(slot))) } //export miqt_exec_callback_QGraphicsTextItem_LinkHovered -func miqt_exec_callback_QGraphicsTextItem_LinkHovered(cb C.intptr_t, param1 *C.struct_miqt_string) { +func miqt_exec_callback_QGraphicsTextItem_LinkHovered(cb C.intptr_t, param1 C.struct_miqt_string) { gofunc, ok := cgo.Handle(cb).Value().(func(param1 string)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") } // Convert all CABI parameters to Go parameters - var param1_ms *C.struct_miqt_string = param1 - param1_ret := C.GoStringN(¶m1_ms.data, C.int(int64(param1_ms.len))) - C.free(unsafe.Pointer(param1_ms)) + var param1_ms C.struct_miqt_string = param1 + param1_ret := C.GoStringN(param1_ms.data, C.int(int64(param1_ms.len))) + C.free(unsafe.Pointer(param1_ms.data)) slotval1 := param1_ret gofunc(slotval1) @@ -2625,9 +2638,9 @@ func QGraphicsTextItem_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsTextItem_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsTextItem_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -2636,9 +2649,9 @@ func QGraphicsTextItem_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsTextItem_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsTextItem_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -2647,9 +2660,9 @@ func QGraphicsTextItem_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsTextItem_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsTextItem_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -2658,9 +2671,9 @@ func QGraphicsTextItem_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsTextItem_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsTextItem_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -2716,9 +2729,11 @@ func NewQGraphicsSimpleTextItem() *QGraphicsSimpleTextItem { // NewQGraphicsSimpleTextItem2 constructs a new QGraphicsSimpleTextItem object. func NewQGraphicsSimpleTextItem2(text string) *QGraphicsSimpleTextItem { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - ret := C.QGraphicsSimpleTextItem_new2((*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + ret := C.QGraphicsSimpleTextItem_new2(text_ms) return newQGraphicsSimpleTextItem(ret) } @@ -2730,22 +2745,26 @@ func NewQGraphicsSimpleTextItem3(parent *QGraphicsItem) *QGraphicsSimpleTextItem // NewQGraphicsSimpleTextItem4 constructs a new QGraphicsSimpleTextItem object. func NewQGraphicsSimpleTextItem4(text string, parent *QGraphicsItem) *QGraphicsSimpleTextItem { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - ret := C.QGraphicsSimpleTextItem_new4((*C.struct_miqt_string)(text_ms), parent.cPointer()) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + ret := C.QGraphicsSimpleTextItem_new4(text_ms, parent.cPointer()) return newQGraphicsSimpleTextItem(ret) } func (this *QGraphicsSimpleTextItem) SetText(text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QGraphicsSimpleTextItem_SetText(this.h, (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QGraphicsSimpleTextItem_SetText(this.h, text_ms) } func (this *QGraphicsSimpleTextItem) Text() string { - var _ms *C.struct_miqt_string = C.QGraphicsSimpleTextItem_Text(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsSimpleTextItem_Text(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qgraphicsitem.h b/qt/gen_qgraphicsitem.h index da26caae..4067c40b 100644 --- a/qt/gen_qgraphicsitem.h +++ b/qt/gen_qgraphicsitem.h @@ -116,8 +116,8 @@ void QGraphicsItem_SetCacheMode(QGraphicsItem* self, int mode); int QGraphicsItem_PanelModality(const QGraphicsItem* self); void QGraphicsItem_SetPanelModality(QGraphicsItem* self, int panelModality); bool QGraphicsItem_IsBlockedByModalPanel(const QGraphicsItem* self); -struct miqt_string* QGraphicsItem_ToolTip(const QGraphicsItem* self); -void QGraphicsItem_SetToolTip(QGraphicsItem* self, struct miqt_string* toolTip); +struct miqt_string QGraphicsItem_ToolTip(const QGraphicsItem* self); +void QGraphicsItem_SetToolTip(QGraphicsItem* self, struct miqt_string toolTip); QCursor* QGraphicsItem_Cursor(const QGraphicsItem* self); void QGraphicsItem_SetCursor(QGraphicsItem* self, QCursor* cursor); bool QGraphicsItem_HasCursor(const QGraphicsItem* self); @@ -278,8 +278,8 @@ void QGraphicsItem_Delete(QGraphicsItem* self); QMetaObject* QGraphicsObject_MetaObject(const QGraphicsObject* self); void* QGraphicsObject_Metacast(QGraphicsObject* self, const char* param1); -struct miqt_string* QGraphicsObject_Tr(const char* s); -struct miqt_string* QGraphicsObject_TrUtf8(const char* s); +struct miqt_string QGraphicsObject_Tr(const char* s); +struct miqt_string QGraphicsObject_TrUtf8(const char* s); void QGraphicsObject_GrabGesture(QGraphicsObject* self, int typeVal); void QGraphicsObject_UngrabGesture(QGraphicsObject* self, int typeVal); void QGraphicsObject_ParentChanged(QGraphicsObject* self); @@ -306,10 +306,10 @@ void QGraphicsObject_WidthChanged(QGraphicsObject* self); void QGraphicsObject_connect_WidthChanged(QGraphicsObject* self, intptr_t slot); void QGraphicsObject_HeightChanged(QGraphicsObject* self); void QGraphicsObject_connect_HeightChanged(QGraphicsObject* self, intptr_t slot); -struct miqt_string* QGraphicsObject_Tr2(const char* s, const char* c); -struct miqt_string* QGraphicsObject_Tr3(const char* s, const char* c, int n); -struct miqt_string* QGraphicsObject_TrUtf82(const char* s, const char* c); -struct miqt_string* QGraphicsObject_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QGraphicsObject_Tr2(const char* s, const char* c); +struct miqt_string QGraphicsObject_Tr3(const char* s, const char* c, int n); +struct miqt_string QGraphicsObject_TrUtf82(const char* s, const char* c); +struct miqt_string QGraphicsObject_TrUtf83(const char* s, const char* c, int n); void QGraphicsObject_GrabGesture2(QGraphicsObject* self, int typeVal, int flags); void QGraphicsObject_Delete(QGraphicsObject* self); @@ -437,17 +437,17 @@ void QGraphicsPixmapItem_SetShapeMode(QGraphicsPixmapItem* self, int mode); void QGraphicsPixmapItem_Delete(QGraphicsPixmapItem* self); QGraphicsTextItem* QGraphicsTextItem_new(); -QGraphicsTextItem* QGraphicsTextItem_new2(struct miqt_string* text); +QGraphicsTextItem* QGraphicsTextItem_new2(struct miqt_string text); QGraphicsTextItem* QGraphicsTextItem_new3(QGraphicsItem* parent); -QGraphicsTextItem* QGraphicsTextItem_new4(struct miqt_string* text, QGraphicsItem* parent); +QGraphicsTextItem* QGraphicsTextItem_new4(struct miqt_string text, QGraphicsItem* parent); QMetaObject* QGraphicsTextItem_MetaObject(const QGraphicsTextItem* self); void* QGraphicsTextItem_Metacast(QGraphicsTextItem* self, const char* param1); -struct miqt_string* QGraphicsTextItem_Tr(const char* s); -struct miqt_string* QGraphicsTextItem_TrUtf8(const char* s); -struct miqt_string* QGraphicsTextItem_ToHtml(const QGraphicsTextItem* self); -void QGraphicsTextItem_SetHtml(QGraphicsTextItem* self, struct miqt_string* html); -struct miqt_string* QGraphicsTextItem_ToPlainText(const QGraphicsTextItem* self); -void QGraphicsTextItem_SetPlainText(QGraphicsTextItem* self, struct miqt_string* text); +struct miqt_string QGraphicsTextItem_Tr(const char* s); +struct miqt_string QGraphicsTextItem_TrUtf8(const char* s); +struct miqt_string QGraphicsTextItem_ToHtml(const QGraphicsTextItem* self); +void QGraphicsTextItem_SetHtml(QGraphicsTextItem* self, struct miqt_string html); +struct miqt_string QGraphicsTextItem_ToPlainText(const QGraphicsTextItem* self); +void QGraphicsTextItem_SetPlainText(QGraphicsTextItem* self, struct miqt_string text); QFont* QGraphicsTextItem_Font(const QGraphicsTextItem* self); void QGraphicsTextItem_SetFont(QGraphicsTextItem* self, QFont* font); void QGraphicsTextItem_SetDefaultTextColor(QGraphicsTextItem* self, QColor* c); @@ -472,22 +472,22 @@ void QGraphicsTextItem_SetOpenExternalLinks(QGraphicsTextItem* self, bool open); bool QGraphicsTextItem_OpenExternalLinks(const QGraphicsTextItem* self); void QGraphicsTextItem_SetTextCursor(QGraphicsTextItem* self, QTextCursor* cursor); QTextCursor* QGraphicsTextItem_TextCursor(const QGraphicsTextItem* self); -void QGraphicsTextItem_LinkActivated(QGraphicsTextItem* self, struct miqt_string* param1); +void QGraphicsTextItem_LinkActivated(QGraphicsTextItem* self, struct miqt_string param1); void QGraphicsTextItem_connect_LinkActivated(QGraphicsTextItem* self, intptr_t slot); -void QGraphicsTextItem_LinkHovered(QGraphicsTextItem* self, struct miqt_string* param1); +void QGraphicsTextItem_LinkHovered(QGraphicsTextItem* self, struct miqt_string param1); void QGraphicsTextItem_connect_LinkHovered(QGraphicsTextItem* self, intptr_t slot); -struct miqt_string* QGraphicsTextItem_Tr2(const char* s, const char* c); -struct miqt_string* QGraphicsTextItem_Tr3(const char* s, const char* c, int n); -struct miqt_string* QGraphicsTextItem_TrUtf82(const char* s, const char* c); -struct miqt_string* QGraphicsTextItem_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QGraphicsTextItem_Tr2(const char* s, const char* c); +struct miqt_string QGraphicsTextItem_Tr3(const char* s, const char* c, int n); +struct miqt_string QGraphicsTextItem_TrUtf82(const char* s, const char* c); +struct miqt_string QGraphicsTextItem_TrUtf83(const char* s, const char* c, int n); void QGraphicsTextItem_Delete(QGraphicsTextItem* self); QGraphicsSimpleTextItem* QGraphicsSimpleTextItem_new(); -QGraphicsSimpleTextItem* QGraphicsSimpleTextItem_new2(struct miqt_string* text); +QGraphicsSimpleTextItem* QGraphicsSimpleTextItem_new2(struct miqt_string text); QGraphicsSimpleTextItem* QGraphicsSimpleTextItem_new3(QGraphicsItem* parent); -QGraphicsSimpleTextItem* QGraphicsSimpleTextItem_new4(struct miqt_string* text, QGraphicsItem* parent); -void QGraphicsSimpleTextItem_SetText(QGraphicsSimpleTextItem* self, struct miqt_string* text); -struct miqt_string* QGraphicsSimpleTextItem_Text(const QGraphicsSimpleTextItem* self); +QGraphicsSimpleTextItem* QGraphicsSimpleTextItem_new4(struct miqt_string text, QGraphicsItem* parent); +void QGraphicsSimpleTextItem_SetText(QGraphicsSimpleTextItem* self, struct miqt_string text); +struct miqt_string QGraphicsSimpleTextItem_Text(const QGraphicsSimpleTextItem* self); void QGraphicsSimpleTextItem_SetFont(QGraphicsSimpleTextItem* self, QFont* font); QFont* QGraphicsSimpleTextItem_Font(const QGraphicsSimpleTextItem* self); QRectF* QGraphicsSimpleTextItem_BoundingRect(const QGraphicsSimpleTextItem* self); diff --git a/qt/gen_qgraphicsitemanimation.cpp b/qt/gen_qgraphicsitemanimation.cpp index 11890a81..f7251d6d 100644 --- a/qt/gen_qgraphicsitemanimation.cpp +++ b/qt/gen_qgraphicsitemanimation.cpp @@ -29,18 +29,26 @@ void* QGraphicsItemAnimation_Metacast(QGraphicsItemAnimation* self, const char* return self->qt_metacast(param1); } -struct miqt_string* QGraphicsItemAnimation_Tr(const char* s) { +struct miqt_string QGraphicsItemAnimation_Tr(const char* s) { QString _ret = QGraphicsItemAnimation::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGraphicsItemAnimation_TrUtf8(const char* s) { +struct miqt_string QGraphicsItemAnimation_TrUtf8(const char* s) { QString _ret = QGraphicsItemAnimation::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QGraphicsItem* QGraphicsItemAnimation_Item(const QGraphicsItemAnimation* self) { @@ -138,32 +146,48 @@ void QGraphicsItemAnimation_Reset(QGraphicsItemAnimation* self) { self->reset(); } -struct miqt_string* QGraphicsItemAnimation_Tr2(const char* s, const char* c) { +struct miqt_string QGraphicsItemAnimation_Tr2(const char* s, const char* c) { QString _ret = QGraphicsItemAnimation::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGraphicsItemAnimation_Tr3(const char* s, const char* c, int n) { +struct miqt_string QGraphicsItemAnimation_Tr3(const char* s, const char* c, int n) { QString _ret = QGraphicsItemAnimation::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGraphicsItemAnimation_TrUtf82(const char* s, const char* c) { +struct miqt_string QGraphicsItemAnimation_TrUtf82(const char* s, const char* c) { QString _ret = QGraphicsItemAnimation::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGraphicsItemAnimation_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QGraphicsItemAnimation_TrUtf83(const char* s, const char* c, int n) { QString _ret = QGraphicsItemAnimation::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QGraphicsItemAnimation_Delete(QGraphicsItemAnimation* self) { diff --git a/qt/gen_qgraphicsitemanimation.go b/qt/gen_qgraphicsitemanimation.go index db5fa11f..fbfd1603 100644 --- a/qt/gen_qgraphicsitemanimation.go +++ b/qt/gen_qgraphicsitemanimation.go @@ -62,24 +62,24 @@ func (this *QGraphicsItemAnimation) MetaObject() *QMetaObject { func (this *QGraphicsItemAnimation) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QGraphicsItemAnimation_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QGraphicsItemAnimation_Metacast(this.h, param1_Cstring)) } func QGraphicsItemAnimation_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsItemAnimation_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsItemAnimation_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QGraphicsItemAnimation_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsItemAnimation_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsItemAnimation_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -185,9 +185,9 @@ func QGraphicsItemAnimation_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsItemAnimation_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsItemAnimation_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -196,9 +196,9 @@ func QGraphicsItemAnimation_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsItemAnimation_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsItemAnimation_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -207,9 +207,9 @@ func QGraphicsItemAnimation_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsItemAnimation_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsItemAnimation_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -218,9 +218,9 @@ func QGraphicsItemAnimation_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsItemAnimation_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsItemAnimation_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qgraphicsitemanimation.h b/qt/gen_qgraphicsitemanimation.h index 7eaa8388..da1f9bda 100644 --- a/qt/gen_qgraphicsitemanimation.h +++ b/qt/gen_qgraphicsitemanimation.h @@ -37,8 +37,8 @@ QGraphicsItemAnimation* QGraphicsItemAnimation_new(); QGraphicsItemAnimation* QGraphicsItemAnimation_new2(QObject* parent); QMetaObject* QGraphicsItemAnimation_MetaObject(const QGraphicsItemAnimation* self); void* QGraphicsItemAnimation_Metacast(QGraphicsItemAnimation* self, const char* param1); -struct miqt_string* QGraphicsItemAnimation_Tr(const char* s); -struct miqt_string* QGraphicsItemAnimation_TrUtf8(const char* s); +struct miqt_string QGraphicsItemAnimation_Tr(const char* s); +struct miqt_string QGraphicsItemAnimation_TrUtf8(const char* s); QGraphicsItem* QGraphicsItemAnimation_Item(const QGraphicsItemAnimation* self); void QGraphicsItemAnimation_SetItem(QGraphicsItemAnimation* self, QGraphicsItem* item); QTimeLine* QGraphicsItemAnimation_TimeLine(const QGraphicsItemAnimation* self); @@ -61,10 +61,10 @@ void QGraphicsItemAnimation_SetShearAt(QGraphicsItemAnimation* self, double step void QGraphicsItemAnimation_Clear(QGraphicsItemAnimation* self); void QGraphicsItemAnimation_SetStep(QGraphicsItemAnimation* self, double x); void QGraphicsItemAnimation_Reset(QGraphicsItemAnimation* self); -struct miqt_string* QGraphicsItemAnimation_Tr2(const char* s, const char* c); -struct miqt_string* QGraphicsItemAnimation_Tr3(const char* s, const char* c, int n); -struct miqt_string* QGraphicsItemAnimation_TrUtf82(const char* s, const char* c); -struct miqt_string* QGraphicsItemAnimation_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QGraphicsItemAnimation_Tr2(const char* s, const char* c); +struct miqt_string QGraphicsItemAnimation_Tr3(const char* s, const char* c, int n); +struct miqt_string QGraphicsItemAnimation_TrUtf82(const char* s, const char* c); +struct miqt_string QGraphicsItemAnimation_TrUtf83(const char* s, const char* c, int n); void QGraphicsItemAnimation_Delete(QGraphicsItemAnimation* self); #ifdef __cplusplus diff --git a/qt/gen_qgraphicsproxywidget.cpp b/qt/gen_qgraphicsproxywidget.cpp index ca51f955..04a211e7 100644 --- a/qt/gen_qgraphicsproxywidget.cpp +++ b/qt/gen_qgraphicsproxywidget.cpp @@ -32,18 +32,26 @@ void* QGraphicsProxyWidget_Metacast(QGraphicsProxyWidget* self, const char* para return self->qt_metacast(param1); } -struct miqt_string* QGraphicsProxyWidget_Tr(const char* s) { +struct miqt_string QGraphicsProxyWidget_Tr(const char* s) { QString _ret = QGraphicsProxyWidget::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGraphicsProxyWidget_TrUtf8(const char* s) { +struct miqt_string QGraphicsProxyWidget_TrUtf8(const char* s) { QString _ret = QGraphicsProxyWidget::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QGraphicsProxyWidget_SetWidget(QGraphicsProxyWidget* self, QWidget* widget) { @@ -74,32 +82,48 @@ QGraphicsProxyWidget* QGraphicsProxyWidget_CreateProxyForChildWidget(QGraphicsPr return self->createProxyForChildWidget(child); } -struct miqt_string* QGraphicsProxyWidget_Tr2(const char* s, const char* c) { +struct miqt_string QGraphicsProxyWidget_Tr2(const char* s, const char* c) { QString _ret = QGraphicsProxyWidget::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGraphicsProxyWidget_Tr3(const char* s, const char* c, int n) { +struct miqt_string QGraphicsProxyWidget_Tr3(const char* s, const char* c, int n) { QString _ret = QGraphicsProxyWidget::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGraphicsProxyWidget_TrUtf82(const char* s, const char* c) { +struct miqt_string QGraphicsProxyWidget_TrUtf82(const char* s, const char* c) { QString _ret = QGraphicsProxyWidget::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGraphicsProxyWidget_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QGraphicsProxyWidget_TrUtf83(const char* s, const char* c, int n) { QString _ret = QGraphicsProxyWidget::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QGraphicsProxyWidget_Delete(QGraphicsProxyWidget* self) { diff --git a/qt/gen_qgraphicsproxywidget.go b/qt/gen_qgraphicsproxywidget.go index fe582724..c90f99cb 100644 --- a/qt/gen_qgraphicsproxywidget.go +++ b/qt/gen_qgraphicsproxywidget.go @@ -74,24 +74,24 @@ func (this *QGraphicsProxyWidget) MetaObject() *QMetaObject { func (this *QGraphicsProxyWidget) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QGraphicsProxyWidget_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QGraphicsProxyWidget_Metacast(this.h, param1_Cstring)) } func QGraphicsProxyWidget_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsProxyWidget_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsProxyWidget_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QGraphicsProxyWidget_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsProxyWidget_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsProxyWidget_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -131,9 +131,9 @@ func QGraphicsProxyWidget_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsProxyWidget_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsProxyWidget_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -142,9 +142,9 @@ func QGraphicsProxyWidget_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsProxyWidget_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsProxyWidget_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -153,9 +153,9 @@ func QGraphicsProxyWidget_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsProxyWidget_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsProxyWidget_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -164,9 +164,9 @@ func QGraphicsProxyWidget_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsProxyWidget_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsProxyWidget_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qgraphicsproxywidget.h b/qt/gen_qgraphicsproxywidget.h index 4f9f2979..cf5461ca 100644 --- a/qt/gen_qgraphicsproxywidget.h +++ b/qt/gen_qgraphicsproxywidget.h @@ -36,8 +36,8 @@ QGraphicsProxyWidget* QGraphicsProxyWidget_new2(QGraphicsItem* parent); QGraphicsProxyWidget* QGraphicsProxyWidget_new3(QGraphicsItem* parent, int wFlags); QMetaObject* QGraphicsProxyWidget_MetaObject(const QGraphicsProxyWidget* self); void* QGraphicsProxyWidget_Metacast(QGraphicsProxyWidget* self, const char* param1); -struct miqt_string* QGraphicsProxyWidget_Tr(const char* s); -struct miqt_string* QGraphicsProxyWidget_TrUtf8(const char* s); +struct miqt_string QGraphicsProxyWidget_Tr(const char* s); +struct miqt_string QGraphicsProxyWidget_TrUtf8(const char* s); void QGraphicsProxyWidget_SetWidget(QGraphicsProxyWidget* self, QWidget* widget); QWidget* QGraphicsProxyWidget_Widget(const QGraphicsProxyWidget* self); QRectF* QGraphicsProxyWidget_SubWidgetRect(const QGraphicsProxyWidget* self, QWidget* widget); @@ -45,10 +45,10 @@ void QGraphicsProxyWidget_SetGeometry(QGraphicsProxyWidget* self, QRectF* rect); void QGraphicsProxyWidget_Paint(QGraphicsProxyWidget* self, QPainter* painter, QStyleOptionGraphicsItem* option, QWidget* widget); int QGraphicsProxyWidget_Type(const QGraphicsProxyWidget* self); QGraphicsProxyWidget* QGraphicsProxyWidget_CreateProxyForChildWidget(QGraphicsProxyWidget* self, QWidget* child); -struct miqt_string* QGraphicsProxyWidget_Tr2(const char* s, const char* c); -struct miqt_string* QGraphicsProxyWidget_Tr3(const char* s, const char* c, int n); -struct miqt_string* QGraphicsProxyWidget_TrUtf82(const char* s, const char* c); -struct miqt_string* QGraphicsProxyWidget_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QGraphicsProxyWidget_Tr2(const char* s, const char* c); +struct miqt_string QGraphicsProxyWidget_Tr3(const char* s, const char* c, int n); +struct miqt_string QGraphicsProxyWidget_TrUtf82(const char* s, const char* c); +struct miqt_string QGraphicsProxyWidget_TrUtf83(const char* s, const char* c, int n); void QGraphicsProxyWidget_Delete(QGraphicsProxyWidget* self); #ifdef __cplusplus diff --git a/qt/gen_qgraphicsscene.cpp b/qt/gen_qgraphicsscene.cpp index 7cd32479..7101bc81 100644 --- a/qt/gen_qgraphicsscene.cpp +++ b/qt/gen_qgraphicsscene.cpp @@ -68,18 +68,26 @@ void* QGraphicsScene_Metacast(QGraphicsScene* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QGraphicsScene_Tr(const char* s) { +struct miqt_string QGraphicsScene_Tr(const char* s) { QString _ret = QGraphicsScene::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGraphicsScene_TrUtf8(const char* s) { +struct miqt_string QGraphicsScene_TrUtf8(const char* s) { QString _ret = QGraphicsScene::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QRectF* QGraphicsScene_SceneRect(const QGraphicsScene* self) { @@ -290,13 +298,13 @@ QGraphicsRectItem* QGraphicsScene_AddRect(QGraphicsScene* self, QRectF* rect) { return self->addRect(*rect); } -QGraphicsTextItem* QGraphicsScene_AddText(QGraphicsScene* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QGraphicsTextItem* QGraphicsScene_AddText(QGraphicsScene* self, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); return self->addText(text_QString); } -QGraphicsSimpleTextItem* QGraphicsScene_AddSimpleText(QGraphicsScene* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QGraphicsSimpleTextItem* QGraphicsScene_AddSimpleText(QGraphicsScene* self, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); return self->addSimpleText(text_QString); } @@ -541,32 +549,48 @@ void QGraphicsScene_connect_FocusItemChanged(QGraphicsScene* self, intptr_t slot }); } -struct miqt_string* QGraphicsScene_Tr2(const char* s, const char* c) { +struct miqt_string QGraphicsScene_Tr2(const char* s, const char* c) { QString _ret = QGraphicsScene::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGraphicsScene_Tr3(const char* s, const char* c, int n) { +struct miqt_string QGraphicsScene_Tr3(const char* s, const char* c, int n) { QString _ret = QGraphicsScene::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGraphicsScene_TrUtf82(const char* s, const char* c) { +struct miqt_string QGraphicsScene_TrUtf82(const char* s, const char* c) { QString _ret = QGraphicsScene::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGraphicsScene_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QGraphicsScene_TrUtf83(const char* s, const char* c, int n) { QString _ret = QGraphicsScene::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QGraphicsScene_Render2(QGraphicsScene* self, QPainter* painter, QRectF* target) { @@ -781,13 +805,13 @@ QGraphicsRectItem* QGraphicsScene_AddRect3(QGraphicsScene* self, QRectF* rect, Q return self->addRect(*rect, *pen, *brush); } -QGraphicsTextItem* QGraphicsScene_AddText2(QGraphicsScene* self, struct miqt_string* text, QFont* font) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QGraphicsTextItem* QGraphicsScene_AddText2(QGraphicsScene* self, struct miqt_string text, QFont* font) { + QString text_QString = QString::fromUtf8(text.data, text.len); return self->addText(text_QString, *font); } -QGraphicsSimpleTextItem* QGraphicsScene_AddSimpleText2(QGraphicsScene* self, struct miqt_string* text, QFont* font) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QGraphicsSimpleTextItem* QGraphicsScene_AddSimpleText2(QGraphicsScene* self, struct miqt_string text, QFont* font) { + QString text_QString = QString::fromUtf8(text.data, text.len); return self->addSimpleText(text_QString, *font); } diff --git a/qt/gen_qgraphicsscene.go b/qt/gen_qgraphicsscene.go index 168ccd5d..cd1590fb 100644 --- a/qt/gen_qgraphicsscene.go +++ b/qt/gen_qgraphicsscene.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "runtime/cgo" "unsafe" @@ -104,24 +103,24 @@ func (this *QGraphicsScene) MetaObject() *QMetaObject { func (this *QGraphicsScene) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QGraphicsScene_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QGraphicsScene_Metacast(this.h, param1_Cstring)) } func QGraphicsScene_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsScene_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsScene_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QGraphicsScene_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsScene_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsScene_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -328,15 +327,19 @@ func (this *QGraphicsScene) AddRect(rect *QRectF) *QGraphicsRectItem { } func (this *QGraphicsScene) AddText(text string) *QGraphicsTextItem { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - return UnsafeNewQGraphicsTextItem(unsafe.Pointer(C.QGraphicsScene_AddText(this.h, (*C.struct_miqt_string)(text_ms)))) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + return UnsafeNewQGraphicsTextItem(unsafe.Pointer(C.QGraphicsScene_AddText(this.h, text_ms))) } func (this *QGraphicsScene) AddSimpleText(text string) *QGraphicsSimpleTextItem { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - return UnsafeNewQGraphicsSimpleTextItem(unsafe.Pointer(C.QGraphicsScene_AddSimpleText(this.h, (*C.struct_miqt_string)(text_ms)))) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + return UnsafeNewQGraphicsSimpleTextItem(unsafe.Pointer(C.QGraphicsScene_AddSimpleText(this.h, text_ms))) } func (this *QGraphicsScene) AddWidget(widget *QWidget) *QGraphicsProxyWidget { @@ -631,9 +634,9 @@ func QGraphicsScene_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsScene_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsScene_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -642,9 +645,9 @@ func QGraphicsScene_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsScene_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsScene_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -653,9 +656,9 @@ func QGraphicsScene_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsScene_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsScene_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -664,9 +667,9 @@ func QGraphicsScene_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsScene_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsScene_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -859,15 +862,19 @@ func (this *QGraphicsScene) AddRect3(rect *QRectF, pen *QPen, brush *QBrush) *QG } func (this *QGraphicsScene) AddText2(text string, font *QFont) *QGraphicsTextItem { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - return UnsafeNewQGraphicsTextItem(unsafe.Pointer(C.QGraphicsScene_AddText2(this.h, (*C.struct_miqt_string)(text_ms), font.cPointer()))) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + return UnsafeNewQGraphicsTextItem(unsafe.Pointer(C.QGraphicsScene_AddText2(this.h, text_ms, font.cPointer()))) } func (this *QGraphicsScene) AddSimpleText2(text string, font *QFont) *QGraphicsSimpleTextItem { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - return UnsafeNewQGraphicsSimpleTextItem(unsafe.Pointer(C.QGraphicsScene_AddSimpleText2(this.h, (*C.struct_miqt_string)(text_ms), font.cPointer()))) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + return UnsafeNewQGraphicsSimpleTextItem(unsafe.Pointer(C.QGraphicsScene_AddSimpleText2(this.h, text_ms, font.cPointer()))) } func (this *QGraphicsScene) AddWidget2(widget *QWidget, wFlags WindowType) *QGraphicsProxyWidget { diff --git a/qt/gen_qgraphicsscene.h b/qt/gen_qgraphicsscene.h index 82ce07a4..e582d43d 100644 --- a/qt/gen_qgraphicsscene.h +++ b/qt/gen_qgraphicsscene.h @@ -85,8 +85,8 @@ QGraphicsScene* QGraphicsScene_new5(QRectF* sceneRect, QObject* parent); QGraphicsScene* QGraphicsScene_new6(double x, double y, double width, double height, QObject* parent); QMetaObject* QGraphicsScene_MetaObject(const QGraphicsScene* self); void* QGraphicsScene_Metacast(QGraphicsScene* self, const char* param1); -struct miqt_string* QGraphicsScene_Tr(const char* s); -struct miqt_string* QGraphicsScene_TrUtf8(const char* s); +struct miqt_string QGraphicsScene_Tr(const char* s); +struct miqt_string QGraphicsScene_TrUtf8(const char* s); QRectF* QGraphicsScene_SceneRect(const QGraphicsScene* self); double QGraphicsScene_Width(const QGraphicsScene* self); double QGraphicsScene_Height(const QGraphicsScene* self); @@ -121,8 +121,8 @@ QGraphicsLineItem* QGraphicsScene_AddLine(QGraphicsScene* self, QLineF* line); QGraphicsPathItem* QGraphicsScene_AddPath(QGraphicsScene* self, QPainterPath* path); QGraphicsPixmapItem* QGraphicsScene_AddPixmap(QGraphicsScene* self, QPixmap* pixmap); QGraphicsRectItem* QGraphicsScene_AddRect(QGraphicsScene* self, QRectF* rect); -QGraphicsTextItem* QGraphicsScene_AddText(QGraphicsScene* self, struct miqt_string* text); -QGraphicsSimpleTextItem* QGraphicsScene_AddSimpleText(QGraphicsScene* self, struct miqt_string* text); +QGraphicsTextItem* QGraphicsScene_AddText(QGraphicsScene* self, struct miqt_string text); +QGraphicsSimpleTextItem* QGraphicsScene_AddSimpleText(QGraphicsScene* self, struct miqt_string text); QGraphicsProxyWidget* QGraphicsScene_AddWidget(QGraphicsScene* self, QWidget* widget); QGraphicsEllipseItem* QGraphicsScene_AddEllipse2(QGraphicsScene* self, double x, double y, double w, double h); QGraphicsLineItem* QGraphicsScene_AddLine2(QGraphicsScene* self, double x1, double y1, double x2, double y2); @@ -173,10 +173,10 @@ void QGraphicsScene_SelectionChanged(QGraphicsScene* self); void QGraphicsScene_connect_SelectionChanged(QGraphicsScene* self, intptr_t slot); void QGraphicsScene_FocusItemChanged(QGraphicsScene* self, QGraphicsItem* newFocus, QGraphicsItem* oldFocus, int reason); void QGraphicsScene_connect_FocusItemChanged(QGraphicsScene* self, intptr_t slot); -struct miqt_string* QGraphicsScene_Tr2(const char* s, const char* c); -struct miqt_string* QGraphicsScene_Tr3(const char* s, const char* c, int n); -struct miqt_string* QGraphicsScene_TrUtf82(const char* s, const char* c); -struct miqt_string* QGraphicsScene_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QGraphicsScene_Tr2(const char* s, const char* c); +struct miqt_string QGraphicsScene_Tr3(const char* s, const char* c, int n); +struct miqt_string QGraphicsScene_TrUtf82(const char* s, const char* c); +struct miqt_string QGraphicsScene_TrUtf83(const char* s, const char* c, int n); void QGraphicsScene_Render2(QGraphicsScene* self, QPainter* painter, QRectF* target); void QGraphicsScene_Render3(QGraphicsScene* self, QPainter* painter, QRectF* target, QRectF* source); void QGraphicsScene_Render4(QGraphicsScene* self, QPainter* painter, QRectF* target, QRectF* source, int aspectRatioMode); @@ -203,8 +203,8 @@ QGraphicsPathItem* QGraphicsScene_AddPath2(QGraphicsScene* self, QPainterPath* p QGraphicsPathItem* QGraphicsScene_AddPath3(QGraphicsScene* self, QPainterPath* path, QPen* pen, QBrush* brush); QGraphicsRectItem* QGraphicsScene_AddRect22(QGraphicsScene* self, QRectF* rect, QPen* pen); QGraphicsRectItem* QGraphicsScene_AddRect3(QGraphicsScene* self, QRectF* rect, QPen* pen, QBrush* brush); -QGraphicsTextItem* QGraphicsScene_AddText2(QGraphicsScene* self, struct miqt_string* text, QFont* font); -QGraphicsSimpleTextItem* QGraphicsScene_AddSimpleText2(QGraphicsScene* self, struct miqt_string* text, QFont* font); +QGraphicsTextItem* QGraphicsScene_AddText2(QGraphicsScene* self, struct miqt_string text, QFont* font); +QGraphicsSimpleTextItem* QGraphicsScene_AddSimpleText2(QGraphicsScene* self, struct miqt_string text, QFont* font); QGraphicsProxyWidget* QGraphicsScene_AddWidget2(QGraphicsScene* self, QWidget* widget, int wFlags); QGraphicsEllipseItem* QGraphicsScene_AddEllipse5(QGraphicsScene* self, double x, double y, double w, double h, QPen* pen); QGraphicsEllipseItem* QGraphicsScene_AddEllipse6(QGraphicsScene* self, double x, double y, double w, double h, QPen* pen, QBrush* brush); diff --git a/qt/gen_qgraphicstransform.cpp b/qt/gen_qgraphicstransform.cpp index c1fe5f1a..83ced57d 100644 --- a/qt/gen_qgraphicstransform.cpp +++ b/qt/gen_qgraphicstransform.cpp @@ -20,50 +20,74 @@ void* QGraphicsTransform_Metacast(QGraphicsTransform* self, const char* param1) return self->qt_metacast(param1); } -struct miqt_string* QGraphicsTransform_Tr(const char* s) { +struct miqt_string QGraphicsTransform_Tr(const char* s) { QString _ret = QGraphicsTransform::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGraphicsTransform_TrUtf8(const char* s) { +struct miqt_string QGraphicsTransform_TrUtf8(const char* s) { QString _ret = QGraphicsTransform::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QGraphicsTransform_ApplyTo(const QGraphicsTransform* self, QMatrix4x4* matrix) { self->applyTo(matrix); } -struct miqt_string* QGraphicsTransform_Tr2(const char* s, const char* c) { +struct miqt_string QGraphicsTransform_Tr2(const char* s, const char* c) { QString _ret = QGraphicsTransform::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGraphicsTransform_Tr3(const char* s, const char* c, int n) { +struct miqt_string QGraphicsTransform_Tr3(const char* s, const char* c, int n) { QString _ret = QGraphicsTransform::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGraphicsTransform_TrUtf82(const char* s, const char* c) { +struct miqt_string QGraphicsTransform_TrUtf82(const char* s, const char* c) { QString _ret = QGraphicsTransform::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGraphicsTransform_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QGraphicsTransform_TrUtf83(const char* s, const char* c, int n) { QString _ret = QGraphicsTransform::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QGraphicsTransform_Delete(QGraphicsTransform* self) { @@ -86,18 +110,26 @@ void* QGraphicsScale_Metacast(QGraphicsScale* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QGraphicsScale_Tr(const char* s) { +struct miqt_string QGraphicsScale_Tr(const char* s) { QString _ret = QGraphicsScale::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGraphicsScale_TrUtf8(const char* s) { +struct miqt_string QGraphicsScale_TrUtf8(const char* s) { QString _ret = QGraphicsScale::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QVector3D* QGraphicsScale_Origin(const QGraphicsScale* self) { @@ -189,32 +221,48 @@ void QGraphicsScale_connect_ScaleChanged(QGraphicsScale* self, intptr_t slot) { }); } -struct miqt_string* QGraphicsScale_Tr2(const char* s, const char* c) { +struct miqt_string QGraphicsScale_Tr2(const char* s, const char* c) { QString _ret = QGraphicsScale::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGraphicsScale_Tr3(const char* s, const char* c, int n) { +struct miqt_string QGraphicsScale_Tr3(const char* s, const char* c, int n) { QString _ret = QGraphicsScale::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGraphicsScale_TrUtf82(const char* s, const char* c) { +struct miqt_string QGraphicsScale_TrUtf82(const char* s, const char* c) { QString _ret = QGraphicsScale::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGraphicsScale_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QGraphicsScale_TrUtf83(const char* s, const char* c, int n) { QString _ret = QGraphicsScale::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QGraphicsScale_Delete(QGraphicsScale* self) { @@ -237,18 +285,26 @@ void* QGraphicsRotation_Metacast(QGraphicsRotation* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QGraphicsRotation_Tr(const char* s) { +struct miqt_string QGraphicsRotation_Tr(const char* s) { QString _ret = QGraphicsRotation::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGraphicsRotation_TrUtf8(const char* s) { +struct miqt_string QGraphicsRotation_TrUtf8(const char* s) { QString _ret = QGraphicsRotation::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QVector3D* QGraphicsRotation_Origin(const QGraphicsRotation* self) { @@ -314,32 +370,48 @@ void QGraphicsRotation_connect_AxisChanged(QGraphicsRotation* self, intptr_t slo }); } -struct miqt_string* QGraphicsRotation_Tr2(const char* s, const char* c) { +struct miqt_string QGraphicsRotation_Tr2(const char* s, const char* c) { QString _ret = QGraphicsRotation::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGraphicsRotation_Tr3(const char* s, const char* c, int n) { +struct miqt_string QGraphicsRotation_Tr3(const char* s, const char* c, int n) { QString _ret = QGraphicsRotation::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGraphicsRotation_TrUtf82(const char* s, const char* c) { +struct miqt_string QGraphicsRotation_TrUtf82(const char* s, const char* c) { QString _ret = QGraphicsRotation::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGraphicsRotation_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QGraphicsRotation_TrUtf83(const char* s, const char* c, int n) { QString _ret = QGraphicsRotation::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QGraphicsRotation_Delete(QGraphicsRotation* self) { diff --git a/qt/gen_qgraphicstransform.go b/qt/gen_qgraphicstransform.go index c6a61cfa..0f8185cb 100644 --- a/qt/gen_qgraphicstransform.go +++ b/qt/gen_qgraphicstransform.go @@ -51,24 +51,24 @@ func (this *QGraphicsTransform) MetaObject() *QMetaObject { func (this *QGraphicsTransform) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QGraphicsTransform_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QGraphicsTransform_Metacast(this.h, param1_Cstring)) } func QGraphicsTransform_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsTransform_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsTransform_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QGraphicsTransform_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsTransform_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsTransform_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -81,9 +81,9 @@ func QGraphicsTransform_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsTransform_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsTransform_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -92,9 +92,9 @@ func QGraphicsTransform_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsTransform_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsTransform_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -103,9 +103,9 @@ func QGraphicsTransform_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsTransform_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsTransform_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -114,9 +114,9 @@ func QGraphicsTransform_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsTransform_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsTransform_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -183,24 +183,24 @@ func (this *QGraphicsScale) MetaObject() *QMetaObject { func (this *QGraphicsScale) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QGraphicsScale_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QGraphicsScale_Metacast(this.h, param1_Cstring)) } func QGraphicsScale_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsScale_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsScale_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QGraphicsScale_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsScale_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsScale_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -333,9 +333,9 @@ func QGraphicsScale_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsScale_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsScale_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -344,9 +344,9 @@ func QGraphicsScale_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsScale_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsScale_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -355,9 +355,9 @@ func QGraphicsScale_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsScale_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsScale_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -366,9 +366,9 @@ func QGraphicsScale_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsScale_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsScale_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -435,24 +435,24 @@ func (this *QGraphicsRotation) MetaObject() *QMetaObject { func (this *QGraphicsRotation) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QGraphicsRotation_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QGraphicsRotation_Metacast(this.h, param1_Cstring)) } func QGraphicsRotation_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsRotation_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsRotation_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QGraphicsRotation_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsRotation_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsRotation_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -550,9 +550,9 @@ func QGraphicsRotation_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsRotation_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsRotation_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -561,9 +561,9 @@ func QGraphicsRotation_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsRotation_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsRotation_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -572,9 +572,9 @@ func QGraphicsRotation_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsRotation_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsRotation_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -583,9 +583,9 @@ func QGraphicsRotation_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsRotation_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsRotation_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qgraphicstransform.h b/qt/gen_qgraphicstransform.h index 1fa9be14..a299d299 100644 --- a/qt/gen_qgraphicstransform.h +++ b/qt/gen_qgraphicstransform.h @@ -33,21 +33,21 @@ typedef struct QVector3D QVector3D; QMetaObject* QGraphicsTransform_MetaObject(const QGraphicsTransform* self); void* QGraphicsTransform_Metacast(QGraphicsTransform* self, const char* param1); -struct miqt_string* QGraphicsTransform_Tr(const char* s); -struct miqt_string* QGraphicsTransform_TrUtf8(const char* s); +struct miqt_string QGraphicsTransform_Tr(const char* s); +struct miqt_string QGraphicsTransform_TrUtf8(const char* s); void QGraphicsTransform_ApplyTo(const QGraphicsTransform* self, QMatrix4x4* matrix); -struct miqt_string* QGraphicsTransform_Tr2(const char* s, const char* c); -struct miqt_string* QGraphicsTransform_Tr3(const char* s, const char* c, int n); -struct miqt_string* QGraphicsTransform_TrUtf82(const char* s, const char* c); -struct miqt_string* QGraphicsTransform_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QGraphicsTransform_Tr2(const char* s, const char* c); +struct miqt_string QGraphicsTransform_Tr3(const char* s, const char* c, int n); +struct miqt_string QGraphicsTransform_TrUtf82(const char* s, const char* c); +struct miqt_string QGraphicsTransform_TrUtf83(const char* s, const char* c, int n); void QGraphicsTransform_Delete(QGraphicsTransform* self); QGraphicsScale* QGraphicsScale_new(); QGraphicsScale* QGraphicsScale_new2(QObject* parent); QMetaObject* QGraphicsScale_MetaObject(const QGraphicsScale* self); void* QGraphicsScale_Metacast(QGraphicsScale* self, const char* param1); -struct miqt_string* QGraphicsScale_Tr(const char* s); -struct miqt_string* QGraphicsScale_TrUtf8(const char* s); +struct miqt_string QGraphicsScale_Tr(const char* s); +struct miqt_string QGraphicsScale_TrUtf8(const char* s); QVector3D* QGraphicsScale_Origin(const QGraphicsScale* self); void QGraphicsScale_SetOrigin(QGraphicsScale* self, QVector3D* point); double QGraphicsScale_XScale(const QGraphicsScale* self); @@ -67,18 +67,18 @@ void QGraphicsScale_ZScaleChanged(QGraphicsScale* self); void QGraphicsScale_connect_ZScaleChanged(QGraphicsScale* self, intptr_t slot); void QGraphicsScale_ScaleChanged(QGraphicsScale* self); void QGraphicsScale_connect_ScaleChanged(QGraphicsScale* self, intptr_t slot); -struct miqt_string* QGraphicsScale_Tr2(const char* s, const char* c); -struct miqt_string* QGraphicsScale_Tr3(const char* s, const char* c, int n); -struct miqt_string* QGraphicsScale_TrUtf82(const char* s, const char* c); -struct miqt_string* QGraphicsScale_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QGraphicsScale_Tr2(const char* s, const char* c); +struct miqt_string QGraphicsScale_Tr3(const char* s, const char* c, int n); +struct miqt_string QGraphicsScale_TrUtf82(const char* s, const char* c); +struct miqt_string QGraphicsScale_TrUtf83(const char* s, const char* c, int n); void QGraphicsScale_Delete(QGraphicsScale* self); QGraphicsRotation* QGraphicsRotation_new(); QGraphicsRotation* QGraphicsRotation_new2(QObject* parent); QMetaObject* QGraphicsRotation_MetaObject(const QGraphicsRotation* self); void* QGraphicsRotation_Metacast(QGraphicsRotation* self, const char* param1); -struct miqt_string* QGraphicsRotation_Tr(const char* s); -struct miqt_string* QGraphicsRotation_TrUtf8(const char* s); +struct miqt_string QGraphicsRotation_Tr(const char* s); +struct miqt_string QGraphicsRotation_TrUtf8(const char* s); QVector3D* QGraphicsRotation_Origin(const QGraphicsRotation* self); void QGraphicsRotation_SetOrigin(QGraphicsRotation* self, QVector3D* point); double QGraphicsRotation_Angle(const QGraphicsRotation* self); @@ -93,10 +93,10 @@ void QGraphicsRotation_AngleChanged(QGraphicsRotation* self); void QGraphicsRotation_connect_AngleChanged(QGraphicsRotation* self, intptr_t slot); void QGraphicsRotation_AxisChanged(QGraphicsRotation* self); void QGraphicsRotation_connect_AxisChanged(QGraphicsRotation* self, intptr_t slot); -struct miqt_string* QGraphicsRotation_Tr2(const char* s, const char* c); -struct miqt_string* QGraphicsRotation_Tr3(const char* s, const char* c, int n); -struct miqt_string* QGraphicsRotation_TrUtf82(const char* s, const char* c); -struct miqt_string* QGraphicsRotation_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QGraphicsRotation_Tr2(const char* s, const char* c); +struct miqt_string QGraphicsRotation_Tr3(const char* s, const char* c, int n); +struct miqt_string QGraphicsRotation_TrUtf82(const char* s, const char* c); +struct miqt_string QGraphicsRotation_TrUtf83(const char* s, const char* c, int n); void QGraphicsRotation_Delete(QGraphicsRotation* self); #ifdef __cplusplus diff --git a/qt/gen_qgraphicsview.cpp b/qt/gen_qgraphicsview.cpp index 1f417151..9f2957c5 100644 --- a/qt/gen_qgraphicsview.cpp +++ b/qt/gen_qgraphicsview.cpp @@ -46,18 +46,26 @@ void* QGraphicsView_Metacast(QGraphicsView* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QGraphicsView_Tr(const char* s) { +struct miqt_string QGraphicsView_Tr(const char* s) { QString _ret = QGraphicsView::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGraphicsView_TrUtf8(const char* s) { +struct miqt_string QGraphicsView_TrUtf8(const char* s) { QString _ret = QGraphicsView::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QSize* QGraphicsView_SizeHint(const QGraphicsView* self) { @@ -438,32 +446,48 @@ void QGraphicsView_connect_RubberBandChanged(QGraphicsView* self, intptr_t slot) }); } -struct miqt_string* QGraphicsView_Tr2(const char* s, const char* c) { +struct miqt_string QGraphicsView_Tr2(const char* s, const char* c) { QString _ret = QGraphicsView::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGraphicsView_Tr3(const char* s, const char* c, int n) { +struct miqt_string QGraphicsView_Tr3(const char* s, const char* c, int n) { QString _ret = QGraphicsView::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGraphicsView_TrUtf82(const char* s, const char* c) { +struct miqt_string QGraphicsView_TrUtf82(const char* s, const char* c) { QString _ret = QGraphicsView::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGraphicsView_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QGraphicsView_TrUtf83(const char* s, const char* c, int n) { QString _ret = QGraphicsView::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QGraphicsView_SetRenderHint2(QGraphicsView* self, int hint, bool enabled) { diff --git a/qt/gen_qgraphicsview.go b/qt/gen_qgraphicsview.go index cb5a5d37..50865048 100644 --- a/qt/gen_qgraphicsview.go +++ b/qt/gen_qgraphicsview.go @@ -117,24 +117,24 @@ func (this *QGraphicsView) MetaObject() *QMetaObject { func (this *QGraphicsView) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QGraphicsView_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QGraphicsView_Metacast(this.h, param1_Cstring)) } func QGraphicsView_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsView_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsView_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QGraphicsView_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsView_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsView_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -567,9 +567,9 @@ func QGraphicsView_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsView_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsView_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -578,9 +578,9 @@ func QGraphicsView_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsView_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsView_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -589,9 +589,9 @@ func QGraphicsView_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsView_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsView_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -600,9 +600,9 @@ func QGraphicsView_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsView_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsView_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qgraphicsview.h b/qt/gen_qgraphicsview.h index 5158fb49..5e20e248 100644 --- a/qt/gen_qgraphicsview.h +++ b/qt/gen_qgraphicsview.h @@ -55,8 +55,8 @@ QGraphicsView* QGraphicsView_new3(QWidget* parent); QGraphicsView* QGraphicsView_new4(QGraphicsScene* scene, QWidget* parent); QMetaObject* QGraphicsView_MetaObject(const QGraphicsView* self); void* QGraphicsView_Metacast(QGraphicsView* self, const char* param1); -struct miqt_string* QGraphicsView_Tr(const char* s); -struct miqt_string* QGraphicsView_TrUtf8(const char* s); +struct miqt_string QGraphicsView_Tr(const char* s); +struct miqt_string QGraphicsView_TrUtf8(const char* s); QSize* QGraphicsView_SizeHint(const QGraphicsView* self); int QGraphicsView_RenderHints(const QGraphicsView* self); void QGraphicsView_SetRenderHint(QGraphicsView* self, int hint); @@ -133,10 +133,10 @@ void QGraphicsView_InvalidateScene(QGraphicsView* self); void QGraphicsView_UpdateSceneRect(QGraphicsView* self, QRectF* rect); void QGraphicsView_RubberBandChanged(QGraphicsView* self, QRect* viewportRect, QPointF* fromScenePoint, QPointF* toScenePoint); void QGraphicsView_connect_RubberBandChanged(QGraphicsView* self, intptr_t slot); -struct miqt_string* QGraphicsView_Tr2(const char* s, const char* c); -struct miqt_string* QGraphicsView_Tr3(const char* s, const char* c, int n); -struct miqt_string* QGraphicsView_TrUtf82(const char* s, const char* c); -struct miqt_string* QGraphicsView_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QGraphicsView_Tr2(const char* s, const char* c); +struct miqt_string QGraphicsView_Tr3(const char* s, const char* c, int n); +struct miqt_string QGraphicsView_TrUtf82(const char* s, const char* c); +struct miqt_string QGraphicsView_TrUtf83(const char* s, const char* c, int n); void QGraphicsView_SetRenderHint2(QGraphicsView* self, int hint, bool enabled); void QGraphicsView_SetOptimizationFlag2(QGraphicsView* self, int flag, bool enabled); void QGraphicsView_SetMatrix2(QGraphicsView* self, QMatrix* matrix, bool combine); diff --git a/qt/gen_qgraphicswidget.cpp b/qt/gen_qgraphicswidget.cpp index 432a165b..00d37db2 100644 --- a/qt/gen_qgraphicswidget.cpp +++ b/qt/gen_qgraphicswidget.cpp @@ -42,18 +42,26 @@ void* QGraphicsWidget_Metacast(QGraphicsWidget* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QGraphicsWidget_Tr(const char* s) { +struct miqt_string QGraphicsWidget_Tr(const char* s) { QString _ret = QGraphicsWidget::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGraphicsWidget_TrUtf8(const char* s) { +struct miqt_string QGraphicsWidget_TrUtf8(const char* s) { QString _ret = QGraphicsWidget::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QGraphicsLayout* QGraphicsWidget_Layout(const QGraphicsWidget* self) { @@ -191,16 +199,20 @@ bool QGraphicsWidget_IsActiveWindow(const QGraphicsWidget* self) { return self->isActiveWindow(); } -void QGraphicsWidget_SetWindowTitle(QGraphicsWidget* self, struct miqt_string* title) { - QString title_QString = QString::fromUtf8(&title->data, title->len); +void QGraphicsWidget_SetWindowTitle(QGraphicsWidget* self, struct miqt_string title) { + QString title_QString = QString::fromUtf8(title.data, title.len); self->setWindowTitle(title_QString); } -struct miqt_string* QGraphicsWidget_WindowTitle(const QGraphicsWidget* self) { +struct miqt_string QGraphicsWidget_WindowTitle(const QGraphicsWidget* self) { QString _ret = self->windowTitle(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QGraphicsWidget_FocusPolicy(const QGraphicsWidget* self) { @@ -333,32 +345,48 @@ bool QGraphicsWidget_Close(QGraphicsWidget* self) { return self->close(); } -struct miqt_string* QGraphicsWidget_Tr2(const char* s, const char* c) { +struct miqt_string QGraphicsWidget_Tr2(const char* s, const char* c) { QString _ret = QGraphicsWidget::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGraphicsWidget_Tr3(const char* s, const char* c, int n) { +struct miqt_string QGraphicsWidget_Tr3(const char* s, const char* c, int n) { QString _ret = QGraphicsWidget::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGraphicsWidget_TrUtf82(const char* s, const char* c) { +struct miqt_string QGraphicsWidget_TrUtf82(const char* s, const char* c) { QString _ret = QGraphicsWidget::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGraphicsWidget_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QGraphicsWidget_TrUtf83(const char* s, const char* c, int n) { QString _ret = QGraphicsWidget::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QGraphicsWidget_GrabShortcut2(QGraphicsWidget* self, QKeySequence* sequence, int context) { diff --git a/qt/gen_qgraphicswidget.go b/qt/gen_qgraphicswidget.go index 41662dca..fc5cf9de 100644 --- a/qt/gen_qgraphicswidget.go +++ b/qt/gen_qgraphicswidget.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "runtime/cgo" "unsafe" @@ -77,24 +76,24 @@ func (this *QGraphicsWidget) MetaObject() *QMetaObject { func (this *QGraphicsWidget) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QGraphicsWidget_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QGraphicsWidget_Metacast(this.h, param1_Cstring)) } func QGraphicsWidget_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsWidget_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsWidget_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QGraphicsWidget_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsWidget_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsWidget_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -249,15 +248,17 @@ func (this *QGraphicsWidget) IsActiveWindow() bool { } func (this *QGraphicsWidget) SetWindowTitle(title string) { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - C.QGraphicsWidget_SetWindowTitle(this.h, (*C.struct_miqt_string)(title_ms)) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + C.QGraphicsWidget_SetWindowTitle(this.h, title_ms) } func (this *QGraphicsWidget) WindowTitle() string { - var _ms *C.struct_miqt_string = C.QGraphicsWidget_WindowTitle(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsWidget_WindowTitle(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -417,9 +418,9 @@ func QGraphicsWidget_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsWidget_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsWidget_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -428,9 +429,9 @@ func QGraphicsWidget_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsWidget_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsWidget_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -439,9 +440,9 @@ func QGraphicsWidget_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsWidget_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsWidget_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -450,9 +451,9 @@ func QGraphicsWidget_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsWidget_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGraphicsWidget_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qgraphicswidget.h b/qt/gen_qgraphicswidget.h index f4337d58..1a461aec 100644 --- a/qt/gen_qgraphicswidget.h +++ b/qt/gen_qgraphicswidget.h @@ -54,8 +54,8 @@ QGraphicsWidget* QGraphicsWidget_new2(QGraphicsItem* parent); QGraphicsWidget* QGraphicsWidget_new3(QGraphicsItem* parent, int wFlags); QMetaObject* QGraphicsWidget_MetaObject(const QGraphicsWidget* self); void* QGraphicsWidget_Metacast(QGraphicsWidget* self, const char* param1); -struct miqt_string* QGraphicsWidget_Tr(const char* s); -struct miqt_string* QGraphicsWidget_TrUtf8(const char* s); +struct miqt_string QGraphicsWidget_Tr(const char* s); +struct miqt_string QGraphicsWidget_TrUtf8(const char* s); QGraphicsLayout* QGraphicsWidget_Layout(const QGraphicsWidget* self); void QGraphicsWidget_SetLayout(QGraphicsWidget* self, QGraphicsLayout* layout); void QGraphicsWidget_AdjustSize(QGraphicsWidget* self); @@ -89,8 +89,8 @@ int QGraphicsWidget_WindowFlags(const QGraphicsWidget* self); int QGraphicsWidget_WindowType(const QGraphicsWidget* self); void QGraphicsWidget_SetWindowFlags(QGraphicsWidget* self, int wFlags); bool QGraphicsWidget_IsActiveWindow(const QGraphicsWidget* self); -void QGraphicsWidget_SetWindowTitle(QGraphicsWidget* self, struct miqt_string* title); -struct miqt_string* QGraphicsWidget_WindowTitle(const QGraphicsWidget* self); +void QGraphicsWidget_SetWindowTitle(QGraphicsWidget* self, struct miqt_string title); +struct miqt_string QGraphicsWidget_WindowTitle(const QGraphicsWidget* self); int QGraphicsWidget_FocusPolicy(const QGraphicsWidget* self); void QGraphicsWidget_SetFocusPolicy(QGraphicsWidget* self, int policy); void QGraphicsWidget_SetTabOrder(QGraphicsWidget* first, QGraphicsWidget* second); @@ -117,10 +117,10 @@ void QGraphicsWidget_connect_GeometryChanged(QGraphicsWidget* self, intptr_t slo void QGraphicsWidget_LayoutChanged(QGraphicsWidget* self); void QGraphicsWidget_connect_LayoutChanged(QGraphicsWidget* self, intptr_t slot); bool QGraphicsWidget_Close(QGraphicsWidget* self); -struct miqt_string* QGraphicsWidget_Tr2(const char* s, const char* c); -struct miqt_string* QGraphicsWidget_Tr3(const char* s, const char* c, int n); -struct miqt_string* QGraphicsWidget_TrUtf82(const char* s, const char* c); -struct miqt_string* QGraphicsWidget_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QGraphicsWidget_Tr2(const char* s, const char* c); +struct miqt_string QGraphicsWidget_Tr3(const char* s, const char* c, int n); +struct miqt_string QGraphicsWidget_TrUtf82(const char* s, const char* c); +struct miqt_string QGraphicsWidget_TrUtf83(const char* s, const char* c, int n); int QGraphicsWidget_GrabShortcut2(QGraphicsWidget* self, QKeySequence* sequence, int context); void QGraphicsWidget_SetShortcutEnabled2(QGraphicsWidget* self, int id, bool enabled); void QGraphicsWidget_SetShortcutAutoRepeat2(QGraphicsWidget* self, int id, bool enabled); diff --git a/qt/gen_qgridlayout.cpp b/qt/gen_qgridlayout.cpp index 2054d241..b7ef1618 100644 --- a/qt/gen_qgridlayout.cpp +++ b/qt/gen_qgridlayout.cpp @@ -28,18 +28,26 @@ void* QGridLayout_Metacast(QGridLayout* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QGridLayout_Tr(const char* s) { +struct miqt_string QGridLayout_Tr(const char* s) { QString _ret = QGridLayout::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGridLayout_TrUtf8(const char* s) { +struct miqt_string QGridLayout_TrUtf8(const char* s) { QString _ret = QGridLayout::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QSize* QGridLayout_SizeHint(const QGridLayout* self) { @@ -204,32 +212,48 @@ void QGridLayout_GetItemPosition(const QGridLayout* self, int idx, int* row, int self->getItemPosition(static_cast(idx), static_cast(row), static_cast(column), static_cast(rowSpan), static_cast(columnSpan)); } -struct miqt_string* QGridLayout_Tr2(const char* s, const char* c) { +struct miqt_string QGridLayout_Tr2(const char* s, const char* c) { QString _ret = QGridLayout::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGridLayout_Tr3(const char* s, const char* c, int n) { +struct miqt_string QGridLayout_Tr3(const char* s, const char* c, int n) { QString _ret = QGridLayout::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGridLayout_TrUtf82(const char* s, const char* c) { +struct miqt_string QGridLayout_TrUtf82(const char* s, const char* c) { QString _ret = QGridLayout::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGridLayout_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QGridLayout_TrUtf83(const char* s, const char* c, int n) { QString _ret = QGridLayout::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QGridLayout_AddWidget4(QGridLayout* self, QWidget* param1, int row, int column, int param4) { diff --git a/qt/gen_qgridlayout.go b/qt/gen_qgridlayout.go index aa1649c4..5beefdb5 100644 --- a/qt/gen_qgridlayout.go +++ b/qt/gen_qgridlayout.go @@ -62,24 +62,24 @@ func (this *QGridLayout) MetaObject() *QMetaObject { func (this *QGridLayout) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QGridLayout_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QGridLayout_Metacast(this.h, param1_Cstring)) } func QGridLayout_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QGridLayout_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGridLayout_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QGridLayout_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QGridLayout_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGridLayout_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -260,9 +260,9 @@ func QGridLayout_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGridLayout_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGridLayout_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -271,9 +271,9 @@ func QGridLayout_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGridLayout_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGridLayout_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -282,9 +282,9 @@ func QGridLayout_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGridLayout_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGridLayout_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -293,9 +293,9 @@ func QGridLayout_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGridLayout_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGridLayout_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qgridlayout.h b/qt/gen_qgridlayout.h index 5160112e..30f19a99 100644 --- a/qt/gen_qgridlayout.h +++ b/qt/gen_qgridlayout.h @@ -35,8 +35,8 @@ QGridLayout* QGridLayout_new(QWidget* parent); QGridLayout* QGridLayout_new2(); QMetaObject* QGridLayout_MetaObject(const QGridLayout* self); void* QGridLayout_Metacast(QGridLayout* self, const char* param1); -struct miqt_string* QGridLayout_Tr(const char* s); -struct miqt_string* QGridLayout_TrUtf8(const char* s); +struct miqt_string QGridLayout_Tr(const char* s); +struct miqt_string QGridLayout_TrUtf8(const char* s); QSize* QGridLayout_SizeHint(const QGridLayout* self); QSize* QGridLayout_MinimumSize(const QGridLayout* self); QSize* QGridLayout_MaximumSize(const QGridLayout* self); @@ -77,10 +77,10 @@ void QGridLayout_SetGeometry(QGridLayout* self, QRect* geometry); void QGridLayout_AddItem(QGridLayout* self, QLayoutItem* item, int row, int column); void QGridLayout_SetDefaultPositioning(QGridLayout* self, int n, int orient); void QGridLayout_GetItemPosition(const QGridLayout* self, int idx, int* row, int* column, int* rowSpan, int* columnSpan); -struct miqt_string* QGridLayout_Tr2(const char* s, const char* c); -struct miqt_string* QGridLayout_Tr3(const char* s, const char* c, int n); -struct miqt_string* QGridLayout_TrUtf82(const char* s, const char* c); -struct miqt_string* QGridLayout_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QGridLayout_Tr2(const char* s, const char* c); +struct miqt_string QGridLayout_Tr3(const char* s, const char* c, int n); +struct miqt_string QGridLayout_TrUtf82(const char* s, const char* c); +struct miqt_string QGridLayout_TrUtf83(const char* s, const char* c, int n); void QGridLayout_AddWidget4(QGridLayout* self, QWidget* param1, int row, int column, int param4); void QGridLayout_AddWidget6(QGridLayout* self, QWidget* param1, int row, int column, int rowSpan, int columnSpan, int param6); void QGridLayout_AddLayout4(QGridLayout* self, QLayout* param1, int row, int column, int param4); diff --git a/qt/gen_qgroupbox.cpp b/qt/gen_qgroupbox.cpp index 70c84bec..d845d940 100644 --- a/qt/gen_qgroupbox.cpp +++ b/qt/gen_qgroupbox.cpp @@ -13,8 +13,8 @@ QGroupBox* QGroupBox_new() { return new QGroupBox(); } -QGroupBox* QGroupBox_new2(struct miqt_string* title) { - QString title_QString = QString::fromUtf8(&title->data, title->len); +QGroupBox* QGroupBox_new2(struct miqt_string title) { + QString title_QString = QString::fromUtf8(title.data, title.len); return new QGroupBox(title_QString); } @@ -22,8 +22,8 @@ QGroupBox* QGroupBox_new3(QWidget* parent) { return new QGroupBox(parent); } -QGroupBox* QGroupBox_new4(struct miqt_string* title, QWidget* parent) { - QString title_QString = QString::fromUtf8(&title->data, title->len); +QGroupBox* QGroupBox_new4(struct miqt_string title, QWidget* parent) { + QString title_QString = QString::fromUtf8(title.data, title.len); return new QGroupBox(title_QString, parent); } @@ -35,29 +35,41 @@ void* QGroupBox_Metacast(QGroupBox* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QGroupBox_Tr(const char* s) { +struct miqt_string QGroupBox_Tr(const char* s) { QString _ret = QGroupBox::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGroupBox_TrUtf8(const char* s) { +struct miqt_string QGroupBox_TrUtf8(const char* s) { QString _ret = QGroupBox::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGroupBox_Title(const QGroupBox* self) { +struct miqt_string QGroupBox_Title(const QGroupBox* self) { QString _ret = self->title(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QGroupBox_SetTitle(QGroupBox* self, struct miqt_string* title) { - QString title_QString = QString::fromUtf8(&title->data, title->len); +void QGroupBox_SetTitle(QGroupBox* self, struct miqt_string title) { + QString title_QString = QString::fromUtf8(title.data, title.len); self->setTitle(title_QString); } @@ -119,32 +131,48 @@ void QGroupBox_connect_Toggled(QGroupBox* self, intptr_t slot) { }); } -struct miqt_string* QGroupBox_Tr2(const char* s, const char* c) { +struct miqt_string QGroupBox_Tr2(const char* s, const char* c) { QString _ret = QGroupBox::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGroupBox_Tr3(const char* s, const char* c, int n) { +struct miqt_string QGroupBox_Tr3(const char* s, const char* c, int n) { QString _ret = QGroupBox::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGroupBox_TrUtf82(const char* s, const char* c) { +struct miqt_string QGroupBox_TrUtf82(const char* s, const char* c) { QString _ret = QGroupBox::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGroupBox_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QGroupBox_TrUtf83(const char* s, const char* c, int n) { QString _ret = QGroupBox::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QGroupBox_Clicked1(QGroupBox* self, bool checked) { diff --git a/qt/gen_qgroupbox.go b/qt/gen_qgroupbox.go index 676a55cd..c92bb8d9 100644 --- a/qt/gen_qgroupbox.go +++ b/qt/gen_qgroupbox.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "runtime/cgo" "unsafe" @@ -53,9 +52,11 @@ func NewQGroupBox() *QGroupBox { // NewQGroupBox2 constructs a new QGroupBox object. func NewQGroupBox2(title string) *QGroupBox { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - ret := C.QGroupBox_new2((*C.struct_miqt_string)(title_ms)) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + ret := C.QGroupBox_new2(title_ms) return newQGroupBox(ret) } @@ -67,9 +68,11 @@ func NewQGroupBox3(parent *QWidget) *QGroupBox { // NewQGroupBox4 constructs a new QGroupBox object. func NewQGroupBox4(title string, parent *QWidget) *QGroupBox { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - ret := C.QGroupBox_new4((*C.struct_miqt_string)(title_ms), parent.cPointer()) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + ret := C.QGroupBox_new4(title_ms, parent.cPointer()) return newQGroupBox(ret) } @@ -80,38 +83,40 @@ func (this *QGroupBox) MetaObject() *QMetaObject { func (this *QGroupBox) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QGroupBox_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QGroupBox_Metacast(this.h, param1_Cstring)) } func QGroupBox_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QGroupBox_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGroupBox_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QGroupBox_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QGroupBox_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGroupBox_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QGroupBox) Title() string { - var _ms *C.struct_miqt_string = C.QGroupBox_Title(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGroupBox_Title(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QGroupBox) SetTitle(title string) { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - C.QGroupBox_SetTitle(this.h, (*C.struct_miqt_string)(title_ms)) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + C.QGroupBox_SetTitle(this.h, title_ms) } func (this *QGroupBox) Alignment() AlignmentFlag { @@ -195,9 +200,9 @@ func QGroupBox_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGroupBox_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGroupBox_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -206,9 +211,9 @@ func QGroupBox_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGroupBox_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGroupBox_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -217,9 +222,9 @@ func QGroupBox_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGroupBox_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGroupBox_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -228,9 +233,9 @@ func QGroupBox_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGroupBox_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGroupBox_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qgroupbox.h b/qt/gen_qgroupbox.h index 461b62ce..8a91a34a 100644 --- a/qt/gen_qgroupbox.h +++ b/qt/gen_qgroupbox.h @@ -26,15 +26,15 @@ typedef struct QWidget QWidget; #endif QGroupBox* QGroupBox_new(); -QGroupBox* QGroupBox_new2(struct miqt_string* title); +QGroupBox* QGroupBox_new2(struct miqt_string title); QGroupBox* QGroupBox_new3(QWidget* parent); -QGroupBox* QGroupBox_new4(struct miqt_string* title, QWidget* parent); +QGroupBox* QGroupBox_new4(struct miqt_string title, QWidget* parent); QMetaObject* QGroupBox_MetaObject(const QGroupBox* self); void* QGroupBox_Metacast(QGroupBox* self, const char* param1); -struct miqt_string* QGroupBox_Tr(const char* s); -struct miqt_string* QGroupBox_TrUtf8(const char* s); -struct miqt_string* QGroupBox_Title(const QGroupBox* self); -void QGroupBox_SetTitle(QGroupBox* self, struct miqt_string* title); +struct miqt_string QGroupBox_Tr(const char* s); +struct miqt_string QGroupBox_TrUtf8(const char* s); +struct miqt_string QGroupBox_Title(const QGroupBox* self); +void QGroupBox_SetTitle(QGroupBox* self, struct miqt_string title); int QGroupBox_Alignment(const QGroupBox* self); void QGroupBox_SetAlignment(QGroupBox* self, int alignment); QSize* QGroupBox_MinimumSizeHint(const QGroupBox* self); @@ -48,10 +48,10 @@ void QGroupBox_Clicked(QGroupBox* self); void QGroupBox_connect_Clicked(QGroupBox* self, intptr_t slot); void QGroupBox_Toggled(QGroupBox* self, bool param1); void QGroupBox_connect_Toggled(QGroupBox* self, intptr_t slot); -struct miqt_string* QGroupBox_Tr2(const char* s, const char* c); -struct miqt_string* QGroupBox_Tr3(const char* s, const char* c, int n); -struct miqt_string* QGroupBox_TrUtf82(const char* s, const char* c); -struct miqt_string* QGroupBox_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QGroupBox_Tr2(const char* s, const char* c); +struct miqt_string QGroupBox_Tr3(const char* s, const char* c, int n); +struct miqt_string QGroupBox_TrUtf82(const char* s, const char* c); +struct miqt_string QGroupBox_TrUtf83(const char* s, const char* c, int n); void QGroupBox_Clicked1(QGroupBox* self, bool checked); void QGroupBox_connect_Clicked1(QGroupBox* self, intptr_t slot); void QGroupBox_Delete(QGroupBox* self); diff --git a/qt/gen_qguiapplication.cpp b/qt/gen_qguiapplication.cpp index 66c186de..5d6ccf26 100644 --- a/qt/gen_qguiapplication.cpp +++ b/qt/gen_qguiapplication.cpp @@ -37,42 +37,58 @@ void* QGuiApplication_Metacast(QGuiApplication* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QGuiApplication_Tr(const char* s) { +struct miqt_string QGuiApplication_Tr(const char* s) { QString _ret = QGuiApplication::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGuiApplication_TrUtf8(const char* s) { +struct miqt_string QGuiApplication_TrUtf8(const char* s) { QString _ret = QGuiApplication::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QGuiApplication_SetApplicationDisplayName(struct miqt_string* name) { - QString name_QString = QString::fromUtf8(&name->data, name->len); +void QGuiApplication_SetApplicationDisplayName(struct miqt_string name) { + QString name_QString = QString::fromUtf8(name.data, name.len); QGuiApplication::setApplicationDisplayName(name_QString); } -struct miqt_string* QGuiApplication_ApplicationDisplayName() { +struct miqt_string QGuiApplication_ApplicationDisplayName() { QString _ret = QGuiApplication::applicationDisplayName(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QGuiApplication_SetDesktopFileName(struct miqt_string* name) { - QString name_QString = QString::fromUtf8(&name->data, name->len); +void QGuiApplication_SetDesktopFileName(struct miqt_string name) { + QString name_QString = QString::fromUtf8(name.data, name.len); QGuiApplication::setDesktopFileName(name_QString); } -struct miqt_string* QGuiApplication_DesktopFileName() { +struct miqt_string QGuiApplication_DesktopFileName() { QString _ret = QGuiApplication::desktopFileName(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } struct miqt_array* QGuiApplication_AllWindows() { @@ -113,11 +129,15 @@ QIcon* QGuiApplication_WindowIcon() { return new QIcon(QGuiApplication::windowIcon()); } -struct miqt_string* QGuiApplication_PlatformName() { +struct miqt_string QGuiApplication_PlatformName() { QString _ret = QGuiApplication::platformName(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QWindow* QGuiApplication_ModalWindow() { @@ -276,18 +296,26 @@ bool QGuiApplication_IsSessionRestored(const QGuiApplication* self) { return self->isSessionRestored(); } -struct miqt_string* QGuiApplication_SessionId(const QGuiApplication* self) { +struct miqt_string QGuiApplication_SessionId(const QGuiApplication* self) { QString _ret = self->sessionId(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGuiApplication_SessionKey(const QGuiApplication* self) { +struct miqt_string QGuiApplication_SessionKey(const QGuiApplication* self) { QString _ret = self->sessionKey(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } bool QGuiApplication_IsSavingSession(const QGuiApplication* self) { @@ -467,32 +495,48 @@ void QGuiApplication_connect_FontChanged(QGuiApplication* self, intptr_t slot) { }); } -struct miqt_string* QGuiApplication_Tr2(const char* s, const char* c) { +struct miqt_string QGuiApplication_Tr2(const char* s, const char* c) { QString _ret = QGuiApplication::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGuiApplication_Tr3(const char* s, const char* c, int n) { +struct miqt_string QGuiApplication_Tr3(const char* s, const char* c, int n) { QString _ret = QGuiApplication::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGuiApplication_TrUtf82(const char* s, const char* c) { +struct miqt_string QGuiApplication_TrUtf82(const char* s, const char* c) { QString _ret = QGuiApplication::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QGuiApplication_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QGuiApplication_TrUtf83(const char* s, const char* c, int n) { QString _ret = QGuiApplication::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QGuiApplication_Delete(QGuiApplication* self) { diff --git a/qt/gen_qguiapplication.go b/qt/gen_qguiapplication.go index 44b299b1..0d19047d 100644 --- a/qt/gen_qguiapplication.go +++ b/qt/gen_qguiapplication.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "runtime/cgo" "unsafe" @@ -78,50 +77,54 @@ func (this *QGuiApplication) MetaObject() *QMetaObject { func (this *QGuiApplication) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QGuiApplication_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QGuiApplication_Metacast(this.h, param1_Cstring)) } func QGuiApplication_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QGuiApplication_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGuiApplication_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QGuiApplication_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QGuiApplication_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGuiApplication_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QGuiApplication_SetApplicationDisplayName(name string) { - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - C.QGuiApplication_SetApplicationDisplayName((*C.struct_miqt_string)(name_ms)) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + C.QGuiApplication_SetApplicationDisplayName(name_ms) } func QGuiApplication_ApplicationDisplayName() string { - var _ms *C.struct_miqt_string = C.QGuiApplication_ApplicationDisplayName() - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGuiApplication_ApplicationDisplayName() + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QGuiApplication_SetDesktopFileName(name string) { - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - C.QGuiApplication_SetDesktopFileName((*C.struct_miqt_string)(name_ms)) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + C.QGuiApplication_SetDesktopFileName(name_ms) } func QGuiApplication_DesktopFileName() string { - var _ms *C.struct_miqt_string = C.QGuiApplication_DesktopFileName() - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGuiApplication_DesktopFileName() + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -163,9 +166,9 @@ func QGuiApplication_WindowIcon() *QIcon { } func QGuiApplication_PlatformName() string { - var _ms *C.struct_miqt_string = C.QGuiApplication_PlatformName() - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGuiApplication_PlatformName() + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -323,16 +326,16 @@ func (this *QGuiApplication) IsSessionRestored() bool { } func (this *QGuiApplication) SessionId() string { - var _ms *C.struct_miqt_string = C.QGuiApplication_SessionId(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGuiApplication_SessionId(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QGuiApplication) SessionKey() string { - var _ms *C.struct_miqt_string = C.QGuiApplication_SessionKey(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGuiApplication_SessionKey(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -628,9 +631,9 @@ func QGuiApplication_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGuiApplication_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGuiApplication_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -639,9 +642,9 @@ func QGuiApplication_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGuiApplication_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGuiApplication_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -650,9 +653,9 @@ func QGuiApplication_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGuiApplication_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGuiApplication_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -661,9 +664,9 @@ func QGuiApplication_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGuiApplication_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QGuiApplication_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qguiapplication.h b/qt/gen_qguiapplication.h index 9f4868fd..6a47a782 100644 --- a/qt/gen_qguiapplication.h +++ b/qt/gen_qguiapplication.h @@ -51,18 +51,18 @@ QGuiApplication* QGuiApplication_new(int* argc, char** argv); QGuiApplication* QGuiApplication_new2(int* argc, char** argv, int param3); QMetaObject* QGuiApplication_MetaObject(const QGuiApplication* self); void* QGuiApplication_Metacast(QGuiApplication* self, const char* param1); -struct miqt_string* QGuiApplication_Tr(const char* s); -struct miqt_string* QGuiApplication_TrUtf8(const char* s); -void QGuiApplication_SetApplicationDisplayName(struct miqt_string* name); -struct miqt_string* QGuiApplication_ApplicationDisplayName(); -void QGuiApplication_SetDesktopFileName(struct miqt_string* name); -struct miqt_string* QGuiApplication_DesktopFileName(); +struct miqt_string QGuiApplication_Tr(const char* s); +struct miqt_string QGuiApplication_TrUtf8(const char* s); +void QGuiApplication_SetApplicationDisplayName(struct miqt_string name); +struct miqt_string QGuiApplication_ApplicationDisplayName(); +void QGuiApplication_SetDesktopFileName(struct miqt_string name); +struct miqt_string QGuiApplication_DesktopFileName(); struct miqt_array* QGuiApplication_AllWindows(); struct miqt_array* QGuiApplication_TopLevelWindows(); QWindow* QGuiApplication_TopLevelAt(QPoint* pos); void QGuiApplication_SetWindowIcon(QIcon* icon); QIcon* QGuiApplication_WindowIcon(); -struct miqt_string* QGuiApplication_PlatformName(); +struct miqt_string QGuiApplication_PlatformName(); QWindow* QGuiApplication_ModalWindow(); QWindow* QGuiApplication_FocusWindow(); QObject* QGuiApplication_FocusObject(); @@ -98,8 +98,8 @@ int QGuiApplication_HighDpiScaleFactorRoundingPolicy(); int QGuiApplication_Exec(); bool QGuiApplication_Notify(QGuiApplication* self, QObject* param1, QEvent* param2); bool QGuiApplication_IsSessionRestored(const QGuiApplication* self); -struct miqt_string* QGuiApplication_SessionId(const QGuiApplication* self); -struct miqt_string* QGuiApplication_SessionKey(const QGuiApplication* self); +struct miqt_string QGuiApplication_SessionId(const QGuiApplication* self); +struct miqt_string QGuiApplication_SessionKey(const QGuiApplication* self); bool QGuiApplication_IsSavingSession(const QGuiApplication* self); bool QGuiApplication_IsFallbackSessionManagementEnabled(); void QGuiApplication_SetFallbackSessionManagementEnabled(bool fallbackSessionManagementEnabled); @@ -132,10 +132,10 @@ void QGuiApplication_ApplicationDisplayNameChanged(QGuiApplication* self); void QGuiApplication_connect_ApplicationDisplayNameChanged(QGuiApplication* self, intptr_t slot); void QGuiApplication_FontChanged(QGuiApplication* self, QFont* font); void QGuiApplication_connect_FontChanged(QGuiApplication* self, intptr_t slot); -struct miqt_string* QGuiApplication_Tr2(const char* s, const char* c); -struct miqt_string* QGuiApplication_Tr3(const char* s, const char* c, int n); -struct miqt_string* QGuiApplication_TrUtf82(const char* s, const char* c); -struct miqt_string* QGuiApplication_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QGuiApplication_Tr2(const char* s, const char* c); +struct miqt_string QGuiApplication_Tr3(const char* s, const char* c, int n); +struct miqt_string QGuiApplication_TrUtf82(const char* s, const char* c); +struct miqt_string QGuiApplication_TrUtf83(const char* s, const char* c, int n); void QGuiApplication_Delete(QGuiApplication* self); #ifdef __cplusplus diff --git a/qt/gen_qhash.go b/qt/gen_qhash.go index 8d08b6c8..c628e4bb 100644 --- a/qt/gen_qhash.go +++ b/qt/gen_qhash.go @@ -43,7 +43,7 @@ func UnsafeNewQHashData(h unsafe.Pointer) *QHashData { } func (this *QHashData) AllocateNode(nodeAlign int) unsafe.Pointer { - return C.QHashData_AllocateNode(this.h, (C.int)(nodeAlign)) + return (unsafe.Pointer)(C.QHashData_AllocateNode(this.h, (C.int)(nodeAlign))) } func (this *QHashData) FreeNode(node unsafe.Pointer) { diff --git a/qt/gen_qheaderview.cpp b/qt/gen_qheaderview.cpp index f90658d7..f5f0ee1e 100644 --- a/qt/gen_qheaderview.cpp +++ b/qt/gen_qheaderview.cpp @@ -28,18 +28,26 @@ void* QHeaderView_Metacast(QHeaderView* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QHeaderView_Tr(const char* s) { +struct miqt_string QHeaderView_Tr(const char* s) { QString _ret = QHeaderView::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QHeaderView_TrUtf8(const char* s) { +struct miqt_string QHeaderView_TrUtf8(const char* s) { QString _ret = QHeaderView::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QHeaderView_SetModel(QHeaderView* self, QAbstractItemModel* model) { @@ -290,12 +298,18 @@ bool QHeaderView_SectionsHidden(const QHeaderView* self) { return self->sectionsHidden(); } -QByteArray* QHeaderView_SaveState(const QHeaderView* self) { - return new QByteArray(self->saveState()); +struct miqt_string QHeaderView_SaveState(const QHeaderView* self) { + QByteArray _qb = self->saveState(); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } -bool QHeaderView_RestoreState(QHeaderView* self, QByteArray* state) { - return self->restoreState(*state); +bool QHeaderView_RestoreState(QHeaderView* self, struct miqt_string state) { + QByteArray state_QByteArray(state.data, state.len); + return self->restoreState(state_QByteArray); } void QHeaderView_Reset(QHeaderView* self) { @@ -434,32 +448,48 @@ void QHeaderView_connect_SortIndicatorChanged(QHeaderView* self, intptr_t slot) }); } -struct miqt_string* QHeaderView_Tr2(const char* s, const char* c) { +struct miqt_string QHeaderView_Tr2(const char* s, const char* c) { QString _ret = QHeaderView::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QHeaderView_Tr3(const char* s, const char* c, int n) { +struct miqt_string QHeaderView_Tr3(const char* s, const char* c, int n) { QString _ret = QHeaderView::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QHeaderView_TrUtf82(const char* s, const char* c) { +struct miqt_string QHeaderView_TrUtf82(const char* s, const char* c) { QString _ret = QHeaderView::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QHeaderView_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QHeaderView_TrUtf83(const char* s, const char* c, int n) { QString _ret = QHeaderView::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QHeaderView_Delete(QHeaderView* self) { diff --git a/qt/gen_qheaderview.go b/qt/gen_qheaderview.go index 2bc4a55d..31e2a241 100644 --- a/qt/gen_qheaderview.go +++ b/qt/gen_qheaderview.go @@ -73,24 +73,24 @@ func (this *QHeaderView) MetaObject() *QMetaObject { func (this *QHeaderView) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QHeaderView_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QHeaderView_Metacast(this.h, param1_Cstring)) } func QHeaderView_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QHeaderView_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QHeaderView_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QHeaderView_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QHeaderView_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QHeaderView_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -341,15 +341,18 @@ func (this *QHeaderView) SectionsHidden() bool { return (bool)(C.QHeaderView_SectionsHidden(this.h)) } -func (this *QHeaderView) SaveState() *QByteArray { - _ret := C.QHeaderView_SaveState(this.h) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QHeaderView) SaveState() []byte { + var _bytearray C.struct_miqt_string = C.QHeaderView_SaveState(this.h) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } -func (this *QHeaderView) RestoreState(state *QByteArray) bool { - return (bool)(C.QHeaderView_RestoreState(this.h, state.cPointer())) +func (this *QHeaderView) RestoreState(state []byte) bool { + state_alias := C.struct_miqt_string{} + state_alias.data = (*C.char)(unsafe.Pointer(&state[0])) + state_alias.len = C.size_t(len(state)) + return (bool)(C.QHeaderView_RestoreState(this.h, state_alias)) } func (this *QHeaderView) Reset() { @@ -586,9 +589,9 @@ func QHeaderView_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QHeaderView_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QHeaderView_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -597,9 +600,9 @@ func QHeaderView_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QHeaderView_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QHeaderView_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -608,9 +611,9 @@ func QHeaderView_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QHeaderView_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QHeaderView_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -619,9 +622,9 @@ func QHeaderView_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QHeaderView_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QHeaderView_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qheaderview.h b/qt/gen_qheaderview.h index b7a28950..8c062413 100644 --- a/qt/gen_qheaderview.h +++ b/qt/gen_qheaderview.h @@ -35,8 +35,8 @@ QHeaderView* QHeaderView_new(int orientation); QHeaderView* QHeaderView_new2(int orientation, QWidget* parent); QMetaObject* QHeaderView_MetaObject(const QHeaderView* self); void* QHeaderView_Metacast(QHeaderView* self, const char* param1); -struct miqt_string* QHeaderView_Tr(const char* s); -struct miqt_string* QHeaderView_TrUtf8(const char* s); +struct miqt_string QHeaderView_Tr(const char* s); +struct miqt_string QHeaderView_TrUtf8(const char* s); void QHeaderView_SetModel(QHeaderView* self, QAbstractItemModel* model); int QHeaderView_Orientation(const QHeaderView* self); int QHeaderView_Offset(const QHeaderView* self); @@ -98,8 +98,8 @@ void QHeaderView_SetDefaultAlignment(QHeaderView* self, int alignment); void QHeaderView_DoItemsLayout(QHeaderView* self); bool QHeaderView_SectionsMoved(const QHeaderView* self); bool QHeaderView_SectionsHidden(const QHeaderView* self); -QByteArray* QHeaderView_SaveState(const QHeaderView* self); -bool QHeaderView_RestoreState(QHeaderView* self, QByteArray* state); +struct miqt_string QHeaderView_SaveState(const QHeaderView* self); +bool QHeaderView_RestoreState(QHeaderView* self, struct miqt_string state); void QHeaderView_Reset(QHeaderView* self); void QHeaderView_SetOffset(QHeaderView* self, int offset); void QHeaderView_SetOffsetToSectionPosition(QHeaderView* self, int visualIndex); @@ -125,10 +125,10 @@ void QHeaderView_GeometriesChanged(QHeaderView* self); void QHeaderView_connect_GeometriesChanged(QHeaderView* self, intptr_t slot); void QHeaderView_SortIndicatorChanged(QHeaderView* self, int logicalIndex, int order); void QHeaderView_connect_SortIndicatorChanged(QHeaderView* self, intptr_t slot); -struct miqt_string* QHeaderView_Tr2(const char* s, const char* c); -struct miqt_string* QHeaderView_Tr3(const char* s, const char* c, int n); -struct miqt_string* QHeaderView_TrUtf82(const char* s, const char* c); -struct miqt_string* QHeaderView_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QHeaderView_Tr2(const char* s, const char* c); +struct miqt_string QHeaderView_Tr3(const char* s, const char* c, int n); +struct miqt_string QHeaderView_TrUtf82(const char* s, const char* c); +struct miqt_string QHeaderView_TrUtf83(const char* s, const char* c, int n); void QHeaderView_Delete(QHeaderView* self); #ifdef __cplusplus diff --git a/qt/gen_qhistorystate.cpp b/qt/gen_qhistorystate.cpp index fe304bdd..0109e25a 100644 --- a/qt/gen_qhistorystate.cpp +++ b/qt/gen_qhistorystate.cpp @@ -34,18 +34,26 @@ void* QHistoryState_Metacast(QHistoryState* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QHistoryState_Tr(const char* s) { +struct miqt_string QHistoryState_Tr(const char* s) { QString _ret = QHistoryState::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QHistoryState_TrUtf8(const char* s) { +struct miqt_string QHistoryState_TrUtf8(const char* s) { QString _ret = QHistoryState::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QAbstractTransition* QHistoryState_DefaultTransition(const QHistoryState* self) { @@ -73,32 +81,48 @@ void QHistoryState_SetHistoryType(QHistoryState* self, int typeVal) { self->setHistoryType(static_cast(typeVal)); } -struct miqt_string* QHistoryState_Tr2(const char* s, const char* c) { +struct miqt_string QHistoryState_Tr2(const char* s, const char* c) { QString _ret = QHistoryState::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QHistoryState_Tr3(const char* s, const char* c, int n) { +struct miqt_string QHistoryState_Tr3(const char* s, const char* c, int n) { QString _ret = QHistoryState::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QHistoryState_TrUtf82(const char* s, const char* c) { +struct miqt_string QHistoryState_TrUtf82(const char* s, const char* c) { QString _ret = QHistoryState::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QHistoryState_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QHistoryState_TrUtf83(const char* s, const char* c, int n) { QString _ret = QHistoryState::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QHistoryState_Delete(QHistoryState* self) { diff --git a/qt/gen_qhistorystate.go b/qt/gen_qhistorystate.go index 13747ec8..f4d0577d 100644 --- a/qt/gen_qhistorystate.go +++ b/qt/gen_qhistorystate.go @@ -81,24 +81,24 @@ func (this *QHistoryState) MetaObject() *QMetaObject { func (this *QHistoryState) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QHistoryState_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QHistoryState_Metacast(this.h, param1_Cstring)) } func QHistoryState_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QHistoryState_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QHistoryState_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QHistoryState_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QHistoryState_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QHistoryState_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -131,9 +131,9 @@ func QHistoryState_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QHistoryState_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QHistoryState_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -142,9 +142,9 @@ func QHistoryState_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QHistoryState_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QHistoryState_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -153,9 +153,9 @@ func QHistoryState_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QHistoryState_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QHistoryState_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -164,9 +164,9 @@ func QHistoryState_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QHistoryState_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QHistoryState_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qhistorystate.h b/qt/gen_qhistorystate.h index 7a242a9c..dd04c809 100644 --- a/qt/gen_qhistorystate.h +++ b/qt/gen_qhistorystate.h @@ -33,18 +33,18 @@ QHistoryState* QHistoryState_new3(QState* parent); QHistoryState* QHistoryState_new4(int typeVal, QState* parent); QMetaObject* QHistoryState_MetaObject(const QHistoryState* self); void* QHistoryState_Metacast(QHistoryState* self, const char* param1); -struct miqt_string* QHistoryState_Tr(const char* s); -struct miqt_string* QHistoryState_TrUtf8(const char* s); +struct miqt_string QHistoryState_Tr(const char* s); +struct miqt_string QHistoryState_TrUtf8(const char* s); QAbstractTransition* QHistoryState_DefaultTransition(const QHistoryState* self); void QHistoryState_SetDefaultTransition(QHistoryState* self, QAbstractTransition* transition); QAbstractState* QHistoryState_DefaultState(const QHistoryState* self); void QHistoryState_SetDefaultState(QHistoryState* self, QAbstractState* state); int QHistoryState_HistoryType(const QHistoryState* self); void QHistoryState_SetHistoryType(QHistoryState* self, int typeVal); -struct miqt_string* QHistoryState_Tr2(const char* s, const char* c); -struct miqt_string* QHistoryState_Tr3(const char* s, const char* c, int n); -struct miqt_string* QHistoryState_TrUtf82(const char* s, const char* c); -struct miqt_string* QHistoryState_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QHistoryState_Tr2(const char* s, const char* c); +struct miqt_string QHistoryState_Tr3(const char* s, const char* c, int n); +struct miqt_string QHistoryState_TrUtf82(const char* s, const char* c); +struct miqt_string QHistoryState_TrUtf83(const char* s, const char* c, int n); void QHistoryState_Delete(QHistoryState* self); #ifdef __cplusplus diff --git a/qt/gen_qicon.cpp b/qt/gen_qicon.cpp index ea630ae8..afd48032 100644 --- a/qt/gen_qicon.cpp +++ b/qt/gen_qicon.cpp @@ -25,8 +25,8 @@ QIcon* QIcon_new3(QIcon* other) { return new QIcon(*other); } -QIcon* QIcon_new4(struct miqt_string* fileName) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +QIcon* QIcon_new4(struct miqt_string fileName) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); return new QIcon(fileName_QString); } @@ -66,11 +66,15 @@ QSize* QIcon_ActualSize2(const QIcon* self, QWindow* window, QSize* size) { return new QSize(self->actualSize(window, *size)); } -struct miqt_string* QIcon_Name(const QIcon* self) { +struct miqt_string QIcon_Name(const QIcon* self) { QString _ret = self->name(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QIcon_Paint(const QIcon* self, QPainter* painter, QRect* rect) { @@ -102,8 +106,8 @@ void QIcon_AddPixmap(QIcon* self, QPixmap* pixmap) { self->addPixmap(*pixmap); } -void QIcon_AddFile(QIcon* self, struct miqt_string* fileName) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +void QIcon_AddFile(QIcon* self, struct miqt_string fileName) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); self->addFile(fileName_QString); } @@ -128,30 +132,34 @@ bool QIcon_IsMask(const QIcon* self) { return self->isMask(); } -QIcon* QIcon_FromTheme(struct miqt_string* name) { - QString name_QString = QString::fromUtf8(&name->data, name->len); +QIcon* QIcon_FromTheme(struct miqt_string name) { + QString name_QString = QString::fromUtf8(name.data, name.len); return new QIcon(QIcon::fromTheme(name_QString)); } -QIcon* QIcon_FromTheme2(struct miqt_string* name, QIcon* fallback) { - QString name_QString = QString::fromUtf8(&name->data, name->len); +QIcon* QIcon_FromTheme2(struct miqt_string name, QIcon* fallback) { + QString name_QString = QString::fromUtf8(name.data, name.len); return new QIcon(QIcon::fromTheme(name_QString, *fallback)); } -bool QIcon_HasThemeIcon(struct miqt_string* name) { - QString name_QString = QString::fromUtf8(&name->data, name->len); +bool QIcon_HasThemeIcon(struct miqt_string name) { + QString name_QString = QString::fromUtf8(name.data, name.len); return QIcon::hasThemeIcon(name_QString); } struct miqt_array* QIcon_ThemeSearchPaths() { QStringList _ret = QIcon::themeSearchPaths(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -159,12 +167,12 @@ struct miqt_array* QIcon_ThemeSearchPaths() { return _out; } -void QIcon_SetThemeSearchPaths(struct miqt_array* /* of struct miqt_string* */ searchpath) { +void QIcon_SetThemeSearchPaths(struct miqt_array* /* of struct miqt_string */ searchpath) { QStringList searchpath_QList; searchpath_QList.reserve(searchpath->len); - struct miqt_string** searchpath_arr = static_cast(searchpath->data); + struct miqt_string* searchpath_arr = static_cast(searchpath->data); for(size_t i = 0; i < searchpath->len; ++i) { - QString searchpath_arr_i_QString = QString::fromUtf8(&searchpath_arr[i]->data, searchpath_arr[i]->len); + QString searchpath_arr_i_QString = QString::fromUtf8(searchpath_arr[i].data, searchpath_arr[i].len); searchpath_QList.push_back(searchpath_arr_i_QString); } QIcon::setThemeSearchPaths(searchpath_QList); @@ -173,12 +181,16 @@ void QIcon_SetThemeSearchPaths(struct miqt_array* /* of struct miqt_string* */ s struct miqt_array* QIcon_FallbackSearchPaths() { QStringList _ret = QIcon::fallbackSearchPaths(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -186,38 +198,46 @@ struct miqt_array* QIcon_FallbackSearchPaths() { return _out; } -void QIcon_SetFallbackSearchPaths(struct miqt_array* /* of struct miqt_string* */ paths) { +void QIcon_SetFallbackSearchPaths(struct miqt_array* /* of struct miqt_string */ paths) { QStringList paths_QList; paths_QList.reserve(paths->len); - struct miqt_string** paths_arr = static_cast(paths->data); + struct miqt_string* paths_arr = static_cast(paths->data); for(size_t i = 0; i < paths->len; ++i) { - QString paths_arr_i_QString = QString::fromUtf8(&paths_arr[i]->data, paths_arr[i]->len); + QString paths_arr_i_QString = QString::fromUtf8(paths_arr[i].data, paths_arr[i].len); paths_QList.push_back(paths_arr_i_QString); } QIcon::setFallbackSearchPaths(paths_QList); } -struct miqt_string* QIcon_ThemeName() { +struct miqt_string QIcon_ThemeName() { QString _ret = QIcon::themeName(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QIcon_SetThemeName(struct miqt_string* path) { - QString path_QString = QString::fromUtf8(&path->data, path->len); +void QIcon_SetThemeName(struct miqt_string path) { + QString path_QString = QString::fromUtf8(path.data, path.len); QIcon::setThemeName(path_QString); } -struct miqt_string* QIcon_FallbackThemeName() { +struct miqt_string QIcon_FallbackThemeName() { QString _ret = QIcon::fallbackThemeName(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QIcon_SetFallbackThemeName(struct miqt_string* name) { - QString name_QString = QString::fromUtf8(&name->data, name->len); +void QIcon_SetFallbackThemeName(struct miqt_string name) { + QString name_QString = QString::fromUtf8(name.data, name.len); QIcon::setFallbackThemeName(name_QString); } @@ -301,18 +321,18 @@ void QIcon_AddPixmap3(QIcon* self, QPixmap* pixmap, int mode, int state) { self->addPixmap(*pixmap, static_cast(mode), static_cast(state)); } -void QIcon_AddFile2(QIcon* self, struct miqt_string* fileName, QSize* size) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +void QIcon_AddFile2(QIcon* self, struct miqt_string fileName, QSize* size) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); self->addFile(fileName_QString, *size); } -void QIcon_AddFile3(QIcon* self, struct miqt_string* fileName, QSize* size, int mode) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +void QIcon_AddFile3(QIcon* self, struct miqt_string fileName, QSize* size, int mode) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); self->addFile(fileName_QString, *size, static_cast(mode)); } -void QIcon_AddFile4(QIcon* self, struct miqt_string* fileName, QSize* size, int mode, int state) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +void QIcon_AddFile4(QIcon* self, struct miqt_string fileName, QSize* size, int mode, int state) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); self->addFile(fileName_QString, *size, static_cast(mode), static_cast(state)); } diff --git a/qt/gen_qicon.go b/qt/gen_qicon.go index 0239fd31..7583d0c8 100644 --- a/qt/gen_qicon.go +++ b/qt/gen_qicon.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -79,9 +78,11 @@ func NewQIcon3(other *QIcon) *QIcon { // NewQIcon4 constructs a new QIcon object. func NewQIcon4(fileName string) *QIcon { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - ret := C.QIcon_new4((*C.struct_miqt_string)(fileName_ms)) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + ret := C.QIcon_new4(fileName_ms) return newQIcon(ret) } @@ -142,9 +143,9 @@ func (this *QIcon) ActualSize2(window *QWindow, size *QSize) *QSize { } func (this *QIcon) Name() string { - var _ms *C.struct_miqt_string = C.QIcon_Name(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QIcon_Name(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -177,9 +178,11 @@ func (this *QIcon) AddPixmap(pixmap *QPixmap) { } func (this *QIcon) AddFile(fileName string) { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - C.QIcon_AddFile(this.h, (*C.struct_miqt_string)(fileName_ms)) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + C.QIcon_AddFile(this.h, fileName_ms) } func (this *QIcon) AvailableSizes() []QSize { @@ -205,37 +208,43 @@ func (this *QIcon) IsMask() bool { } func QIcon_FromTheme(name string) *QIcon { - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - _ret := C.QIcon_FromTheme((*C.struct_miqt_string)(name_ms)) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + _ret := C.QIcon_FromTheme(name_ms) _goptr := newQIcon(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func QIcon_FromTheme2(name string, fallback *QIcon) *QIcon { - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - _ret := C.QIcon_FromTheme2((*C.struct_miqt_string)(name_ms), fallback.cPointer()) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + _ret := C.QIcon_FromTheme2(name_ms, fallback.cPointer()) _goptr := newQIcon(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func QIcon_HasThemeIcon(name string) bool { - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - return (bool)(C.QIcon_HasThemeIcon((*C.struct_miqt_string)(name_ms))) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + return (bool)(C.QIcon_HasThemeIcon(name_ms)) } func QIcon_ThemeSearchPaths() []string { var _ma *C.struct_miqt_array = C.QIcon_ThemeSearchPaths() _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -244,12 +253,14 @@ func QIcon_ThemeSearchPaths() []string { func QIcon_SetThemeSearchPaths(searchpath []string) { // For the C ABI, malloc a C array of raw pointers - searchpath_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(searchpath)))) + searchpath_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(searchpath)))) defer C.free(unsafe.Pointer(searchpath_CArray)) for i := range searchpath { - searchpath_i_ms := libmiqt.Strdupg(searchpath[i]) - defer C.free(searchpath_i_ms) - searchpath_CArray[i] = (*C.struct_miqt_string)(searchpath_i_ms) + searchpath_i_ms := C.struct_miqt_string{} + searchpath_i_ms.data = C.CString(searchpath[i]) + searchpath_i_ms.len = C.size_t(len(searchpath[i])) + defer C.free(unsafe.Pointer(searchpath_i_ms.data)) + searchpath_CArray[i] = searchpath_i_ms } searchpath_ma := &C.struct_miqt_array{len: C.size_t(len(searchpath)), data: unsafe.Pointer(searchpath_CArray)} defer runtime.KeepAlive(unsafe.Pointer(searchpath_ma)) @@ -259,11 +270,11 @@ func QIcon_SetThemeSearchPaths(searchpath []string) { func QIcon_FallbackSearchPaths() []string { var _ma *C.struct_miqt_array = C.QIcon_FallbackSearchPaths() _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -272,12 +283,14 @@ func QIcon_FallbackSearchPaths() []string { func QIcon_SetFallbackSearchPaths(paths []string) { // For the C ABI, malloc a C array of raw pointers - paths_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(paths)))) + paths_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(paths)))) defer C.free(unsafe.Pointer(paths_CArray)) for i := range paths { - paths_i_ms := libmiqt.Strdupg(paths[i]) - defer C.free(paths_i_ms) - paths_CArray[i] = (*C.struct_miqt_string)(paths_i_ms) + paths_i_ms := C.struct_miqt_string{} + paths_i_ms.data = C.CString(paths[i]) + paths_i_ms.len = C.size_t(len(paths[i])) + defer C.free(unsafe.Pointer(paths_i_ms.data)) + paths_CArray[i] = paths_i_ms } paths_ma := &C.struct_miqt_array{len: C.size_t(len(paths)), data: unsafe.Pointer(paths_CArray)} defer runtime.KeepAlive(unsafe.Pointer(paths_ma)) @@ -285,29 +298,33 @@ func QIcon_SetFallbackSearchPaths(paths []string) { } func QIcon_ThemeName() string { - var _ms *C.struct_miqt_string = C.QIcon_ThemeName() - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QIcon_ThemeName() + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QIcon_SetThemeName(path string) { - path_ms := libmiqt.Strdupg(path) - defer C.free(path_ms) - C.QIcon_SetThemeName((*C.struct_miqt_string)(path_ms)) + path_ms := C.struct_miqt_string{} + path_ms.data = C.CString(path) + path_ms.len = C.size_t(len(path)) + defer C.free(unsafe.Pointer(path_ms.data)) + C.QIcon_SetThemeName(path_ms) } func QIcon_FallbackThemeName() string { - var _ms *C.struct_miqt_string = C.QIcon_FallbackThemeName() - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QIcon_FallbackThemeName() + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QIcon_SetFallbackThemeName(name string) { - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - C.QIcon_SetFallbackThemeName((*C.struct_miqt_string)(name_ms)) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + C.QIcon_SetFallbackThemeName(name_ms) } func (this *QIcon) Pixmap22(size *QSize, mode QIcon__Mode) *QPixmap { @@ -427,21 +444,27 @@ func (this *QIcon) AddPixmap3(pixmap *QPixmap, mode QIcon__Mode, state QIcon__St } func (this *QIcon) AddFile2(fileName string, size *QSize) { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - C.QIcon_AddFile2(this.h, (*C.struct_miqt_string)(fileName_ms), size.cPointer()) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + C.QIcon_AddFile2(this.h, fileName_ms, size.cPointer()) } func (this *QIcon) AddFile3(fileName string, size *QSize, mode QIcon__Mode) { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - C.QIcon_AddFile3(this.h, (*C.struct_miqt_string)(fileName_ms), size.cPointer(), (C.int)(mode)) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + C.QIcon_AddFile3(this.h, fileName_ms, size.cPointer(), (C.int)(mode)) } func (this *QIcon) AddFile4(fileName string, size *QSize, mode QIcon__Mode, state QIcon__State) { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - C.QIcon_AddFile4(this.h, (*C.struct_miqt_string)(fileName_ms), size.cPointer(), (C.int)(mode), (C.int)(state)) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + C.QIcon_AddFile4(this.h, fileName_ms, size.cPointer(), (C.int)(mode), (C.int)(state)) } func (this *QIcon) AvailableSizes1(mode QIcon__Mode) []QSize { diff --git a/qt/gen_qicon.h b/qt/gen_qicon.h index 74140aee..1d2871ab 100644 --- a/qt/gen_qicon.h +++ b/qt/gen_qicon.h @@ -34,7 +34,7 @@ typedef struct QWindow QWindow; QIcon* QIcon_new(); QIcon* QIcon_new2(QPixmap* pixmap); QIcon* QIcon_new3(QIcon* other); -QIcon* QIcon_new4(struct miqt_string* fileName); +QIcon* QIcon_new4(struct miqt_string fileName); QIcon* QIcon_new5(QIconEngine* engine); void QIcon_OperatorAssign(QIcon* self, QIcon* other); void QIcon_Swap(QIcon* self, QIcon* other); @@ -44,7 +44,7 @@ QPixmap* QIcon_PixmapWithExtent(const QIcon* self, int extent); QPixmap* QIcon_Pixmap3(const QIcon* self, QWindow* window, QSize* size); QSize* QIcon_ActualSize(const QIcon* self, QSize* size); QSize* QIcon_ActualSize2(const QIcon* self, QWindow* window, QSize* size); -struct miqt_string* QIcon_Name(const QIcon* self); +struct miqt_string QIcon_Name(const QIcon* self); void QIcon_Paint(const QIcon* self, QPainter* painter, QRect* rect); void QIcon_Paint2(const QIcon* self, QPainter* painter, int x, int y, int w, int h); bool QIcon_IsNull(const QIcon* self); @@ -52,21 +52,21 @@ bool QIcon_IsDetached(const QIcon* self); void QIcon_Detach(QIcon* self); long long QIcon_CacheKey(const QIcon* self); void QIcon_AddPixmap(QIcon* self, QPixmap* pixmap); -void QIcon_AddFile(QIcon* self, struct miqt_string* fileName); +void QIcon_AddFile(QIcon* self, struct miqt_string fileName); struct miqt_array* QIcon_AvailableSizes(const QIcon* self); void QIcon_SetIsMask(QIcon* self, bool isMask); bool QIcon_IsMask(const QIcon* self); -QIcon* QIcon_FromTheme(struct miqt_string* name); -QIcon* QIcon_FromTheme2(struct miqt_string* name, QIcon* fallback); -bool QIcon_HasThemeIcon(struct miqt_string* name); +QIcon* QIcon_FromTheme(struct miqt_string name); +QIcon* QIcon_FromTheme2(struct miqt_string name, QIcon* fallback); +bool QIcon_HasThemeIcon(struct miqt_string name); struct miqt_array* QIcon_ThemeSearchPaths(); -void QIcon_SetThemeSearchPaths(struct miqt_array* /* of struct miqt_string* */ searchpath); +void QIcon_SetThemeSearchPaths(struct miqt_array* /* of struct miqt_string */ searchpath); struct miqt_array* QIcon_FallbackSearchPaths(); -void QIcon_SetFallbackSearchPaths(struct miqt_array* /* of struct miqt_string* */ paths); -struct miqt_string* QIcon_ThemeName(); -void QIcon_SetThemeName(struct miqt_string* path); -struct miqt_string* QIcon_FallbackThemeName(); -void QIcon_SetFallbackThemeName(struct miqt_string* name); +void QIcon_SetFallbackSearchPaths(struct miqt_array* /* of struct miqt_string */ paths); +struct miqt_string QIcon_ThemeName(); +void QIcon_SetThemeName(struct miqt_string path); +struct miqt_string QIcon_FallbackThemeName(); +void QIcon_SetFallbackThemeName(struct miqt_string name); QPixmap* QIcon_Pixmap22(const QIcon* self, QSize* size, int mode); QPixmap* QIcon_Pixmap32(const QIcon* self, QSize* size, int mode, int state); QPixmap* QIcon_Pixmap33(const QIcon* self, int w, int h, int mode); @@ -87,9 +87,9 @@ void QIcon_Paint7(const QIcon* self, QPainter* painter, int x, int y, int w, int void QIcon_Paint8(const QIcon* self, QPainter* painter, int x, int y, int w, int h, int alignment, int mode, int state); void QIcon_AddPixmap2(QIcon* self, QPixmap* pixmap, int mode); void QIcon_AddPixmap3(QIcon* self, QPixmap* pixmap, int mode, int state); -void QIcon_AddFile2(QIcon* self, struct miqt_string* fileName, QSize* size); -void QIcon_AddFile3(QIcon* self, struct miqt_string* fileName, QSize* size, int mode); -void QIcon_AddFile4(QIcon* self, struct miqt_string* fileName, QSize* size, int mode, int state); +void QIcon_AddFile2(QIcon* self, struct miqt_string fileName, QSize* size); +void QIcon_AddFile3(QIcon* self, struct miqt_string fileName, QSize* size, int mode); +void QIcon_AddFile4(QIcon* self, struct miqt_string fileName, QSize* size, int mode, int state); struct miqt_array* QIcon_AvailableSizes1(const QIcon* self, int mode); struct miqt_array* QIcon_AvailableSizes2(const QIcon* self, int mode, int state); void QIcon_Delete(QIcon* self); diff --git a/qt/gen_qiconengine.cpp b/qt/gen_qiconengine.cpp index d6f7f782..282bf751 100644 --- a/qt/gen_qiconengine.cpp +++ b/qt/gen_qiconengine.cpp @@ -30,16 +30,20 @@ void QIconEngine_AddPixmap(QIconEngine* self, QPixmap* pixmap, int mode, int sta self->addPixmap(*pixmap, static_cast(mode), static_cast(state)); } -void QIconEngine_AddFile(QIconEngine* self, struct miqt_string* fileName, QSize* size, int mode, int state) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +void QIconEngine_AddFile(QIconEngine* self, struct miqt_string fileName, QSize* size, int mode, int state) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); self->addFile(fileName_QString, *size, static_cast(mode), static_cast(state)); } -struct miqt_string* QIconEngine_Key(const QIconEngine* self) { +struct miqt_string QIconEngine_Key(const QIconEngine* self) { QString _ret = self->key(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QIconEngine* QIconEngine_Clone(const QIconEngine* self) { @@ -67,11 +71,15 @@ struct miqt_array* QIconEngine_AvailableSizes(const QIconEngine* self) { return _out; } -struct miqt_string* QIconEngine_IconName(const QIconEngine* self) { +struct miqt_string QIconEngine_IconName(const QIconEngine* self) { QString _ret = self->iconName(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } bool QIconEngine_IsNull(const QIconEngine* self) { diff --git a/qt/gen_qiconengine.go b/qt/gen_qiconengine.go index 844df529..b1ef3d95 100644 --- a/qt/gen_qiconengine.go +++ b/qt/gen_qiconengine.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -75,15 +74,17 @@ func (this *QIconEngine) AddPixmap(pixmap *QPixmap, mode QIcon__Mode, state QIco } func (this *QIconEngine) AddFile(fileName string, size *QSize, mode QIcon__Mode, state QIcon__State) { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - C.QIconEngine_AddFile(this.h, (*C.struct_miqt_string)(fileName_ms), size.cPointer(), (C.int)(mode), (C.int)(state)) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + C.QIconEngine_AddFile(this.h, fileName_ms, size.cPointer(), (C.int)(mode), (C.int)(state)) } func (this *QIconEngine) Key() string { - var _ms *C.struct_miqt_string = C.QIconEngine_Key(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QIconEngine_Key(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -114,9 +115,9 @@ func (this *QIconEngine) AvailableSizes() []QSize { } func (this *QIconEngine) IconName() string { - var _ms *C.struct_miqt_string = C.QIconEngine_IconName(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QIconEngine_IconName(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qiconengine.h b/qt/gen_qiconengine.h index c94dd82c..cfab5908 100644 --- a/qt/gen_qiconengine.h +++ b/qt/gen_qiconengine.h @@ -45,13 +45,13 @@ void QIconEngine_Paint(QIconEngine* self, QPainter* painter, QRect* rect, int mo QSize* QIconEngine_ActualSize(QIconEngine* self, QSize* size, int mode, int state); QPixmap* QIconEngine_Pixmap(QIconEngine* self, QSize* size, int mode, int state); void QIconEngine_AddPixmap(QIconEngine* self, QPixmap* pixmap, int mode, int state); -void QIconEngine_AddFile(QIconEngine* self, struct miqt_string* fileName, QSize* size, int mode, int state); -struct miqt_string* QIconEngine_Key(const QIconEngine* self); +void QIconEngine_AddFile(QIconEngine* self, struct miqt_string fileName, QSize* size, int mode, int state); +struct miqt_string QIconEngine_Key(const QIconEngine* self); QIconEngine* QIconEngine_Clone(const QIconEngine* self); bool QIconEngine_Read(QIconEngine* self, QDataStream* in); bool QIconEngine_Write(const QIconEngine* self, QDataStream* out); struct miqt_array* QIconEngine_AvailableSizes(const QIconEngine* self); -struct miqt_string* QIconEngine_IconName(const QIconEngine* self); +struct miqt_string QIconEngine_IconName(const QIconEngine* self); bool QIconEngine_IsNull(const QIconEngine* self); QPixmap* QIconEngine_ScaledPixmap(QIconEngine* self, QSize* size, int mode, int state, double scale); void QIconEngine_VirtualHook(QIconEngine* self, int id, void* data); diff --git a/qt/gen_qiconengineplugin.cpp b/qt/gen_qiconengineplugin.cpp index 817e1e28..b70d79a6 100644 --- a/qt/gen_qiconengineplugin.cpp +++ b/qt/gen_qiconengineplugin.cpp @@ -16,54 +16,78 @@ void* QIconEnginePlugin_Metacast(QIconEnginePlugin* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QIconEnginePlugin_Tr(const char* s) { +struct miqt_string QIconEnginePlugin_Tr(const char* s) { QString _ret = QIconEnginePlugin::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QIconEnginePlugin_TrUtf8(const char* s) { +struct miqt_string QIconEnginePlugin_TrUtf8(const char* s) { QString _ret = QIconEnginePlugin::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QIconEngine* QIconEnginePlugin_Create(QIconEnginePlugin* self) { return self->create(); } -struct miqt_string* QIconEnginePlugin_Tr2(const char* s, const char* c) { +struct miqt_string QIconEnginePlugin_Tr2(const char* s, const char* c) { QString _ret = QIconEnginePlugin::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QIconEnginePlugin_Tr3(const char* s, const char* c, int n) { +struct miqt_string QIconEnginePlugin_Tr3(const char* s, const char* c, int n) { QString _ret = QIconEnginePlugin::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QIconEnginePlugin_TrUtf82(const char* s, const char* c) { +struct miqt_string QIconEnginePlugin_TrUtf82(const char* s, const char* c) { QString _ret = QIconEnginePlugin::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QIconEnginePlugin_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QIconEnginePlugin_TrUtf83(const char* s, const char* c, int n) { QString _ret = QIconEnginePlugin::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -QIconEngine* QIconEnginePlugin_Create1(QIconEnginePlugin* self, struct miqt_string* filename) { - QString filename_QString = QString::fromUtf8(&filename->data, filename->len); +QIconEngine* QIconEnginePlugin_Create1(QIconEnginePlugin* self, struct miqt_string filename) { + QString filename_QString = QString::fromUtf8(filename.data, filename.len); return self->create(filename_QString); } diff --git a/qt/gen_qiconengineplugin.go b/qt/gen_qiconengineplugin.go index e331dfe3..9b6dbe66 100644 --- a/qt/gen_qiconengineplugin.go +++ b/qt/gen_qiconengineplugin.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -51,24 +50,24 @@ func (this *QIconEnginePlugin) MetaObject() *QMetaObject { func (this *QIconEnginePlugin) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QIconEnginePlugin_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QIconEnginePlugin_Metacast(this.h, param1_Cstring)) } func QIconEnginePlugin_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QIconEnginePlugin_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QIconEnginePlugin_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QIconEnginePlugin_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QIconEnginePlugin_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QIconEnginePlugin_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -81,9 +80,9 @@ func QIconEnginePlugin_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QIconEnginePlugin_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QIconEnginePlugin_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -92,9 +91,9 @@ func QIconEnginePlugin_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QIconEnginePlugin_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QIconEnginePlugin_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -103,9 +102,9 @@ func QIconEnginePlugin_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QIconEnginePlugin_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QIconEnginePlugin_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -114,16 +113,18 @@ func QIconEnginePlugin_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QIconEnginePlugin_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QIconEnginePlugin_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QIconEnginePlugin) Create1(filename string) *QIconEngine { - filename_ms := libmiqt.Strdupg(filename) - defer C.free(filename_ms) - return UnsafeNewQIconEngine(unsafe.Pointer(C.QIconEnginePlugin_Create1(this.h, (*C.struct_miqt_string)(filename_ms)))) + filename_ms := C.struct_miqt_string{} + filename_ms.data = C.CString(filename) + filename_ms.len = C.size_t(len(filename)) + defer C.free(unsafe.Pointer(filename_ms.data)) + return UnsafeNewQIconEngine(unsafe.Pointer(C.QIconEnginePlugin_Create1(this.h, filename_ms))) } // Delete this object from C++ memory. diff --git a/qt/gen_qiconengineplugin.h b/qt/gen_qiconengineplugin.h index bd4c9edf..6b098d41 100644 --- a/qt/gen_qiconengineplugin.h +++ b/qt/gen_qiconengineplugin.h @@ -25,14 +25,14 @@ typedef struct QMetaObject QMetaObject; QMetaObject* QIconEnginePlugin_MetaObject(const QIconEnginePlugin* self); void* QIconEnginePlugin_Metacast(QIconEnginePlugin* self, const char* param1); -struct miqt_string* QIconEnginePlugin_Tr(const char* s); -struct miqt_string* QIconEnginePlugin_TrUtf8(const char* s); +struct miqt_string QIconEnginePlugin_Tr(const char* s); +struct miqt_string QIconEnginePlugin_TrUtf8(const char* s); QIconEngine* QIconEnginePlugin_Create(QIconEnginePlugin* self); -struct miqt_string* QIconEnginePlugin_Tr2(const char* s, const char* c); -struct miqt_string* QIconEnginePlugin_Tr3(const char* s, const char* c, int n); -struct miqt_string* QIconEnginePlugin_TrUtf82(const char* s, const char* c); -struct miqt_string* QIconEnginePlugin_TrUtf83(const char* s, const char* c, int n); -QIconEngine* QIconEnginePlugin_Create1(QIconEnginePlugin* self, struct miqt_string* filename); +struct miqt_string QIconEnginePlugin_Tr2(const char* s, const char* c); +struct miqt_string QIconEnginePlugin_Tr3(const char* s, const char* c, int n); +struct miqt_string QIconEnginePlugin_TrUtf82(const char* s, const char* c); +struct miqt_string QIconEnginePlugin_TrUtf83(const char* s, const char* c, int n); +QIconEngine* QIconEnginePlugin_Create1(QIconEnginePlugin* self, struct miqt_string filename); void QIconEnginePlugin_Delete(QIconEnginePlugin* self); #ifdef __cplusplus diff --git a/qt/gen_qidentityproxymodel.cpp b/qt/gen_qidentityproxymodel.cpp index f7396c4e..2c8d34a9 100644 --- a/qt/gen_qidentityproxymodel.cpp +++ b/qt/gen_qidentityproxymodel.cpp @@ -29,18 +29,26 @@ void* QIdentityProxyModel_Metacast(QIdentityProxyModel* self, const char* param1 return self->qt_metacast(param1); } -struct miqt_string* QIdentityProxyModel_Tr(const char* s) { +struct miqt_string QIdentityProxyModel_Tr(const char* s) { QString _ret = QIdentityProxyModel::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QIdentityProxyModel_TrUtf8(const char* s) { +struct miqt_string QIdentityProxyModel_TrUtf8(const char* s) { QString _ret = QIdentityProxyModel::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QIdentityProxyModel_ColumnCount(const QIdentityProxyModel* self) { @@ -120,32 +128,48 @@ bool QIdentityProxyModel_MoveColumns(QIdentityProxyModel* self, QModelIndex* sou return self->moveColumns(*sourceParent, static_cast(sourceColumn), static_cast(count), *destinationParent, static_cast(destinationChild)); } -struct miqt_string* QIdentityProxyModel_Tr2(const char* s, const char* c) { +struct miqt_string QIdentityProxyModel_Tr2(const char* s, const char* c) { QString _ret = QIdentityProxyModel::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QIdentityProxyModel_Tr3(const char* s, const char* c, int n) { +struct miqt_string QIdentityProxyModel_Tr3(const char* s, const char* c, int n) { QString _ret = QIdentityProxyModel::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QIdentityProxyModel_TrUtf82(const char* s, const char* c) { +struct miqt_string QIdentityProxyModel_TrUtf82(const char* s, const char* c) { QString _ret = QIdentityProxyModel::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QIdentityProxyModel_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QIdentityProxyModel_TrUtf83(const char* s, const char* c, int n) { QString _ret = QIdentityProxyModel::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QIdentityProxyModel_ColumnCount1(const QIdentityProxyModel* self, QModelIndex* parent) { diff --git a/qt/gen_qidentityproxymodel.go b/qt/gen_qidentityproxymodel.go index 97a18120..0eeea198 100644 --- a/qt/gen_qidentityproxymodel.go +++ b/qt/gen_qidentityproxymodel.go @@ -62,24 +62,24 @@ func (this *QIdentityProxyModel) MetaObject() *QMetaObject { func (this *QIdentityProxyModel) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QIdentityProxyModel_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QIdentityProxyModel_Metacast(this.h, param1_Cstring)) } func QIdentityProxyModel_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QIdentityProxyModel_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QIdentityProxyModel_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QIdentityProxyModel_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QIdentityProxyModel_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QIdentityProxyModel_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -184,9 +184,9 @@ func QIdentityProxyModel_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QIdentityProxyModel_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QIdentityProxyModel_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -195,9 +195,9 @@ func QIdentityProxyModel_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QIdentityProxyModel_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QIdentityProxyModel_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -206,9 +206,9 @@ func QIdentityProxyModel_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QIdentityProxyModel_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QIdentityProxyModel_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -217,9 +217,9 @@ func QIdentityProxyModel_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QIdentityProxyModel_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QIdentityProxyModel_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qidentityproxymodel.h b/qt/gen_qidentityproxymodel.h index 2014a834..db406e83 100644 --- a/qt/gen_qidentityproxymodel.h +++ b/qt/gen_qidentityproxymodel.h @@ -35,8 +35,8 @@ QIdentityProxyModel* QIdentityProxyModel_new(); QIdentityProxyModel* QIdentityProxyModel_new2(QObject* parent); QMetaObject* QIdentityProxyModel_MetaObject(const QIdentityProxyModel* self); void* QIdentityProxyModel_Metacast(QIdentityProxyModel* self, const char* param1); -struct miqt_string* QIdentityProxyModel_Tr(const char* s); -struct miqt_string* QIdentityProxyModel_TrUtf8(const char* s); +struct miqt_string QIdentityProxyModel_Tr(const char* s); +struct miqt_string QIdentityProxyModel_TrUtf8(const char* s); int QIdentityProxyModel_ColumnCount(const QIdentityProxyModel* self); QModelIndex* QIdentityProxyModel_Index(const QIdentityProxyModel* self, int row, int column); QModelIndex* QIdentityProxyModel_MapFromSource(const QIdentityProxyModel* self, QModelIndex* sourceIndex); @@ -54,10 +54,10 @@ bool QIdentityProxyModel_RemoveColumns(QIdentityProxyModel* self, int column, in bool QIdentityProxyModel_RemoveRows(QIdentityProxyModel* self, int row, int count); bool QIdentityProxyModel_MoveRows(QIdentityProxyModel* self, QModelIndex* sourceParent, int sourceRow, int count, QModelIndex* destinationParent, int destinationChild); bool QIdentityProxyModel_MoveColumns(QIdentityProxyModel* self, QModelIndex* sourceParent, int sourceColumn, int count, QModelIndex* destinationParent, int destinationChild); -struct miqt_string* QIdentityProxyModel_Tr2(const char* s, const char* c); -struct miqt_string* QIdentityProxyModel_Tr3(const char* s, const char* c, int n); -struct miqt_string* QIdentityProxyModel_TrUtf82(const char* s, const char* c); -struct miqt_string* QIdentityProxyModel_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QIdentityProxyModel_Tr2(const char* s, const char* c); +struct miqt_string QIdentityProxyModel_Tr3(const char* s, const char* c, int n); +struct miqt_string QIdentityProxyModel_TrUtf82(const char* s, const char* c); +struct miqt_string QIdentityProxyModel_TrUtf83(const char* s, const char* c, int n); int QIdentityProxyModel_ColumnCount1(const QIdentityProxyModel* self, QModelIndex* parent); QModelIndex* QIdentityProxyModel_Index3(const QIdentityProxyModel* self, int row, int column, QModelIndex* parent); int QIdentityProxyModel_RowCount1(const QIdentityProxyModel* self, QModelIndex* parent); diff --git a/qt/gen_qimage.cpp b/qt/gen_qimage.cpp index 9f327f6b..f53ae7aa 100644 --- a/qt/gen_qimage.cpp +++ b/qt/gen_qimage.cpp @@ -47,8 +47,8 @@ QImage* QImage_new7(const unsigned char* data, int width, int height, int bytesP return new QImage(static_cast(data), static_cast(width), static_cast(height), static_cast(bytesPerLine), static_cast(format)); } -QImage* QImage_new8(struct miqt_string* fileName) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +QImage* QImage_new8(struct miqt_string fileName) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); return new QImage(fileName_QString); } @@ -56,8 +56,8 @@ QImage* QImage_new9(QImage* param1) { return new QImage(*param1); } -QImage* QImage_new10(struct miqt_string* fileName, const char* format) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +QImage* QImage_new10(struct miqt_string fileName, const char* format) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); return new QImage(fileName_QString, format); } @@ -406,8 +406,8 @@ bool QImage_Load(QImage* self, QIODevice* device, const char* format) { return self->load(device, format); } -bool QImage_LoadWithFileName(QImage* self, struct miqt_string* fileName) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +bool QImage_LoadWithFileName(QImage* self, struct miqt_string fileName) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); return self->load(fileName_QString); } @@ -415,12 +415,13 @@ bool QImage_LoadFromData(QImage* self, const unsigned char* buf, int lenVal) { return self->loadFromData(static_cast(buf), static_cast(lenVal)); } -bool QImage_LoadFromDataWithData(QImage* self, QByteArray* data) { - return self->loadFromData(*data); +bool QImage_LoadFromDataWithData(QImage* self, struct miqt_string data) { + QByteArray data_QByteArray(data.data, data.len); + return self->loadFromData(data_QByteArray); } -bool QImage_Save(const QImage* self, struct miqt_string* fileName) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +bool QImage_Save(const QImage* self, struct miqt_string fileName) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); return self->save(fileName_QString); } @@ -432,8 +433,9 @@ QImage* QImage_FromData(const unsigned char* data, int size) { return new QImage(QImage::fromData(static_cast(data), static_cast(size))); } -QImage* QImage_FromDataWithData(QByteArray* data) { - return new QImage(QImage::fromData(*data)); +QImage* QImage_FromDataWithData(struct miqt_string data) { + QByteArray data_QByteArray(data.data, data.len); + return new QImage(QImage::fromData(data_QByteArray)); } long long QImage_CacheKey(const QImage* self) { @@ -472,12 +474,16 @@ void QImage_SetOffset(QImage* self, QPoint* offset) { struct miqt_array* QImage_TextKeys(const QImage* self) { QStringList _ret = self->textKeys(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -485,16 +491,20 @@ struct miqt_array* QImage_TextKeys(const QImage* self) { return _out; } -struct miqt_string* QImage_Text(const QImage* self) { +struct miqt_string QImage_Text(const QImage* self) { QString _ret = self->text(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QImage_SetText(QImage* self, struct miqt_string* key, struct miqt_string* value) { - QString key_QString = QString::fromUtf8(&key->data, key->len); - QString value_QString = QString::fromUtf8(&value->data, value->len); +void QImage_SetText(QImage* self, struct miqt_string key, struct miqt_string value) { + QString key_QString = QString::fromUtf8(key.data, key.len); + QString value_QString = QString::fromUtf8(value.data, value.len); self->setText(key_QString, value_QString); } @@ -589,8 +599,8 @@ void QImage_InvertPixels1(QImage* self, int param1) { self->invertPixels(static_cast(param1)); } -bool QImage_Load2(QImage* self, struct miqt_string* fileName, const char* format) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +bool QImage_Load2(QImage* self, struct miqt_string fileName, const char* format) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); return self->load(fileName_QString, format); } @@ -598,17 +608,18 @@ bool QImage_LoadFromData3(QImage* self, const unsigned char* buf, int lenVal, co return self->loadFromData(static_cast(buf), static_cast(lenVal), format); } -bool QImage_LoadFromData2(QImage* self, QByteArray* data, const char* aformat) { - return self->loadFromData(*data, aformat); +bool QImage_LoadFromData2(QImage* self, struct miqt_string data, const char* aformat) { + QByteArray data_QByteArray(data.data, data.len); + return self->loadFromData(data_QByteArray, aformat); } -bool QImage_Save2(const QImage* self, struct miqt_string* fileName, const char* format) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +bool QImage_Save2(const QImage* self, struct miqt_string fileName, const char* format) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); return self->save(fileName_QString, format); } -bool QImage_Save3(const QImage* self, struct miqt_string* fileName, const char* format, int quality) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +bool QImage_Save3(const QImage* self, struct miqt_string fileName, const char* format, int quality) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); return self->save(fileName_QString, format, static_cast(quality)); } @@ -624,16 +635,21 @@ QImage* QImage_FromData3(const unsigned char* data, int size, const char* format return new QImage(QImage::fromData(static_cast(data), static_cast(size), format)); } -QImage* QImage_FromData2(QByteArray* data, const char* format) { - return new QImage(QImage::fromData(*data, format)); +QImage* QImage_FromData2(struct miqt_string data, const char* format) { + QByteArray data_QByteArray(data.data, data.len); + return new QImage(QImage::fromData(data_QByteArray, format)); } -struct miqt_string* QImage_Text1(const QImage* self, struct miqt_string* key) { - QString key_QString = QString::fromUtf8(&key->data, key->len); +struct miqt_string QImage_Text1(const QImage* self, struct miqt_string key) { + QString key_QString = QString::fromUtf8(key.data, key.len); QString _ret = self->text(key_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QImage_Delete(QImage* self) { diff --git a/qt/gen_qimage.go b/qt/gen_qimage.go index 2f201ce4..5bea9ee8 100644 --- a/qt/gen_qimage.go +++ b/qt/gen_qimage.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -131,9 +130,11 @@ func NewQImage7(data *byte, width int, height int, bytesPerLine int, format QIma // NewQImage8 constructs a new QImage object. func NewQImage8(fileName string) *QImage { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - ret := C.QImage_new8((*C.struct_miqt_string)(fileName_ms)) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + ret := C.QImage_new8(fileName_ms) return newQImage(ret) } @@ -145,11 +146,13 @@ func NewQImage9(param1 *QImage) *QImage { // NewQImage10 constructs a new QImage object. func NewQImage10(fileName string, format string) *QImage { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) format_Cstring := C.CString(format) defer C.free(unsafe.Pointer(format_Cstring)) - ret := C.QImage_new10((*C.struct_miqt_string)(fileName_ms), format_Cstring) + ret := C.QImage_new10(fileName_ms, format_Cstring) return newQImage(ret) } @@ -563,23 +566,30 @@ func (this *QImage) Load(device *QIODevice, format string) bool { } func (this *QImage) LoadWithFileName(fileName string) bool { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - return (bool)(C.QImage_LoadWithFileName(this.h, (*C.struct_miqt_string)(fileName_ms))) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + return (bool)(C.QImage_LoadWithFileName(this.h, fileName_ms)) } func (this *QImage) LoadFromData(buf *byte, lenVal int) bool { return (bool)(C.QImage_LoadFromData(this.h, (*C.uchar)(unsafe.Pointer(buf)), (C.int)(lenVal))) } -func (this *QImage) LoadFromDataWithData(data *QByteArray) bool { - return (bool)(C.QImage_LoadFromDataWithData(this.h, data.cPointer())) +func (this *QImage) LoadFromDataWithData(data []byte) bool { + data_alias := C.struct_miqt_string{} + data_alias.data = (*C.char)(unsafe.Pointer(&data[0])) + data_alias.len = C.size_t(len(data)) + return (bool)(C.QImage_LoadFromDataWithData(this.h, data_alias)) } func (this *QImage) Save(fileName string) bool { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - return (bool)(C.QImage_Save(this.h, (*C.struct_miqt_string)(fileName_ms))) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + return (bool)(C.QImage_Save(this.h, fileName_ms)) } func (this *QImage) SaveWithDevice(device *QIODevice) bool { @@ -593,8 +603,11 @@ func QImage_FromData(data *byte, size int) *QImage { return _goptr } -func QImage_FromDataWithData(data *QByteArray) *QImage { - _ret := C.QImage_FromDataWithData(data.cPointer()) +func QImage_FromDataWithData(data []byte) *QImage { + data_alias := C.struct_miqt_string{} + data_alias.data = (*C.char)(unsafe.Pointer(&data[0])) + data_alias.len = C.size_t(len(data)) + _ret := C.QImage_FromDataWithData(data_alias) _goptr := newQImage(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -638,11 +651,11 @@ func (this *QImage) SetOffset(offset *QPoint) { func (this *QImage) TextKeys() []string { var _ma *C.struct_miqt_array = C.QImage_TextKeys(this.h) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -650,18 +663,22 @@ func (this *QImage) TextKeys() []string { } func (this *QImage) Text() string { - var _ms *C.struct_miqt_string = C.QImage_Text(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QImage_Text(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QImage) SetText(key string, value string) { - key_ms := libmiqt.Strdupg(key) - defer C.free(key_ms) - value_ms := libmiqt.Strdupg(value) - defer C.free(value_ms) - C.QImage_SetText(this.h, (*C.struct_miqt_string)(key_ms), (*C.struct_miqt_string)(value_ms)) + key_ms := C.struct_miqt_string{} + key_ms.data = C.CString(key) + key_ms.len = C.size_t(len(key)) + defer C.free(unsafe.Pointer(key_ms.data)) + value_ms := C.struct_miqt_string{} + value_ms.data = C.CString(value) + value_ms.len = C.size_t(len(value)) + defer C.free(unsafe.Pointer(value_ms.data)) + C.QImage_SetText(this.h, key_ms, value_ms) } func (this *QImage) PixelFormat() *QPixelFormat { @@ -811,11 +828,13 @@ func (this *QImage) InvertPixels1(param1 QImage__InvertMode) { } func (this *QImage) Load2(fileName string, format string) bool { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) format_Cstring := C.CString(format) defer C.free(unsafe.Pointer(format_Cstring)) - return (bool)(C.QImage_Load2(this.h, (*C.struct_miqt_string)(fileName_ms), format_Cstring)) + return (bool)(C.QImage_Load2(this.h, fileName_ms, format_Cstring)) } func (this *QImage) LoadFromData3(buf *byte, lenVal int, format string) bool { @@ -824,26 +843,33 @@ func (this *QImage) LoadFromData3(buf *byte, lenVal int, format string) bool { return (bool)(C.QImage_LoadFromData3(this.h, (*C.uchar)(unsafe.Pointer(buf)), (C.int)(lenVal), format_Cstring)) } -func (this *QImage) LoadFromData2(data *QByteArray, aformat string) bool { +func (this *QImage) LoadFromData2(data []byte, aformat string) bool { + data_alias := C.struct_miqt_string{} + data_alias.data = (*C.char)(unsafe.Pointer(&data[0])) + data_alias.len = C.size_t(len(data)) aformat_Cstring := C.CString(aformat) defer C.free(unsafe.Pointer(aformat_Cstring)) - return (bool)(C.QImage_LoadFromData2(this.h, data.cPointer(), aformat_Cstring)) + return (bool)(C.QImage_LoadFromData2(this.h, data_alias, aformat_Cstring)) } func (this *QImage) Save2(fileName string, format string) bool { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) format_Cstring := C.CString(format) defer C.free(unsafe.Pointer(format_Cstring)) - return (bool)(C.QImage_Save2(this.h, (*C.struct_miqt_string)(fileName_ms), format_Cstring)) + return (bool)(C.QImage_Save2(this.h, fileName_ms, format_Cstring)) } func (this *QImage) Save3(fileName string, format string, quality int) bool { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) format_Cstring := C.CString(format) defer C.free(unsafe.Pointer(format_Cstring)) - return (bool)(C.QImage_Save3(this.h, (*C.struct_miqt_string)(fileName_ms), format_Cstring, (C.int)(quality))) + return (bool)(C.QImage_Save3(this.h, fileName_ms, format_Cstring, (C.int)(quality))) } func (this *QImage) Save22(device *QIODevice, format string) bool { @@ -867,21 +893,26 @@ func QImage_FromData3(data *byte, size int, format string) *QImage { return _goptr } -func QImage_FromData2(data *QByteArray, format string) *QImage { +func QImage_FromData2(data []byte, format string) *QImage { + data_alias := C.struct_miqt_string{} + data_alias.data = (*C.char)(unsafe.Pointer(&data[0])) + data_alias.len = C.size_t(len(data)) format_Cstring := C.CString(format) defer C.free(unsafe.Pointer(format_Cstring)) - _ret := C.QImage_FromData2(data.cPointer(), format_Cstring) + _ret := C.QImage_FromData2(data_alias, format_Cstring) _goptr := newQImage(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QImage) Text1(key string) string { - key_ms := libmiqt.Strdupg(key) - defer C.free(key_ms) - var _ms *C.struct_miqt_string = C.QImage_Text1(this.h, (*C.struct_miqt_string)(key_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + key_ms := C.struct_miqt_string{} + key_ms.data = C.CString(key) + key_ms.len = C.size_t(len(key)) + defer C.free(unsafe.Pointer(key_ms.data)) + var _ms C.struct_miqt_string = C.QImage_Text1(this.h, key_ms) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qimage.h b/qt/gen_qimage.h index 9fe73b55..f215f074 100644 --- a/qt/gen_qimage.h +++ b/qt/gen_qimage.h @@ -50,9 +50,9 @@ QImage* QImage_new4(unsigned char* data, int width, int height, int format); QImage* QImage_new5(const unsigned char* data, int width, int height, int format); QImage* QImage_new6(unsigned char* data, int width, int height, int bytesPerLine, int format); QImage* QImage_new7(const unsigned char* data, int width, int height, int bytesPerLine, int format); -QImage* QImage_new8(struct miqt_string* fileName); +QImage* QImage_new8(struct miqt_string fileName); QImage* QImage_new9(QImage* param1); -QImage* QImage_new10(struct miqt_string* fileName, const char* format); +QImage* QImage_new10(struct miqt_string fileName, const char* format); void QImage_OperatorAssign(QImage* self, QImage* param1); void QImage_Swap(QImage* self, QImage* other); bool QImage_IsNull(const QImage* self); @@ -131,13 +131,13 @@ void QImage_ConvertToColorSpace(QImage* self, QColorSpace* param1); void QImage_SetColorSpace(QImage* self, QColorSpace* colorSpace); void QImage_ApplyColorTransform(QImage* self, QColorTransform* transform); bool QImage_Load(QImage* self, QIODevice* device, const char* format); -bool QImage_LoadWithFileName(QImage* self, struct miqt_string* fileName); +bool QImage_LoadWithFileName(QImage* self, struct miqt_string fileName); bool QImage_LoadFromData(QImage* self, const unsigned char* buf, int lenVal); -bool QImage_LoadFromDataWithData(QImage* self, QByteArray* data); -bool QImage_Save(const QImage* self, struct miqt_string* fileName); +bool QImage_LoadFromDataWithData(QImage* self, struct miqt_string data); +bool QImage_Save(const QImage* self, struct miqt_string fileName); bool QImage_SaveWithDevice(const QImage* self, QIODevice* device); QImage* QImage_FromData(const unsigned char* data, int size); -QImage* QImage_FromDataWithData(QByteArray* data); +QImage* QImage_FromDataWithData(struct miqt_string data); long long QImage_CacheKey(const QImage* self); QPaintEngine* QImage_PaintEngine(const QImage* self); int QImage_DotsPerMeterX(const QImage* self); @@ -147,8 +147,8 @@ void QImage_SetDotsPerMeterY(QImage* self, int dotsPerMeterY); QPoint* QImage_Offset(const QImage* self); void QImage_SetOffset(QImage* self, QPoint* offset); struct miqt_array* QImage_TextKeys(const QImage* self); -struct miqt_string* QImage_Text(const QImage* self); -void QImage_SetText(QImage* self, struct miqt_string* key, struct miqt_string* value); +struct miqt_string QImage_Text(const QImage* self); +void QImage_SetText(QImage* self, struct miqt_string key, struct miqt_string value); QPixelFormat* QImage_PixelFormat(const QImage* self); QPixelFormat* QImage_ToPixelFormat(int format); int QImage_ToImageFormat(QPixelFormat* format); @@ -170,16 +170,16 @@ QImage* QImage_Transformed22(const QImage* self, QTransform* matrix, int mode); QImage* QImage_Mirrored1(const QImage* self, bool horizontally); QImage* QImage_Mirrored2(const QImage* self, bool horizontally, bool vertically); void QImage_InvertPixels1(QImage* self, int param1); -bool QImage_Load2(QImage* self, struct miqt_string* fileName, const char* format); +bool QImage_Load2(QImage* self, struct miqt_string fileName, const char* format); bool QImage_LoadFromData3(QImage* self, const unsigned char* buf, int lenVal, const char* format); -bool QImage_LoadFromData2(QImage* self, QByteArray* data, const char* aformat); -bool QImage_Save2(const QImage* self, struct miqt_string* fileName, const char* format); -bool QImage_Save3(const QImage* self, struct miqt_string* fileName, const char* format, int quality); +bool QImage_LoadFromData2(QImage* self, struct miqt_string data, const char* aformat); +bool QImage_Save2(const QImage* self, struct miqt_string fileName, const char* format); +bool QImage_Save3(const QImage* self, struct miqt_string fileName, const char* format, int quality); bool QImage_Save22(const QImage* self, QIODevice* device, const char* format); bool QImage_Save32(const QImage* self, QIODevice* device, const char* format, int quality); QImage* QImage_FromData3(const unsigned char* data, int size, const char* format); -QImage* QImage_FromData2(QByteArray* data, const char* format); -struct miqt_string* QImage_Text1(const QImage* self, struct miqt_string* key); +QImage* QImage_FromData2(struct miqt_string data, const char* format); +struct miqt_string QImage_Text1(const QImage* self, struct miqt_string key); void QImage_Delete(QImage* self); #ifdef __cplusplus diff --git a/qt/gen_qimageiohandler.cpp b/qt/gen_qimageiohandler.cpp index a5a393b3..367a9977 100644 --- a/qt/gen_qimageiohandler.cpp +++ b/qt/gen_qimageiohandler.cpp @@ -21,20 +21,32 @@ QIODevice* QImageIOHandler_Device(const QImageIOHandler* self) { return self->device(); } -void QImageIOHandler_SetFormat(QImageIOHandler* self, QByteArray* format) { - self->setFormat(*format); +void QImageIOHandler_SetFormat(QImageIOHandler* self, struct miqt_string format) { + QByteArray format_QByteArray(format.data, format.len); + self->setFormat(format_QByteArray); } -void QImageIOHandler_SetFormatWithFormat(const QImageIOHandler* self, QByteArray* format) { - self->setFormat(*format); +void QImageIOHandler_SetFormatWithFormat(const QImageIOHandler* self, struct miqt_string format) { + QByteArray format_QByteArray(format.data, format.len); + self->setFormat(format_QByteArray); } -QByteArray* QImageIOHandler_Format(const QImageIOHandler* self) { - return new QByteArray(self->format()); +struct miqt_string QImageIOHandler_Format(const QImageIOHandler* self) { + QByteArray _qb = self->format(); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } -QByteArray* QImageIOHandler_Name(const QImageIOHandler* self) { - return new QByteArray(self->name()); +struct miqt_string QImageIOHandler_Name(const QImageIOHandler* self) { + QByteArray _qb = self->name(); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } bool QImageIOHandler_CanRead(const QImageIOHandler* self) { @@ -101,22 +113,31 @@ void* QImageIOPlugin_Metacast(QImageIOPlugin* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QImageIOPlugin_Tr(const char* s) { +struct miqt_string QImageIOPlugin_Tr(const char* s) { QString _ret = QImageIOPlugin::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QImageIOPlugin_TrUtf8(const char* s) { +struct miqt_string QImageIOPlugin_TrUtf8(const char* s) { QString _ret = QImageIOPlugin::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -int QImageIOPlugin_Capabilities(const QImageIOPlugin* self, QIODevice* device, QByteArray* format) { - QImageIOPlugin::Capabilities _ret = self->capabilities(device, *format); +int QImageIOPlugin_Capabilities(const QImageIOPlugin* self, QIODevice* device, struct miqt_string format) { + QByteArray format_QByteArray(format.data, format.len); + QImageIOPlugin::Capabilities _ret = self->capabilities(device, format_QByteArray); return static_cast(_ret); } @@ -124,36 +145,53 @@ QImageIOHandler* QImageIOPlugin_Create(const QImageIOPlugin* self, QIODevice* de return self->create(device); } -struct miqt_string* QImageIOPlugin_Tr2(const char* s, const char* c) { +struct miqt_string QImageIOPlugin_Tr2(const char* s, const char* c) { QString _ret = QImageIOPlugin::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QImageIOPlugin_Tr3(const char* s, const char* c, int n) { +struct miqt_string QImageIOPlugin_Tr3(const char* s, const char* c, int n) { QString _ret = QImageIOPlugin::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QImageIOPlugin_TrUtf82(const char* s, const char* c) { +struct miqt_string QImageIOPlugin_TrUtf82(const char* s, const char* c) { QString _ret = QImageIOPlugin::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QImageIOPlugin_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QImageIOPlugin_TrUtf83(const char* s, const char* c, int n) { QString _ret = QImageIOPlugin::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -QImageIOHandler* QImageIOPlugin_Create2(const QImageIOPlugin* self, QIODevice* device, QByteArray* format) { - return self->create(device, *format); +QImageIOHandler* QImageIOPlugin_Create2(const QImageIOPlugin* self, QIODevice* device, struct miqt_string format) { + QByteArray format_QByteArray(format.data, format.len); + return self->create(device, format_QByteArray); } void QImageIOPlugin_Delete(QImageIOPlugin* self) { diff --git a/qt/gen_qimageiohandler.go b/qt/gen_qimageiohandler.go index 0c5c9753..984e8a02 100644 --- a/qt/gen_qimageiohandler.go +++ b/qt/gen_qimageiohandler.go @@ -96,26 +96,32 @@ func (this *QImageIOHandler) Device() *QIODevice { return UnsafeNewQIODevice(unsafe.Pointer(C.QImageIOHandler_Device(this.h))) } -func (this *QImageIOHandler) SetFormat(format *QByteArray) { - C.QImageIOHandler_SetFormat(this.h, format.cPointer()) +func (this *QImageIOHandler) SetFormat(format []byte) { + format_alias := C.struct_miqt_string{} + format_alias.data = (*C.char)(unsafe.Pointer(&format[0])) + format_alias.len = C.size_t(len(format)) + C.QImageIOHandler_SetFormat(this.h, format_alias) } -func (this *QImageIOHandler) SetFormatWithFormat(format *QByteArray) { - C.QImageIOHandler_SetFormatWithFormat(this.h, format.cPointer()) +func (this *QImageIOHandler) SetFormatWithFormat(format []byte) { + format_alias := C.struct_miqt_string{} + format_alias.data = (*C.char)(unsafe.Pointer(&format[0])) + format_alias.len = C.size_t(len(format)) + C.QImageIOHandler_SetFormatWithFormat(this.h, format_alias) } -func (this *QImageIOHandler) Format() *QByteArray { - _ret := C.QImageIOHandler_Format(this.h) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QImageIOHandler) Format() []byte { + var _bytearray C.struct_miqt_string = C.QImageIOHandler_Format(this.h) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } -func (this *QImageIOHandler) Name() *QByteArray { - _ret := C.QImageIOHandler_Name(this.h) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QImageIOHandler) Name() []byte { + var _bytearray C.struct_miqt_string = C.QImageIOHandler_Name(this.h) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } func (this *QImageIOHandler) CanRead() bool { @@ -227,29 +233,32 @@ func (this *QImageIOPlugin) MetaObject() *QMetaObject { func (this *QImageIOPlugin) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QImageIOPlugin_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QImageIOPlugin_Metacast(this.h, param1_Cstring)) } func QImageIOPlugin_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QImageIOPlugin_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QImageIOPlugin_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QImageIOPlugin_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QImageIOPlugin_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QImageIOPlugin_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } -func (this *QImageIOPlugin) Capabilities(device *QIODevice, format *QByteArray) QImageIOPlugin__Capability { - return (QImageIOPlugin__Capability)(C.QImageIOPlugin_Capabilities(this.h, device.cPointer(), format.cPointer())) +func (this *QImageIOPlugin) Capabilities(device *QIODevice, format []byte) QImageIOPlugin__Capability { + format_alias := C.struct_miqt_string{} + format_alias.data = (*C.char)(unsafe.Pointer(&format[0])) + format_alias.len = C.size_t(len(format)) + return (QImageIOPlugin__Capability)(C.QImageIOPlugin_Capabilities(this.h, device.cPointer(), format_alias)) } func (this *QImageIOPlugin) Create(device *QIODevice) *QImageIOHandler { @@ -261,9 +270,9 @@ func QImageIOPlugin_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QImageIOPlugin_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QImageIOPlugin_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -272,9 +281,9 @@ func QImageIOPlugin_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QImageIOPlugin_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QImageIOPlugin_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -283,9 +292,9 @@ func QImageIOPlugin_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QImageIOPlugin_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QImageIOPlugin_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -294,14 +303,17 @@ func QImageIOPlugin_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QImageIOPlugin_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QImageIOPlugin_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } -func (this *QImageIOPlugin) Create2(device *QIODevice, format *QByteArray) *QImageIOHandler { - return UnsafeNewQImageIOHandler(unsafe.Pointer(C.QImageIOPlugin_Create2(this.h, device.cPointer(), format.cPointer()))) +func (this *QImageIOPlugin) Create2(device *QIODevice, format []byte) *QImageIOHandler { + format_alias := C.struct_miqt_string{} + format_alias.data = (*C.char)(unsafe.Pointer(&format[0])) + format_alias.len = C.size_t(len(format)) + return UnsafeNewQImageIOHandler(unsafe.Pointer(C.QImageIOPlugin_Create2(this.h, device.cPointer(), format_alias))) } // Delete this object from C++ memory. diff --git a/qt/gen_qimageiohandler.h b/qt/gen_qimageiohandler.h index d2699036..6d8bda97 100644 --- a/qt/gen_qimageiohandler.h +++ b/qt/gen_qimageiohandler.h @@ -35,10 +35,10 @@ typedef struct QVariant QVariant; void QImageIOHandler_SetDevice(QImageIOHandler* self, QIODevice* device); QIODevice* QImageIOHandler_Device(const QImageIOHandler* self); -void QImageIOHandler_SetFormat(QImageIOHandler* self, QByteArray* format); -void QImageIOHandler_SetFormatWithFormat(const QImageIOHandler* self, QByteArray* format); -QByteArray* QImageIOHandler_Format(const QImageIOHandler* self); -QByteArray* QImageIOHandler_Name(const QImageIOHandler* self); +void QImageIOHandler_SetFormat(QImageIOHandler* self, struct miqt_string format); +void QImageIOHandler_SetFormatWithFormat(const QImageIOHandler* self, struct miqt_string format); +struct miqt_string QImageIOHandler_Format(const QImageIOHandler* self); +struct miqt_string QImageIOHandler_Name(const QImageIOHandler* self); bool QImageIOHandler_CanRead(const QImageIOHandler* self); bool QImageIOHandler_Read(QImageIOHandler* self, QImage* image); bool QImageIOHandler_Write(QImageIOHandler* self, QImage* image); @@ -56,15 +56,15 @@ void QImageIOHandler_Delete(QImageIOHandler* self); QMetaObject* QImageIOPlugin_MetaObject(const QImageIOPlugin* self); void* QImageIOPlugin_Metacast(QImageIOPlugin* self, const char* param1); -struct miqt_string* QImageIOPlugin_Tr(const char* s); -struct miqt_string* QImageIOPlugin_TrUtf8(const char* s); -int QImageIOPlugin_Capabilities(const QImageIOPlugin* self, QIODevice* device, QByteArray* format); +struct miqt_string QImageIOPlugin_Tr(const char* s); +struct miqt_string QImageIOPlugin_TrUtf8(const char* s); +int QImageIOPlugin_Capabilities(const QImageIOPlugin* self, QIODevice* device, struct miqt_string format); QImageIOHandler* QImageIOPlugin_Create(const QImageIOPlugin* self, QIODevice* device); -struct miqt_string* QImageIOPlugin_Tr2(const char* s, const char* c); -struct miqt_string* QImageIOPlugin_Tr3(const char* s, const char* c, int n); -struct miqt_string* QImageIOPlugin_TrUtf82(const char* s, const char* c); -struct miqt_string* QImageIOPlugin_TrUtf83(const char* s, const char* c, int n); -QImageIOHandler* QImageIOPlugin_Create2(const QImageIOPlugin* self, QIODevice* device, QByteArray* format); +struct miqt_string QImageIOPlugin_Tr2(const char* s, const char* c); +struct miqt_string QImageIOPlugin_Tr3(const char* s, const char* c, int n); +struct miqt_string QImageIOPlugin_TrUtf82(const char* s, const char* c); +struct miqt_string QImageIOPlugin_TrUtf83(const char* s, const char* c, int n); +QImageIOHandler* QImageIOPlugin_Create2(const QImageIOPlugin* self, QIODevice* device, struct miqt_string format); void QImageIOPlugin_Delete(QImageIOPlugin* self); #ifdef __cplusplus diff --git a/qt/gen_qimagereader.cpp b/qt/gen_qimagereader.cpp index 8a133b5c..388065d5 100644 --- a/qt/gen_qimagereader.cpp +++ b/qt/gen_qimagereader.cpp @@ -21,40 +21,56 @@ QImageReader* QImageReader_new2(QIODevice* device) { return new QImageReader(device); } -QImageReader* QImageReader_new3(struct miqt_string* fileName) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +QImageReader* QImageReader_new3(struct miqt_string fileName) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); return new QImageReader(fileName_QString); } -QImageReader* QImageReader_new4(QIODevice* device, QByteArray* format) { - return new QImageReader(device, *format); +QImageReader* QImageReader_new4(QIODevice* device, struct miqt_string format) { + QByteArray format_QByteArray(format.data, format.len); + return new QImageReader(device, format_QByteArray); } -QImageReader* QImageReader_new5(struct miqt_string* fileName, QByteArray* format) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); - return new QImageReader(fileName_QString, *format); +QImageReader* QImageReader_new5(struct miqt_string fileName, struct miqt_string format) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); + QByteArray format_QByteArray(format.data, format.len); + return new QImageReader(fileName_QString, format_QByteArray); } -struct miqt_string* QImageReader_Tr(const char* sourceText) { +struct miqt_string QImageReader_Tr(const char* sourceText) { QString _ret = QImageReader::tr(sourceText); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QImageReader_TrUtf8(const char* sourceText) { +struct miqt_string QImageReader_TrUtf8(const char* sourceText) { QString _ret = QImageReader::trUtf8(sourceText); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QImageReader_SetFormat(QImageReader* self, QByteArray* format) { - self->setFormat(*format); +void QImageReader_SetFormat(QImageReader* self, struct miqt_string format) { + QByteArray format_QByteArray(format.data, format.len); + self->setFormat(format_QByteArray); } -QByteArray* QImageReader_Format(const QImageReader* self) { - return new QByteArray(self->format()); +struct miqt_string QImageReader_Format(const QImageReader* self) { + QByteArray _qb = self->format(); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } void QImageReader_SetAutoDetectImageFormat(QImageReader* self, bool enabled) { @@ -81,16 +97,20 @@ QIODevice* QImageReader_Device(const QImageReader* self) { return self->device(); } -void QImageReader_SetFileName(QImageReader* self, struct miqt_string* fileName) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +void QImageReader_SetFileName(QImageReader* self, struct miqt_string fileName) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); self->setFileName(fileName_QString); } -struct miqt_string* QImageReader_FileName(const QImageReader* self) { +struct miqt_string QImageReader_FileName(const QImageReader* self) { QString _ret = self->fileName(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QSize* QImageReader_Size(const QImageReader* self) { @@ -105,12 +125,16 @@ int QImageReader_ImageFormat(const QImageReader* self) { struct miqt_array* QImageReader_TextKeys(const QImageReader* self) { QStringList _ret = self->textKeys(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -118,12 +142,16 @@ struct miqt_array* QImageReader_TextKeys(const QImageReader* self) { return _out; } -struct miqt_string* QImageReader_Text(const QImageReader* self, struct miqt_string* key) { - QString key_QString = QString::fromUtf8(&key->data, key->len); +struct miqt_string QImageReader_Text(const QImageReader* self, struct miqt_string key) { + QString key_QString = QString::fromUtf8(key.data, key.len); QString _ret = self->text(key_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QImageReader_SetClipRect(QImageReader* self, QRect* rect) { @@ -191,16 +219,26 @@ float QImageReader_Gamma(const QImageReader* self) { return self->gamma(); } -QByteArray* QImageReader_SubType(const QImageReader* self) { - return new QByteArray(self->subType()); +struct miqt_string QImageReader_SubType(const QImageReader* self) { + QByteArray _qb = self->subType(); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } struct miqt_array* QImageReader_SupportedSubTypes(const QImageReader* self) { QList _ret = self->supportedSubTypes(); // Convert QList<> from C++ memory to manually-managed C memory - QByteArray** _arr = static_cast(malloc(sizeof(QByteArray*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { - _arr[i] = new QByteArray(_ret[i]); + QByteArray _lv_qb = _ret[i]; + struct miqt_string _lv_ms; + _lv_ms.len = _lv_qb.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_qb.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -253,32 +291,51 @@ int QImageReader_Error(const QImageReader* self) { return static_cast(_ret); } -struct miqt_string* QImageReader_ErrorString(const QImageReader* self) { +struct miqt_string QImageReader_ErrorString(const QImageReader* self) { QString _ret = self->errorString(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } bool QImageReader_SupportsOption(const QImageReader* self, int option) { return self->supportsOption(static_cast(option)); } -QByteArray* QImageReader_ImageFormatWithFileName(struct miqt_string* fileName) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); - return new QByteArray(QImageReader::imageFormat(fileName_QString)); +struct miqt_string QImageReader_ImageFormatWithFileName(struct miqt_string fileName) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); + QByteArray _qb = QImageReader::imageFormat(fileName_QString); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } -QByteArray* QImageReader_ImageFormatWithDevice(QIODevice* device) { - return new QByteArray(QImageReader::imageFormat(device)); +struct miqt_string QImageReader_ImageFormatWithDevice(QIODevice* device) { + QByteArray _qb = QImageReader::imageFormat(device); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } struct miqt_array* QImageReader_SupportedImageFormats() { QList _ret = QImageReader::supportedImageFormats(); // Convert QList<> from C++ memory to manually-managed C memory - QByteArray** _arr = static_cast(malloc(sizeof(QByteArray*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { - _arr[i] = new QByteArray(_ret[i]); + QByteArray _lv_qb = _ret[i]; + struct miqt_string _lv_ms; + _lv_ms.len = _lv_qb.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_qb.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -289,9 +346,14 @@ struct miqt_array* QImageReader_SupportedImageFormats() { struct miqt_array* QImageReader_SupportedMimeTypes() { QList _ret = QImageReader::supportedMimeTypes(); // Convert QList<> from C++ memory to manually-managed C memory - QByteArray** _arr = static_cast(malloc(sizeof(QByteArray*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { - _arr[i] = new QByteArray(_ret[i]); + QByteArray _lv_qb = _ret[i]; + struct miqt_string _lv_ms; + _lv_ms.len = _lv_qb.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_qb.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -299,12 +361,18 @@ struct miqt_array* QImageReader_SupportedMimeTypes() { return _out; } -struct miqt_array* QImageReader_ImageFormatsForMimeType(QByteArray* mimeType) { - QList _ret = QImageReader::imageFormatsForMimeType(*mimeType); +struct miqt_array* QImageReader_ImageFormatsForMimeType(struct miqt_string mimeType) { + QByteArray mimeType_QByteArray(mimeType.data, mimeType.len); + QList _ret = QImageReader::imageFormatsForMimeType(mimeType_QByteArray); // Convert QList<> from C++ memory to manually-managed C memory - QByteArray** _arr = static_cast(malloc(sizeof(QByteArray*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { - _arr[i] = new QByteArray(_ret[i]); + QByteArray _lv_qb = _ret[i]; + struct miqt_string _lv_ms; + _lv_ms.len = _lv_qb.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_qb.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -312,32 +380,48 @@ struct miqt_array* QImageReader_ImageFormatsForMimeType(QByteArray* mimeType) { return _out; } -struct miqt_string* QImageReader_Tr2(const char* sourceText, const char* disambiguation) { +struct miqt_string QImageReader_Tr2(const char* sourceText, const char* disambiguation) { QString _ret = QImageReader::tr(sourceText, disambiguation); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QImageReader_Tr3(const char* sourceText, const char* disambiguation, int n) { +struct miqt_string QImageReader_Tr3(const char* sourceText, const char* disambiguation, int n) { QString _ret = QImageReader::tr(sourceText, disambiguation, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QImageReader_TrUtf82(const char* sourceText, const char* disambiguation) { +struct miqt_string QImageReader_TrUtf82(const char* sourceText, const char* disambiguation) { QString _ret = QImageReader::trUtf8(sourceText, disambiguation); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QImageReader_TrUtf83(const char* sourceText, const char* disambiguation, int n) { +struct miqt_string QImageReader_TrUtf83(const char* sourceText, const char* disambiguation, int n) { QString _ret = QImageReader::trUtf8(sourceText, disambiguation, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QImageReader_Delete(QImageReader* self) { diff --git a/qt/gen_qimagereader.go b/qt/gen_qimagereader.go index 07588359..bee32cb2 100644 --- a/qt/gen_qimagereader.go +++ b/qt/gen_qimagereader.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -67,53 +66,66 @@ func NewQImageReader2(device *QIODevice) *QImageReader { // NewQImageReader3 constructs a new QImageReader object. func NewQImageReader3(fileName string) *QImageReader { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - ret := C.QImageReader_new3((*C.struct_miqt_string)(fileName_ms)) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + ret := C.QImageReader_new3(fileName_ms) return newQImageReader(ret) } // NewQImageReader4 constructs a new QImageReader object. -func NewQImageReader4(device *QIODevice, format *QByteArray) *QImageReader { - ret := C.QImageReader_new4(device.cPointer(), format.cPointer()) +func NewQImageReader4(device *QIODevice, format []byte) *QImageReader { + format_alias := C.struct_miqt_string{} + format_alias.data = (*C.char)(unsafe.Pointer(&format[0])) + format_alias.len = C.size_t(len(format)) + ret := C.QImageReader_new4(device.cPointer(), format_alias) return newQImageReader(ret) } // NewQImageReader5 constructs a new QImageReader object. -func NewQImageReader5(fileName string, format *QByteArray) *QImageReader { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - ret := C.QImageReader_new5((*C.struct_miqt_string)(fileName_ms), format.cPointer()) +func NewQImageReader5(fileName string, format []byte) *QImageReader { + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + format_alias := C.struct_miqt_string{} + format_alias.data = (*C.char)(unsafe.Pointer(&format[0])) + format_alias.len = C.size_t(len(format)) + ret := C.QImageReader_new5(fileName_ms, format_alias) return newQImageReader(ret) } func QImageReader_Tr(sourceText string) string { sourceText_Cstring := C.CString(sourceText) defer C.free(unsafe.Pointer(sourceText_Cstring)) - var _ms *C.struct_miqt_string = C.QImageReader_Tr(sourceText_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QImageReader_Tr(sourceText_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QImageReader_TrUtf8(sourceText string) string { sourceText_Cstring := C.CString(sourceText) defer C.free(unsafe.Pointer(sourceText_Cstring)) - var _ms *C.struct_miqt_string = C.QImageReader_TrUtf8(sourceText_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QImageReader_TrUtf8(sourceText_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } -func (this *QImageReader) SetFormat(format *QByteArray) { - C.QImageReader_SetFormat(this.h, format.cPointer()) +func (this *QImageReader) SetFormat(format []byte) { + format_alias := C.struct_miqt_string{} + format_alias.data = (*C.char)(unsafe.Pointer(&format[0])) + format_alias.len = C.size_t(len(format)) + C.QImageReader_SetFormat(this.h, format_alias) } -func (this *QImageReader) Format() *QByteArray { - _ret := C.QImageReader_Format(this.h) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QImageReader) Format() []byte { + var _bytearray C.struct_miqt_string = C.QImageReader_Format(this.h) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } func (this *QImageReader) SetAutoDetectImageFormat(enabled bool) { @@ -141,15 +153,17 @@ func (this *QImageReader) Device() *QIODevice { } func (this *QImageReader) SetFileName(fileName string) { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - C.QImageReader_SetFileName(this.h, (*C.struct_miqt_string)(fileName_ms)) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + C.QImageReader_SetFileName(this.h, fileName_ms) } func (this *QImageReader) FileName() string { - var _ms *C.struct_miqt_string = C.QImageReader_FileName(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QImageReader_FileName(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -167,11 +181,11 @@ func (this *QImageReader) ImageFormat() QImage__Format { func (this *QImageReader) TextKeys() []string { var _ma *C.struct_miqt_array = C.QImageReader_TextKeys(this.h) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -179,11 +193,13 @@ func (this *QImageReader) TextKeys() []string { } func (this *QImageReader) Text(key string) string { - key_ms := libmiqt.Strdupg(key) - defer C.free(key_ms) - var _ms *C.struct_miqt_string = C.QImageReader_Text(this.h, (*C.struct_miqt_string)(key_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + key_ms := C.struct_miqt_string{} + key_ms.data = C.CString(key) + key_ms.len = C.size_t(len(key)) + defer C.free(unsafe.Pointer(key_ms.data)) + var _ms C.struct_miqt_string = C.QImageReader_Text(this.h, key_ms) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -263,22 +279,22 @@ func (this *QImageReader) Gamma() float32 { return (float32)(C.QImageReader_Gamma(this.h)) } -func (this *QImageReader) SubType() *QByteArray { - _ret := C.QImageReader_SubType(this.h) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QImageReader) SubType() []byte { + var _bytearray C.struct_miqt_string = C.QImageReader_SubType(this.h) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } -func (this *QImageReader) SupportedSubTypes() []QByteArray { +func (this *QImageReader) SupportedSubTypes() [][]byte { var _ma *C.struct_miqt_array = C.QImageReader_SupportedSubTypes(this.h) - _ret := make([]QByteArray, int(_ma.len)) - _outCast := (*[0xffff]*C.QByteArray)(unsafe.Pointer(_ma.data)) // hey ya + _ret := make([][]byte, int(_ma.len)) + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - _lv_ret := _outCast[i] - _lv_goptr := newQByteArray(_lv_ret) - _lv_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - _ret[i] = *_lv_goptr + var _lv_bytearray C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoBytes(unsafe.Pointer(_lv_bytearray.data), C.int(int64(_lv_bytearray.len))) + C.free(unsafe.Pointer(_lv_bytearray.data)) + _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) return _ret @@ -335,9 +351,9 @@ func (this *QImageReader) Error() QImageReader__ImageReaderError { } func (this *QImageReader) ErrorString() string { - var _ms *C.struct_miqt_string = C.QImageReader_ErrorString(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QImageReader_ErrorString(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -345,59 +361,64 @@ func (this *QImageReader) SupportsOption(option QImageIOHandler__ImageOption) bo return (bool)(C.QImageReader_SupportsOption(this.h, (C.int)(option))) } -func QImageReader_ImageFormatWithFileName(fileName string) *QByteArray { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - _ret := C.QImageReader_ImageFormatWithFileName((*C.struct_miqt_string)(fileName_ms)) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func QImageReader_ImageFormatWithFileName(fileName string) []byte { + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + var _bytearray C.struct_miqt_string = C.QImageReader_ImageFormatWithFileName(fileName_ms) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } -func QImageReader_ImageFormatWithDevice(device *QIODevice) *QByteArray { - _ret := C.QImageReader_ImageFormatWithDevice(device.cPointer()) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func QImageReader_ImageFormatWithDevice(device *QIODevice) []byte { + var _bytearray C.struct_miqt_string = C.QImageReader_ImageFormatWithDevice(device.cPointer()) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } -func QImageReader_SupportedImageFormats() []QByteArray { +func QImageReader_SupportedImageFormats() [][]byte { var _ma *C.struct_miqt_array = C.QImageReader_SupportedImageFormats() - _ret := make([]QByteArray, int(_ma.len)) - _outCast := (*[0xffff]*C.QByteArray)(unsafe.Pointer(_ma.data)) // hey ya + _ret := make([][]byte, int(_ma.len)) + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - _lv_ret := _outCast[i] - _lv_goptr := newQByteArray(_lv_ret) - _lv_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - _ret[i] = *_lv_goptr + var _lv_bytearray C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoBytes(unsafe.Pointer(_lv_bytearray.data), C.int(int64(_lv_bytearray.len))) + C.free(unsafe.Pointer(_lv_bytearray.data)) + _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) return _ret } -func QImageReader_SupportedMimeTypes() []QByteArray { +func QImageReader_SupportedMimeTypes() [][]byte { var _ma *C.struct_miqt_array = C.QImageReader_SupportedMimeTypes() - _ret := make([]QByteArray, int(_ma.len)) - _outCast := (*[0xffff]*C.QByteArray)(unsafe.Pointer(_ma.data)) // hey ya + _ret := make([][]byte, int(_ma.len)) + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - _lv_ret := _outCast[i] - _lv_goptr := newQByteArray(_lv_ret) - _lv_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - _ret[i] = *_lv_goptr + var _lv_bytearray C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoBytes(unsafe.Pointer(_lv_bytearray.data), C.int(int64(_lv_bytearray.len))) + C.free(unsafe.Pointer(_lv_bytearray.data)) + _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) return _ret } -func QImageReader_ImageFormatsForMimeType(mimeType *QByteArray) []QByteArray { - var _ma *C.struct_miqt_array = C.QImageReader_ImageFormatsForMimeType(mimeType.cPointer()) - _ret := make([]QByteArray, int(_ma.len)) - _outCast := (*[0xffff]*C.QByteArray)(unsafe.Pointer(_ma.data)) // hey ya +func QImageReader_ImageFormatsForMimeType(mimeType []byte) [][]byte { + mimeType_alias := C.struct_miqt_string{} + mimeType_alias.data = (*C.char)(unsafe.Pointer(&mimeType[0])) + mimeType_alias.len = C.size_t(len(mimeType)) + var _ma *C.struct_miqt_array = C.QImageReader_ImageFormatsForMimeType(mimeType_alias) + _ret := make([][]byte, int(_ma.len)) + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - _lv_ret := _outCast[i] - _lv_goptr := newQByteArray(_lv_ret) - _lv_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - _ret[i] = *_lv_goptr + var _lv_bytearray C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoBytes(unsafe.Pointer(_lv_bytearray.data), C.int(int64(_lv_bytearray.len))) + C.free(unsafe.Pointer(_lv_bytearray.data)) + _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) return _ret @@ -408,9 +429,9 @@ func QImageReader_Tr2(sourceText string, disambiguation string) string { defer C.free(unsafe.Pointer(sourceText_Cstring)) disambiguation_Cstring := C.CString(disambiguation) defer C.free(unsafe.Pointer(disambiguation_Cstring)) - var _ms *C.struct_miqt_string = C.QImageReader_Tr2(sourceText_Cstring, disambiguation_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QImageReader_Tr2(sourceText_Cstring, disambiguation_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -419,9 +440,9 @@ func QImageReader_Tr3(sourceText string, disambiguation string, n int) string { defer C.free(unsafe.Pointer(sourceText_Cstring)) disambiguation_Cstring := C.CString(disambiguation) defer C.free(unsafe.Pointer(disambiguation_Cstring)) - var _ms *C.struct_miqt_string = C.QImageReader_Tr3(sourceText_Cstring, disambiguation_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QImageReader_Tr3(sourceText_Cstring, disambiguation_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -430,9 +451,9 @@ func QImageReader_TrUtf82(sourceText string, disambiguation string) string { defer C.free(unsafe.Pointer(sourceText_Cstring)) disambiguation_Cstring := C.CString(disambiguation) defer C.free(unsafe.Pointer(disambiguation_Cstring)) - var _ms *C.struct_miqt_string = C.QImageReader_TrUtf82(sourceText_Cstring, disambiguation_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QImageReader_TrUtf82(sourceText_Cstring, disambiguation_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -441,9 +462,9 @@ func QImageReader_TrUtf83(sourceText string, disambiguation string, n int) strin defer C.free(unsafe.Pointer(sourceText_Cstring)) disambiguation_Cstring := C.CString(disambiguation) defer C.free(unsafe.Pointer(disambiguation_Cstring)) - var _ms *C.struct_miqt_string = C.QImageReader_TrUtf83(sourceText_Cstring, disambiguation_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QImageReader_TrUtf83(sourceText_Cstring, disambiguation_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qimagereader.h b/qt/gen_qimagereader.h index f9012946..699a9f26 100644 --- a/qt/gen_qimagereader.h +++ b/qt/gen_qimagereader.h @@ -33,25 +33,25 @@ typedef struct QSize QSize; QImageReader* QImageReader_new(); QImageReader* QImageReader_new2(QIODevice* device); -QImageReader* QImageReader_new3(struct miqt_string* fileName); -QImageReader* QImageReader_new4(QIODevice* device, QByteArray* format); -QImageReader* QImageReader_new5(struct miqt_string* fileName, QByteArray* format); -struct miqt_string* QImageReader_Tr(const char* sourceText); -struct miqt_string* QImageReader_TrUtf8(const char* sourceText); -void QImageReader_SetFormat(QImageReader* self, QByteArray* format); -QByteArray* QImageReader_Format(const QImageReader* self); +QImageReader* QImageReader_new3(struct miqt_string fileName); +QImageReader* QImageReader_new4(QIODevice* device, struct miqt_string format); +QImageReader* QImageReader_new5(struct miqt_string fileName, struct miqt_string format); +struct miqt_string QImageReader_Tr(const char* sourceText); +struct miqt_string QImageReader_TrUtf8(const char* sourceText); +void QImageReader_SetFormat(QImageReader* self, struct miqt_string format); +struct miqt_string QImageReader_Format(const QImageReader* self); void QImageReader_SetAutoDetectImageFormat(QImageReader* self, bool enabled); bool QImageReader_AutoDetectImageFormat(const QImageReader* self); void QImageReader_SetDecideFormatFromContent(QImageReader* self, bool ignored); bool QImageReader_DecideFormatFromContent(const QImageReader* self); void QImageReader_SetDevice(QImageReader* self, QIODevice* device); QIODevice* QImageReader_Device(const QImageReader* self); -void QImageReader_SetFileName(QImageReader* self, struct miqt_string* fileName); -struct miqt_string* QImageReader_FileName(const QImageReader* self); +void QImageReader_SetFileName(QImageReader* self, struct miqt_string fileName); +struct miqt_string QImageReader_FileName(const QImageReader* self); QSize* QImageReader_Size(const QImageReader* self); int QImageReader_ImageFormat(const QImageReader* self); struct miqt_array* QImageReader_TextKeys(const QImageReader* self); -struct miqt_string* QImageReader_Text(const QImageReader* self, struct miqt_string* key); +struct miqt_string QImageReader_Text(const QImageReader* self, struct miqt_string key); void QImageReader_SetClipRect(QImageReader* self, QRect* rect); QRect* QImageReader_ClipRect(const QImageReader* self); void QImageReader_SetScaledSize(QImageReader* self, QSize* size); @@ -68,7 +68,7 @@ void QImageReader_SetAutoTransform(QImageReader* self, bool enabled); bool QImageReader_AutoTransform(const QImageReader* self); void QImageReader_SetGamma(QImageReader* self, float gamma); float QImageReader_Gamma(const QImageReader* self); -QByteArray* QImageReader_SubType(const QImageReader* self); +struct miqt_string QImageReader_SubType(const QImageReader* self); struct miqt_array* QImageReader_SupportedSubTypes(const QImageReader* self); bool QImageReader_CanRead(const QImageReader* self); QImage* QImageReader_Read(QImageReader* self); @@ -81,17 +81,17 @@ int QImageReader_NextImageDelay(const QImageReader* self); int QImageReader_CurrentImageNumber(const QImageReader* self); QRect* QImageReader_CurrentImageRect(const QImageReader* self); int QImageReader_Error(const QImageReader* self); -struct miqt_string* QImageReader_ErrorString(const QImageReader* self); +struct miqt_string QImageReader_ErrorString(const QImageReader* self); bool QImageReader_SupportsOption(const QImageReader* self, int option); -QByteArray* QImageReader_ImageFormatWithFileName(struct miqt_string* fileName); -QByteArray* QImageReader_ImageFormatWithDevice(QIODevice* device); +struct miqt_string QImageReader_ImageFormatWithFileName(struct miqt_string fileName); +struct miqt_string QImageReader_ImageFormatWithDevice(QIODevice* device); struct miqt_array* QImageReader_SupportedImageFormats(); struct miqt_array* QImageReader_SupportedMimeTypes(); -struct miqt_array* QImageReader_ImageFormatsForMimeType(QByteArray* mimeType); -struct miqt_string* QImageReader_Tr2(const char* sourceText, const char* disambiguation); -struct miqt_string* QImageReader_Tr3(const char* sourceText, const char* disambiguation, int n); -struct miqt_string* QImageReader_TrUtf82(const char* sourceText, const char* disambiguation); -struct miqt_string* QImageReader_TrUtf83(const char* sourceText, const char* disambiguation, int n); +struct miqt_array* QImageReader_ImageFormatsForMimeType(struct miqt_string mimeType); +struct miqt_string QImageReader_Tr2(const char* sourceText, const char* disambiguation); +struct miqt_string QImageReader_Tr3(const char* sourceText, const char* disambiguation, int n); +struct miqt_string QImageReader_TrUtf82(const char* sourceText, const char* disambiguation); +struct miqt_string QImageReader_TrUtf83(const char* sourceText, const char* disambiguation, int n); void QImageReader_Delete(QImageReader* self); #ifdef __cplusplus diff --git a/qt/gen_qimagewriter.cpp b/qt/gen_qimagewriter.cpp index fa93ece1..55d59758 100644 --- a/qt/gen_qimagewriter.cpp +++ b/qt/gen_qimagewriter.cpp @@ -14,40 +14,56 @@ QImageWriter* QImageWriter_new() { return new QImageWriter(); } -QImageWriter* QImageWriter_new2(QIODevice* device, QByteArray* format) { - return new QImageWriter(device, *format); +QImageWriter* QImageWriter_new2(QIODevice* device, struct miqt_string format) { + QByteArray format_QByteArray(format.data, format.len); + return new QImageWriter(device, format_QByteArray); } -QImageWriter* QImageWriter_new3(struct miqt_string* fileName) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +QImageWriter* QImageWriter_new3(struct miqt_string fileName) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); return new QImageWriter(fileName_QString); } -QImageWriter* QImageWriter_new4(struct miqt_string* fileName, QByteArray* format) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); - return new QImageWriter(fileName_QString, *format); +QImageWriter* QImageWriter_new4(struct miqt_string fileName, struct miqt_string format) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); + QByteArray format_QByteArray(format.data, format.len); + return new QImageWriter(fileName_QString, format_QByteArray); } -struct miqt_string* QImageWriter_Tr(const char* sourceText) { +struct miqt_string QImageWriter_Tr(const char* sourceText) { QString _ret = QImageWriter::tr(sourceText); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QImageWriter_TrUtf8(const char* sourceText) { +struct miqt_string QImageWriter_TrUtf8(const char* sourceText) { QString _ret = QImageWriter::trUtf8(sourceText); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QImageWriter_SetFormat(QImageWriter* self, QByteArray* format) { - self->setFormat(*format); +void QImageWriter_SetFormat(QImageWriter* self, struct miqt_string format) { + QByteArray format_QByteArray(format.data, format.len); + self->setFormat(format_QByteArray); } -QByteArray* QImageWriter_Format(const QImageWriter* self) { - return new QByteArray(self->format()); +struct miqt_string QImageWriter_Format(const QImageWriter* self) { + QByteArray _qb = self->format(); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } void QImageWriter_SetDevice(QImageWriter* self, QIODevice* device) { @@ -58,16 +74,20 @@ QIODevice* QImageWriter_Device(const QImageWriter* self) { return self->device(); } -void QImageWriter_SetFileName(QImageWriter* self, struct miqt_string* fileName) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +void QImageWriter_SetFileName(QImageWriter* self, struct miqt_string fileName) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); self->setFileName(fileName_QString); } -struct miqt_string* QImageWriter_FileName(const QImageWriter* self) { +struct miqt_string QImageWriter_FileName(const QImageWriter* self) { QString _ret = self->fileName(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QImageWriter_SetQuality(QImageWriter* self, int quality) { @@ -94,20 +114,31 @@ float QImageWriter_Gamma(const QImageWriter* self) { return self->gamma(); } -void QImageWriter_SetSubType(QImageWriter* self, QByteArray* typeVal) { - self->setSubType(*typeVal); +void QImageWriter_SetSubType(QImageWriter* self, struct miqt_string typeVal) { + QByteArray typeVal_QByteArray(typeVal.data, typeVal.len); + self->setSubType(typeVal_QByteArray); } -QByteArray* QImageWriter_SubType(const QImageWriter* self) { - return new QByteArray(self->subType()); +struct miqt_string QImageWriter_SubType(const QImageWriter* self) { + QByteArray _qb = self->subType(); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } struct miqt_array* QImageWriter_SupportedSubTypes(const QImageWriter* self) { QList _ret = self->supportedSubTypes(); // Convert QList<> from C++ memory to manually-managed C memory - QByteArray** _arr = static_cast(malloc(sizeof(QByteArray*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { - _arr[i] = new QByteArray(_ret[i]); + QByteArray _lv_qb = _ret[i]; + struct miqt_string _lv_ms; + _lv_ms.len = _lv_qb.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_qb.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -140,21 +171,25 @@ void QImageWriter_SetTransformation(QImageWriter* self, int orientation) { self->setTransformation(static_cast(orientation)); } -void QImageWriter_SetDescription(QImageWriter* self, struct miqt_string* description) { - QString description_QString = QString::fromUtf8(&description->data, description->len); +void QImageWriter_SetDescription(QImageWriter* self, struct miqt_string description) { + QString description_QString = QString::fromUtf8(description.data, description.len); self->setDescription(description_QString); } -struct miqt_string* QImageWriter_Description(const QImageWriter* self) { +struct miqt_string QImageWriter_Description(const QImageWriter* self) { QString _ret = self->description(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QImageWriter_SetText(QImageWriter* self, struct miqt_string* key, struct miqt_string* text) { - QString key_QString = QString::fromUtf8(&key->data, key->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QImageWriter_SetText(QImageWriter* self, struct miqt_string key, struct miqt_string text) { + QString key_QString = QString::fromUtf8(key.data, key.len); + QString text_QString = QString::fromUtf8(text.data, text.len); self->setText(key_QString, text_QString); } @@ -171,11 +206,15 @@ int QImageWriter_Error(const QImageWriter* self) { return static_cast(_ret); } -struct miqt_string* QImageWriter_ErrorString(const QImageWriter* self) { +struct miqt_string QImageWriter_ErrorString(const QImageWriter* self) { QString _ret = self->errorString(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } bool QImageWriter_SupportsOption(const QImageWriter* self, int option) { @@ -185,9 +224,14 @@ bool QImageWriter_SupportsOption(const QImageWriter* self, int option) { struct miqt_array* QImageWriter_SupportedImageFormats() { QList _ret = QImageWriter::supportedImageFormats(); // Convert QList<> from C++ memory to manually-managed C memory - QByteArray** _arr = static_cast(malloc(sizeof(QByteArray*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { - _arr[i] = new QByteArray(_ret[i]); + QByteArray _lv_qb = _ret[i]; + struct miqt_string _lv_ms; + _lv_ms.len = _lv_qb.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_qb.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -198,9 +242,14 @@ struct miqt_array* QImageWriter_SupportedImageFormats() { struct miqt_array* QImageWriter_SupportedMimeTypes() { QList _ret = QImageWriter::supportedMimeTypes(); // Convert QList<> from C++ memory to manually-managed C memory - QByteArray** _arr = static_cast(malloc(sizeof(QByteArray*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { - _arr[i] = new QByteArray(_ret[i]); + QByteArray _lv_qb = _ret[i]; + struct miqt_string _lv_ms; + _lv_ms.len = _lv_qb.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_qb.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -208,12 +257,18 @@ struct miqt_array* QImageWriter_SupportedMimeTypes() { return _out; } -struct miqt_array* QImageWriter_ImageFormatsForMimeType(QByteArray* mimeType) { - QList _ret = QImageWriter::imageFormatsForMimeType(*mimeType); +struct miqt_array* QImageWriter_ImageFormatsForMimeType(struct miqt_string mimeType) { + QByteArray mimeType_QByteArray(mimeType.data, mimeType.len); + QList _ret = QImageWriter::imageFormatsForMimeType(mimeType_QByteArray); // Convert QList<> from C++ memory to manually-managed C memory - QByteArray** _arr = static_cast(malloc(sizeof(QByteArray*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { - _arr[i] = new QByteArray(_ret[i]); + QByteArray _lv_qb = _ret[i]; + struct miqt_string _lv_ms; + _lv_ms.len = _lv_qb.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_qb.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -221,32 +276,48 @@ struct miqt_array* QImageWriter_ImageFormatsForMimeType(QByteArray* mimeType) { return _out; } -struct miqt_string* QImageWriter_Tr2(const char* sourceText, const char* disambiguation) { +struct miqt_string QImageWriter_Tr2(const char* sourceText, const char* disambiguation) { QString _ret = QImageWriter::tr(sourceText, disambiguation); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QImageWriter_Tr3(const char* sourceText, const char* disambiguation, int n) { +struct miqt_string QImageWriter_Tr3(const char* sourceText, const char* disambiguation, int n) { QString _ret = QImageWriter::tr(sourceText, disambiguation, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QImageWriter_TrUtf82(const char* sourceText, const char* disambiguation) { +struct miqt_string QImageWriter_TrUtf82(const char* sourceText, const char* disambiguation) { QString _ret = QImageWriter::trUtf8(sourceText, disambiguation); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QImageWriter_TrUtf83(const char* sourceText, const char* disambiguation, int n) { +struct miqt_string QImageWriter_TrUtf83(const char* sourceText, const char* disambiguation, int n) { QString _ret = QImageWriter::trUtf8(sourceText, disambiguation, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QImageWriter_Delete(QImageWriter* self) { diff --git a/qt/gen_qimagewriter.go b/qt/gen_qimagewriter.go index f241c360..daf4a5b9 100644 --- a/qt/gen_qimagewriter.go +++ b/qt/gen_qimagewriter.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -59,54 +58,67 @@ func NewQImageWriter() *QImageWriter { } // NewQImageWriter2 constructs a new QImageWriter object. -func NewQImageWriter2(device *QIODevice, format *QByteArray) *QImageWriter { - ret := C.QImageWriter_new2(device.cPointer(), format.cPointer()) +func NewQImageWriter2(device *QIODevice, format []byte) *QImageWriter { + format_alias := C.struct_miqt_string{} + format_alias.data = (*C.char)(unsafe.Pointer(&format[0])) + format_alias.len = C.size_t(len(format)) + ret := C.QImageWriter_new2(device.cPointer(), format_alias) return newQImageWriter(ret) } // NewQImageWriter3 constructs a new QImageWriter object. func NewQImageWriter3(fileName string) *QImageWriter { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - ret := C.QImageWriter_new3((*C.struct_miqt_string)(fileName_ms)) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + ret := C.QImageWriter_new3(fileName_ms) return newQImageWriter(ret) } // NewQImageWriter4 constructs a new QImageWriter object. -func NewQImageWriter4(fileName string, format *QByteArray) *QImageWriter { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - ret := C.QImageWriter_new4((*C.struct_miqt_string)(fileName_ms), format.cPointer()) +func NewQImageWriter4(fileName string, format []byte) *QImageWriter { + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + format_alias := C.struct_miqt_string{} + format_alias.data = (*C.char)(unsafe.Pointer(&format[0])) + format_alias.len = C.size_t(len(format)) + ret := C.QImageWriter_new4(fileName_ms, format_alias) return newQImageWriter(ret) } func QImageWriter_Tr(sourceText string) string { sourceText_Cstring := C.CString(sourceText) defer C.free(unsafe.Pointer(sourceText_Cstring)) - var _ms *C.struct_miqt_string = C.QImageWriter_Tr(sourceText_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QImageWriter_Tr(sourceText_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QImageWriter_TrUtf8(sourceText string) string { sourceText_Cstring := C.CString(sourceText) defer C.free(unsafe.Pointer(sourceText_Cstring)) - var _ms *C.struct_miqt_string = C.QImageWriter_TrUtf8(sourceText_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QImageWriter_TrUtf8(sourceText_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } -func (this *QImageWriter) SetFormat(format *QByteArray) { - C.QImageWriter_SetFormat(this.h, format.cPointer()) +func (this *QImageWriter) SetFormat(format []byte) { + format_alias := C.struct_miqt_string{} + format_alias.data = (*C.char)(unsafe.Pointer(&format[0])) + format_alias.len = C.size_t(len(format)) + C.QImageWriter_SetFormat(this.h, format_alias) } -func (this *QImageWriter) Format() *QByteArray { - _ret := C.QImageWriter_Format(this.h) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QImageWriter) Format() []byte { + var _bytearray C.struct_miqt_string = C.QImageWriter_Format(this.h) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } func (this *QImageWriter) SetDevice(device *QIODevice) { @@ -118,15 +130,17 @@ func (this *QImageWriter) Device() *QIODevice { } func (this *QImageWriter) SetFileName(fileName string) { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - C.QImageWriter_SetFileName(this.h, (*C.struct_miqt_string)(fileName_ms)) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + C.QImageWriter_SetFileName(this.h, fileName_ms) } func (this *QImageWriter) FileName() string { - var _ms *C.struct_miqt_string = C.QImageWriter_FileName(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QImageWriter_FileName(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -154,26 +168,29 @@ func (this *QImageWriter) Gamma() float32 { return (float32)(C.QImageWriter_Gamma(this.h)) } -func (this *QImageWriter) SetSubType(typeVal *QByteArray) { - C.QImageWriter_SetSubType(this.h, typeVal.cPointer()) +func (this *QImageWriter) SetSubType(typeVal []byte) { + typeVal_alias := C.struct_miqt_string{} + typeVal_alias.data = (*C.char)(unsafe.Pointer(&typeVal[0])) + typeVal_alias.len = C.size_t(len(typeVal)) + C.QImageWriter_SetSubType(this.h, typeVal_alias) } -func (this *QImageWriter) SubType() *QByteArray { - _ret := C.QImageWriter_SubType(this.h) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QImageWriter) SubType() []byte { + var _bytearray C.struct_miqt_string = C.QImageWriter_SubType(this.h) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } -func (this *QImageWriter) SupportedSubTypes() []QByteArray { +func (this *QImageWriter) SupportedSubTypes() [][]byte { var _ma *C.struct_miqt_array = C.QImageWriter_SupportedSubTypes(this.h) - _ret := make([]QByteArray, int(_ma.len)) - _outCast := (*[0xffff]*C.QByteArray)(unsafe.Pointer(_ma.data)) // hey ya + _ret := make([][]byte, int(_ma.len)) + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - _lv_ret := _outCast[i] - _lv_goptr := newQByteArray(_lv_ret) - _lv_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - _ret[i] = *_lv_goptr + var _lv_bytearray C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoBytes(unsafe.Pointer(_lv_bytearray.data), C.int(int64(_lv_bytearray.len))) + C.free(unsafe.Pointer(_lv_bytearray.data)) + _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) return _ret @@ -204,24 +221,30 @@ func (this *QImageWriter) SetTransformation(orientation QImageIOHandler__Transfo } func (this *QImageWriter) SetDescription(description string) { - description_ms := libmiqt.Strdupg(description) - defer C.free(description_ms) - C.QImageWriter_SetDescription(this.h, (*C.struct_miqt_string)(description_ms)) + description_ms := C.struct_miqt_string{} + description_ms.data = C.CString(description) + description_ms.len = C.size_t(len(description)) + defer C.free(unsafe.Pointer(description_ms.data)) + C.QImageWriter_SetDescription(this.h, description_ms) } func (this *QImageWriter) Description() string { - var _ms *C.struct_miqt_string = C.QImageWriter_Description(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QImageWriter_Description(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QImageWriter) SetText(key string, text string) { - key_ms := libmiqt.Strdupg(key) - defer C.free(key_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QImageWriter_SetText(this.h, (*C.struct_miqt_string)(key_ms), (*C.struct_miqt_string)(text_ms)) + key_ms := C.struct_miqt_string{} + key_ms.data = C.CString(key) + key_ms.len = C.size_t(len(key)) + defer C.free(unsafe.Pointer(key_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QImageWriter_SetText(this.h, key_ms, text_ms) } func (this *QImageWriter) CanWrite() bool { @@ -237,9 +260,9 @@ func (this *QImageWriter) Error() QImageWriter__ImageWriterError { } func (this *QImageWriter) ErrorString() string { - var _ms *C.struct_miqt_string = C.QImageWriter_ErrorString(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QImageWriter_ErrorString(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -247,43 +270,46 @@ func (this *QImageWriter) SupportsOption(option QImageIOHandler__ImageOption) bo return (bool)(C.QImageWriter_SupportsOption(this.h, (C.int)(option))) } -func QImageWriter_SupportedImageFormats() []QByteArray { +func QImageWriter_SupportedImageFormats() [][]byte { var _ma *C.struct_miqt_array = C.QImageWriter_SupportedImageFormats() - _ret := make([]QByteArray, int(_ma.len)) - _outCast := (*[0xffff]*C.QByteArray)(unsafe.Pointer(_ma.data)) // hey ya + _ret := make([][]byte, int(_ma.len)) + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - _lv_ret := _outCast[i] - _lv_goptr := newQByteArray(_lv_ret) - _lv_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - _ret[i] = *_lv_goptr + var _lv_bytearray C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoBytes(unsafe.Pointer(_lv_bytearray.data), C.int(int64(_lv_bytearray.len))) + C.free(unsafe.Pointer(_lv_bytearray.data)) + _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) return _ret } -func QImageWriter_SupportedMimeTypes() []QByteArray { +func QImageWriter_SupportedMimeTypes() [][]byte { var _ma *C.struct_miqt_array = C.QImageWriter_SupportedMimeTypes() - _ret := make([]QByteArray, int(_ma.len)) - _outCast := (*[0xffff]*C.QByteArray)(unsafe.Pointer(_ma.data)) // hey ya + _ret := make([][]byte, int(_ma.len)) + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - _lv_ret := _outCast[i] - _lv_goptr := newQByteArray(_lv_ret) - _lv_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - _ret[i] = *_lv_goptr + var _lv_bytearray C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoBytes(unsafe.Pointer(_lv_bytearray.data), C.int(int64(_lv_bytearray.len))) + C.free(unsafe.Pointer(_lv_bytearray.data)) + _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) return _ret } -func QImageWriter_ImageFormatsForMimeType(mimeType *QByteArray) []QByteArray { - var _ma *C.struct_miqt_array = C.QImageWriter_ImageFormatsForMimeType(mimeType.cPointer()) - _ret := make([]QByteArray, int(_ma.len)) - _outCast := (*[0xffff]*C.QByteArray)(unsafe.Pointer(_ma.data)) // hey ya +func QImageWriter_ImageFormatsForMimeType(mimeType []byte) [][]byte { + mimeType_alias := C.struct_miqt_string{} + mimeType_alias.data = (*C.char)(unsafe.Pointer(&mimeType[0])) + mimeType_alias.len = C.size_t(len(mimeType)) + var _ma *C.struct_miqt_array = C.QImageWriter_ImageFormatsForMimeType(mimeType_alias) + _ret := make([][]byte, int(_ma.len)) + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - _lv_ret := _outCast[i] - _lv_goptr := newQByteArray(_lv_ret) - _lv_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - _ret[i] = *_lv_goptr + var _lv_bytearray C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoBytes(unsafe.Pointer(_lv_bytearray.data), C.int(int64(_lv_bytearray.len))) + C.free(unsafe.Pointer(_lv_bytearray.data)) + _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) return _ret @@ -294,9 +320,9 @@ func QImageWriter_Tr2(sourceText string, disambiguation string) string { defer C.free(unsafe.Pointer(sourceText_Cstring)) disambiguation_Cstring := C.CString(disambiguation) defer C.free(unsafe.Pointer(disambiguation_Cstring)) - var _ms *C.struct_miqt_string = C.QImageWriter_Tr2(sourceText_Cstring, disambiguation_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QImageWriter_Tr2(sourceText_Cstring, disambiguation_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -305,9 +331,9 @@ func QImageWriter_Tr3(sourceText string, disambiguation string, n int) string { defer C.free(unsafe.Pointer(sourceText_Cstring)) disambiguation_Cstring := C.CString(disambiguation) defer C.free(unsafe.Pointer(disambiguation_Cstring)) - var _ms *C.struct_miqt_string = C.QImageWriter_Tr3(sourceText_Cstring, disambiguation_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QImageWriter_Tr3(sourceText_Cstring, disambiguation_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -316,9 +342,9 @@ func QImageWriter_TrUtf82(sourceText string, disambiguation string) string { defer C.free(unsafe.Pointer(sourceText_Cstring)) disambiguation_Cstring := C.CString(disambiguation) defer C.free(unsafe.Pointer(disambiguation_Cstring)) - var _ms *C.struct_miqt_string = C.QImageWriter_TrUtf82(sourceText_Cstring, disambiguation_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QImageWriter_TrUtf82(sourceText_Cstring, disambiguation_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -327,9 +353,9 @@ func QImageWriter_TrUtf83(sourceText string, disambiguation string, n int) strin defer C.free(unsafe.Pointer(sourceText_Cstring)) disambiguation_Cstring := C.CString(disambiguation) defer C.free(unsafe.Pointer(disambiguation_Cstring)) - var _ms *C.struct_miqt_string = C.QImageWriter_TrUtf83(sourceText_Cstring, disambiguation_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QImageWriter_TrUtf83(sourceText_Cstring, disambiguation_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qimagewriter.h b/qt/gen_qimagewriter.h index 8fc6aa83..41de56f7 100644 --- a/qt/gen_qimagewriter.h +++ b/qt/gen_qimagewriter.h @@ -26,25 +26,25 @@ typedef struct QImageWriter QImageWriter; #endif QImageWriter* QImageWriter_new(); -QImageWriter* QImageWriter_new2(QIODevice* device, QByteArray* format); -QImageWriter* QImageWriter_new3(struct miqt_string* fileName); -QImageWriter* QImageWriter_new4(struct miqt_string* fileName, QByteArray* format); -struct miqt_string* QImageWriter_Tr(const char* sourceText); -struct miqt_string* QImageWriter_TrUtf8(const char* sourceText); -void QImageWriter_SetFormat(QImageWriter* self, QByteArray* format); -QByteArray* QImageWriter_Format(const QImageWriter* self); +QImageWriter* QImageWriter_new2(QIODevice* device, struct miqt_string format); +QImageWriter* QImageWriter_new3(struct miqt_string fileName); +QImageWriter* QImageWriter_new4(struct miqt_string fileName, struct miqt_string format); +struct miqt_string QImageWriter_Tr(const char* sourceText); +struct miqt_string QImageWriter_TrUtf8(const char* sourceText); +void QImageWriter_SetFormat(QImageWriter* self, struct miqt_string format); +struct miqt_string QImageWriter_Format(const QImageWriter* self); void QImageWriter_SetDevice(QImageWriter* self, QIODevice* device); QIODevice* QImageWriter_Device(const QImageWriter* self); -void QImageWriter_SetFileName(QImageWriter* self, struct miqt_string* fileName); -struct miqt_string* QImageWriter_FileName(const QImageWriter* self); +void QImageWriter_SetFileName(QImageWriter* self, struct miqt_string fileName); +struct miqt_string QImageWriter_FileName(const QImageWriter* self); void QImageWriter_SetQuality(QImageWriter* self, int quality); int QImageWriter_Quality(const QImageWriter* self); void QImageWriter_SetCompression(QImageWriter* self, int compression); int QImageWriter_Compression(const QImageWriter* self); void QImageWriter_SetGamma(QImageWriter* self, float gamma); float QImageWriter_Gamma(const QImageWriter* self); -void QImageWriter_SetSubType(QImageWriter* self, QByteArray* typeVal); -QByteArray* QImageWriter_SubType(const QImageWriter* self); +void QImageWriter_SetSubType(QImageWriter* self, struct miqt_string typeVal); +struct miqt_string QImageWriter_SubType(const QImageWriter* self); struct miqt_array* QImageWriter_SupportedSubTypes(const QImageWriter* self); void QImageWriter_SetOptimizedWrite(QImageWriter* self, bool optimize); bool QImageWriter_OptimizedWrite(const QImageWriter* self); @@ -52,21 +52,21 @@ void QImageWriter_SetProgressiveScanWrite(QImageWriter* self, bool progressive); bool QImageWriter_ProgressiveScanWrite(const QImageWriter* self); int QImageWriter_Transformation(const QImageWriter* self); void QImageWriter_SetTransformation(QImageWriter* self, int orientation); -void QImageWriter_SetDescription(QImageWriter* self, struct miqt_string* description); -struct miqt_string* QImageWriter_Description(const QImageWriter* self); -void QImageWriter_SetText(QImageWriter* self, struct miqt_string* key, struct miqt_string* text); +void QImageWriter_SetDescription(QImageWriter* self, struct miqt_string description); +struct miqt_string QImageWriter_Description(const QImageWriter* self); +void QImageWriter_SetText(QImageWriter* self, struct miqt_string key, struct miqt_string text); bool QImageWriter_CanWrite(const QImageWriter* self); bool QImageWriter_Write(QImageWriter* self, QImage* image); int QImageWriter_Error(const QImageWriter* self); -struct miqt_string* QImageWriter_ErrorString(const QImageWriter* self); +struct miqt_string QImageWriter_ErrorString(const QImageWriter* self); bool QImageWriter_SupportsOption(const QImageWriter* self, int option); struct miqt_array* QImageWriter_SupportedImageFormats(); struct miqt_array* QImageWriter_SupportedMimeTypes(); -struct miqt_array* QImageWriter_ImageFormatsForMimeType(QByteArray* mimeType); -struct miqt_string* QImageWriter_Tr2(const char* sourceText, const char* disambiguation); -struct miqt_string* QImageWriter_Tr3(const char* sourceText, const char* disambiguation, int n); -struct miqt_string* QImageWriter_TrUtf82(const char* sourceText, const char* disambiguation); -struct miqt_string* QImageWriter_TrUtf83(const char* sourceText, const char* disambiguation, int n); +struct miqt_array* QImageWriter_ImageFormatsForMimeType(struct miqt_string mimeType); +struct miqt_string QImageWriter_Tr2(const char* sourceText, const char* disambiguation); +struct miqt_string QImageWriter_Tr3(const char* sourceText, const char* disambiguation, int n); +struct miqt_string QImageWriter_TrUtf82(const char* sourceText, const char* disambiguation); +struct miqt_string QImageWriter_TrUtf83(const char* sourceText, const char* disambiguation, int n); void QImageWriter_Delete(QImageWriter* self); #ifdef __cplusplus diff --git a/qt/gen_qinputdialog.cpp b/qt/gen_qinputdialog.cpp index c266658b..6b8e32b9 100644 --- a/qt/gen_qinputdialog.cpp +++ b/qt/gen_qinputdialog.cpp @@ -30,18 +30,26 @@ void* QInputDialog_Metacast(QInputDialog* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QInputDialog_Tr(const char* s) { +struct miqt_string QInputDialog_Tr(const char* s) { QString _ret = QInputDialog::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QInputDialog_TrUtf8(const char* s) { +struct miqt_string QInputDialog_TrUtf8(const char* s) { QString _ret = QInputDialog::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QInputDialog_SetInputMode(QInputDialog* self, int mode) { @@ -53,16 +61,20 @@ int QInputDialog_InputMode(const QInputDialog* self) { return static_cast(_ret); } -void QInputDialog_SetLabelText(QInputDialog* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QInputDialog_SetLabelText(QInputDialog* self, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->setLabelText(text_QString); } -struct miqt_string* QInputDialog_LabelText(const QInputDialog* self) { +struct miqt_string QInputDialog_LabelText(const QInputDialog* self) { QString _ret = self->labelText(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QInputDialog_SetOption(QInputDialog* self, int option) { @@ -82,16 +94,20 @@ int QInputDialog_Options(const QInputDialog* self) { return static_cast(_ret); } -void QInputDialog_SetTextValue(QInputDialog* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QInputDialog_SetTextValue(QInputDialog* self, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->setTextValue(text_QString); } -struct miqt_string* QInputDialog_TextValue(const QInputDialog* self) { +struct miqt_string QInputDialog_TextValue(const QInputDialog* self) { QString _ret = self->textValue(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QInputDialog_SetTextEchoMode(QInputDialog* self, int mode) { @@ -111,12 +127,12 @@ bool QInputDialog_IsComboBoxEditable(const QInputDialog* self) { return self->isComboBoxEditable(); } -void QInputDialog_SetComboBoxItems(QInputDialog* self, struct miqt_array* /* of struct miqt_string* */ items) { +void QInputDialog_SetComboBoxItems(QInputDialog* self, struct miqt_array* /* of struct miqt_string */ items) { QStringList items_QList; items_QList.reserve(items->len); - struct miqt_string** items_arr = static_cast(items->data); + struct miqt_string* items_arr = static_cast(items->data); for(size_t i = 0; i < items->len; ++i) { - QString items_arr_i_QString = QString::fromUtf8(&items_arr[i]->data, items_arr[i]->len); + QString items_arr_i_QString = QString::fromUtf8(items_arr[i].data, items_arr[i].len); items_QList.push_back(items_arr_i_QString); } self->setComboBoxItems(items_QList); @@ -125,12 +141,16 @@ void QInputDialog_SetComboBoxItems(QInputDialog* self, struct miqt_array* /* of struct miqt_array* QInputDialog_ComboBoxItems(const QInputDialog* self) { QStringList _ret = self->comboBoxItems(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -210,28 +230,36 @@ int QInputDialog_DoubleDecimals(const QInputDialog* self) { return self->doubleDecimals(); } -void QInputDialog_SetOkButtonText(QInputDialog* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QInputDialog_SetOkButtonText(QInputDialog* self, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->setOkButtonText(text_QString); } -struct miqt_string* QInputDialog_OkButtonText(const QInputDialog* self) { +struct miqt_string QInputDialog_OkButtonText(const QInputDialog* self) { QString _ret = self->okButtonText(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QInputDialog_SetCancelButtonText(QInputDialog* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QInputDialog_SetCancelButtonText(QInputDialog* self, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->setCancelButtonText(text_QString); } -struct miqt_string* QInputDialog_CancelButtonText(const QInputDialog* self) { +struct miqt_string QInputDialog_CancelButtonText(const QInputDialog* self) { QString _ret = self->cancelButtonText(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QSize* QInputDialog_MinimumSizeHint(const QInputDialog* self) { @@ -246,55 +274,67 @@ void QInputDialog_SetVisible(QInputDialog* self, bool visible) { self->setVisible(visible); } -struct miqt_string* QInputDialog_GetText(QWidget* parent, struct miqt_string* title, struct miqt_string* label) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString label_QString = QString::fromUtf8(&label->data, label->len); +struct miqt_string QInputDialog_GetText(QWidget* parent, struct miqt_string title, struct miqt_string label) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString label_QString = QString::fromUtf8(label.data, label.len); QString _ret = QInputDialog::getText(parent, title_QString, label_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QInputDialog_GetMultiLineText(QWidget* parent, struct miqt_string* title, struct miqt_string* label) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString label_QString = QString::fromUtf8(&label->data, label->len); +struct miqt_string QInputDialog_GetMultiLineText(QWidget* parent, struct miqt_string title, struct miqt_string label) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString label_QString = QString::fromUtf8(label.data, label.len); QString _ret = QInputDialog::getMultiLineText(parent, title_QString, label_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QInputDialog_GetItem(QWidget* parent, struct miqt_string* title, struct miqt_string* label, struct miqt_array* /* of struct miqt_string* */ items) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString label_QString = QString::fromUtf8(&label->data, label->len); +struct miqt_string QInputDialog_GetItem(QWidget* parent, struct miqt_string title, struct miqt_string label, struct miqt_array* /* of struct miqt_string */ items) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString label_QString = QString::fromUtf8(label.data, label.len); QStringList items_QList; items_QList.reserve(items->len); - struct miqt_string** items_arr = static_cast(items->data); + struct miqt_string* items_arr = static_cast(items->data); for(size_t i = 0; i < items->len; ++i) { - QString items_arr_i_QString = QString::fromUtf8(&items_arr[i]->data, items_arr[i]->len); + QString items_arr_i_QString = QString::fromUtf8(items_arr[i].data, items_arr[i].len); items_QList.push_back(items_arr_i_QString); } QString _ret = QInputDialog::getItem(parent, title_QString, label_QString, items_QList); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -int QInputDialog_GetInt(QWidget* parent, struct miqt_string* title, struct miqt_string* label) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString label_QString = QString::fromUtf8(&label->data, label->len); +int QInputDialog_GetInt(QWidget* parent, struct miqt_string title, struct miqt_string label) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString label_QString = QString::fromUtf8(label.data, label.len); return QInputDialog::getInt(parent, title_QString, label_QString); } -double QInputDialog_GetDouble(QWidget* parent, struct miqt_string* title, struct miqt_string* label) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString label_QString = QString::fromUtf8(&label->data, label->len); +double QInputDialog_GetDouble(QWidget* parent, struct miqt_string title, struct miqt_string label) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString label_QString = QString::fromUtf8(label.data, label.len); return QInputDialog::getDouble(parent, title_QString, label_QString); } -double QInputDialog_GetDouble2(QWidget* parent, struct miqt_string* title, struct miqt_string* label, double value, double minValue, double maxValue, int decimals, bool* ok, int flags, double step) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString label_QString = QString::fromUtf8(&label->data, label->len); +double QInputDialog_GetDouble2(QWidget* parent, struct miqt_string title, struct miqt_string label, double value, double minValue, double maxValue, int decimals, bool* ok, int flags, double step) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString label_QString = QString::fromUtf8(label.data, label.len); return QInputDialog::getDouble(parent, title_QString, label_QString, static_cast(value), static_cast(minValue), static_cast(maxValue), static_cast(decimals), ok, static_cast(flags), static_cast(step)); } @@ -306,8 +346,8 @@ double QInputDialog_DoubleStep(const QInputDialog* self) { return self->doubleStep(); } -void QInputDialog_TextValueChanged(QInputDialog* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QInputDialog_TextValueChanged(QInputDialog* self, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->textValueChanged(text_QString); } @@ -316,13 +356,17 @@ void QInputDialog_connect_TextValueChanged(QInputDialog* self, intptr_t slot) { const QString text_ret = text; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray text_b = text_ret.toUtf8(); - struct miqt_string* sigval1 = miqt_strdup(text_b.data(), text_b.length()); + struct miqt_string text_ms; + text_ms.len = text_b.length(); + text_ms.data = static_cast(malloc(text_ms.len)); + memcpy(text_ms.data, text_b.data(), text_ms.len); + struct miqt_string sigval1 = text_ms; miqt_exec_callback_QInputDialog_TextValueChanged(slot, sigval1); }); } -void QInputDialog_TextValueSelected(QInputDialog* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QInputDialog_TextValueSelected(QInputDialog* self, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->textValueSelected(text_QString); } @@ -331,7 +375,11 @@ void QInputDialog_connect_TextValueSelected(QInputDialog* self, intptr_t slot) { const QString text_ret = text; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray text_b = text_ret.toUtf8(); - struct miqt_string* sigval1 = miqt_strdup(text_b.data(), text_b.length()); + struct miqt_string text_ms; + text_ms.len = text_b.length(); + text_ms.data = static_cast(malloc(text_ms.len)); + memcpy(text_ms.data, text_b.data(), text_ms.len); + struct miqt_string sigval1 = text_ms; miqt_exec_callback_QInputDialog_TextValueSelected(slot, sigval1); }); } @@ -384,276 +432,348 @@ void QInputDialog_Done(QInputDialog* self, int result) { self->done(static_cast(result)); } -struct miqt_string* QInputDialog_Tr2(const char* s, const char* c) { +struct miqt_string QInputDialog_Tr2(const char* s, const char* c) { QString _ret = QInputDialog::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QInputDialog_Tr3(const char* s, const char* c, int n) { +struct miqt_string QInputDialog_Tr3(const char* s, const char* c, int n) { QString _ret = QInputDialog::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QInputDialog_TrUtf82(const char* s, const char* c) { +struct miqt_string QInputDialog_TrUtf82(const char* s, const char* c) { QString _ret = QInputDialog::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QInputDialog_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QInputDialog_TrUtf83(const char* s, const char* c, int n) { QString _ret = QInputDialog::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QInputDialog_SetOption2(QInputDialog* self, int option, bool on) { self->setOption(static_cast(option), on); } -struct miqt_string* QInputDialog_GetText4(QWidget* parent, struct miqt_string* title, struct miqt_string* label, int echo) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString label_QString = QString::fromUtf8(&label->data, label->len); +struct miqt_string QInputDialog_GetText4(QWidget* parent, struct miqt_string title, struct miqt_string label, int echo) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString label_QString = QString::fromUtf8(label.data, label.len); QString _ret = QInputDialog::getText(parent, title_QString, label_QString, static_cast(echo)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QInputDialog_GetText5(QWidget* parent, struct miqt_string* title, struct miqt_string* label, int echo, struct miqt_string* text) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString label_QString = QString::fromUtf8(&label->data, label->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); +struct miqt_string QInputDialog_GetText5(QWidget* parent, struct miqt_string title, struct miqt_string label, int echo, struct miqt_string text) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString label_QString = QString::fromUtf8(label.data, label.len); + QString text_QString = QString::fromUtf8(text.data, text.len); QString _ret = QInputDialog::getText(parent, title_QString, label_QString, static_cast(echo), text_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QInputDialog_GetText6(QWidget* parent, struct miqt_string* title, struct miqt_string* label, int echo, struct miqt_string* text, bool* ok) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString label_QString = QString::fromUtf8(&label->data, label->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); +struct miqt_string QInputDialog_GetText6(QWidget* parent, struct miqt_string title, struct miqt_string label, int echo, struct miqt_string text, bool* ok) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString label_QString = QString::fromUtf8(label.data, label.len); + QString text_QString = QString::fromUtf8(text.data, text.len); QString _ret = QInputDialog::getText(parent, title_QString, label_QString, static_cast(echo), text_QString, ok); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QInputDialog_GetText7(QWidget* parent, struct miqt_string* title, struct miqt_string* label, int echo, struct miqt_string* text, bool* ok, int flags) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString label_QString = QString::fromUtf8(&label->data, label->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); +struct miqt_string QInputDialog_GetText7(QWidget* parent, struct miqt_string title, struct miqt_string label, int echo, struct miqt_string text, bool* ok, int flags) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString label_QString = QString::fromUtf8(label.data, label.len); + QString text_QString = QString::fromUtf8(text.data, text.len); QString _ret = QInputDialog::getText(parent, title_QString, label_QString, static_cast(echo), text_QString, ok, static_cast(flags)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QInputDialog_GetText8(QWidget* parent, struct miqt_string* title, struct miqt_string* label, int echo, struct miqt_string* text, bool* ok, int flags, int inputMethodHints) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString label_QString = QString::fromUtf8(&label->data, label->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); +struct miqt_string QInputDialog_GetText8(QWidget* parent, struct miqt_string title, struct miqt_string label, int echo, struct miqt_string text, bool* ok, int flags, int inputMethodHints) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString label_QString = QString::fromUtf8(label.data, label.len); + QString text_QString = QString::fromUtf8(text.data, text.len); QString _ret = QInputDialog::getText(parent, title_QString, label_QString, static_cast(echo), text_QString, ok, static_cast(flags), static_cast(inputMethodHints)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QInputDialog_GetMultiLineText4(QWidget* parent, struct miqt_string* title, struct miqt_string* label, struct miqt_string* text) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString label_QString = QString::fromUtf8(&label->data, label->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); +struct miqt_string QInputDialog_GetMultiLineText4(QWidget* parent, struct miqt_string title, struct miqt_string label, struct miqt_string text) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString label_QString = QString::fromUtf8(label.data, label.len); + QString text_QString = QString::fromUtf8(text.data, text.len); QString _ret = QInputDialog::getMultiLineText(parent, title_QString, label_QString, text_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QInputDialog_GetMultiLineText5(QWidget* parent, struct miqt_string* title, struct miqt_string* label, struct miqt_string* text, bool* ok) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString label_QString = QString::fromUtf8(&label->data, label->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); +struct miqt_string QInputDialog_GetMultiLineText5(QWidget* parent, struct miqt_string title, struct miqt_string label, struct miqt_string text, bool* ok) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString label_QString = QString::fromUtf8(label.data, label.len); + QString text_QString = QString::fromUtf8(text.data, text.len); QString _ret = QInputDialog::getMultiLineText(parent, title_QString, label_QString, text_QString, ok); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QInputDialog_GetMultiLineText6(QWidget* parent, struct miqt_string* title, struct miqt_string* label, struct miqt_string* text, bool* ok, int flags) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString label_QString = QString::fromUtf8(&label->data, label->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); +struct miqt_string QInputDialog_GetMultiLineText6(QWidget* parent, struct miqt_string title, struct miqt_string label, struct miqt_string text, bool* ok, int flags) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString label_QString = QString::fromUtf8(label.data, label.len); + QString text_QString = QString::fromUtf8(text.data, text.len); QString _ret = QInputDialog::getMultiLineText(parent, title_QString, label_QString, text_QString, ok, static_cast(flags)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QInputDialog_GetMultiLineText7(QWidget* parent, struct miqt_string* title, struct miqt_string* label, struct miqt_string* text, bool* ok, int flags, int inputMethodHints) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString label_QString = QString::fromUtf8(&label->data, label->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); +struct miqt_string QInputDialog_GetMultiLineText7(QWidget* parent, struct miqt_string title, struct miqt_string label, struct miqt_string text, bool* ok, int flags, int inputMethodHints) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString label_QString = QString::fromUtf8(label.data, label.len); + QString text_QString = QString::fromUtf8(text.data, text.len); QString _ret = QInputDialog::getMultiLineText(parent, title_QString, label_QString, text_QString, ok, static_cast(flags), static_cast(inputMethodHints)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QInputDialog_GetItem5(QWidget* parent, struct miqt_string* title, struct miqt_string* label, struct miqt_array* /* of struct miqt_string* */ items, int current) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString label_QString = QString::fromUtf8(&label->data, label->len); +struct miqt_string QInputDialog_GetItem5(QWidget* parent, struct miqt_string title, struct miqt_string label, struct miqt_array* /* of struct miqt_string */ items, int current) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString label_QString = QString::fromUtf8(label.data, label.len); QStringList items_QList; items_QList.reserve(items->len); - struct miqt_string** items_arr = static_cast(items->data); + struct miqt_string* items_arr = static_cast(items->data); for(size_t i = 0; i < items->len; ++i) { - QString items_arr_i_QString = QString::fromUtf8(&items_arr[i]->data, items_arr[i]->len); + QString items_arr_i_QString = QString::fromUtf8(items_arr[i].data, items_arr[i].len); items_QList.push_back(items_arr_i_QString); } QString _ret = QInputDialog::getItem(parent, title_QString, label_QString, items_QList, static_cast(current)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QInputDialog_GetItem6(QWidget* parent, struct miqt_string* title, struct miqt_string* label, struct miqt_array* /* of struct miqt_string* */ items, int current, bool editable) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString label_QString = QString::fromUtf8(&label->data, label->len); +struct miqt_string QInputDialog_GetItem6(QWidget* parent, struct miqt_string title, struct miqt_string label, struct miqt_array* /* of struct miqt_string */ items, int current, bool editable) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString label_QString = QString::fromUtf8(label.data, label.len); QStringList items_QList; items_QList.reserve(items->len); - struct miqt_string** items_arr = static_cast(items->data); + struct miqt_string* items_arr = static_cast(items->data); for(size_t i = 0; i < items->len; ++i) { - QString items_arr_i_QString = QString::fromUtf8(&items_arr[i]->data, items_arr[i]->len); + QString items_arr_i_QString = QString::fromUtf8(items_arr[i].data, items_arr[i].len); items_QList.push_back(items_arr_i_QString); } QString _ret = QInputDialog::getItem(parent, title_QString, label_QString, items_QList, static_cast(current), editable); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QInputDialog_GetItem7(QWidget* parent, struct miqt_string* title, struct miqt_string* label, struct miqt_array* /* of struct miqt_string* */ items, int current, bool editable, bool* ok) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString label_QString = QString::fromUtf8(&label->data, label->len); +struct miqt_string QInputDialog_GetItem7(QWidget* parent, struct miqt_string title, struct miqt_string label, struct miqt_array* /* of struct miqt_string */ items, int current, bool editable, bool* ok) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString label_QString = QString::fromUtf8(label.data, label.len); QStringList items_QList; items_QList.reserve(items->len); - struct miqt_string** items_arr = static_cast(items->data); + struct miqt_string* items_arr = static_cast(items->data); for(size_t i = 0; i < items->len; ++i) { - QString items_arr_i_QString = QString::fromUtf8(&items_arr[i]->data, items_arr[i]->len); + QString items_arr_i_QString = QString::fromUtf8(items_arr[i].data, items_arr[i].len); items_QList.push_back(items_arr_i_QString); } QString _ret = QInputDialog::getItem(parent, title_QString, label_QString, items_QList, static_cast(current), editable, ok); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QInputDialog_GetItem8(QWidget* parent, struct miqt_string* title, struct miqt_string* label, struct miqt_array* /* of struct miqt_string* */ items, int current, bool editable, bool* ok, int flags) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString label_QString = QString::fromUtf8(&label->data, label->len); +struct miqt_string QInputDialog_GetItem8(QWidget* parent, struct miqt_string title, struct miqt_string label, struct miqt_array* /* of struct miqt_string */ items, int current, bool editable, bool* ok, int flags) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString label_QString = QString::fromUtf8(label.data, label.len); QStringList items_QList; items_QList.reserve(items->len); - struct miqt_string** items_arr = static_cast(items->data); + struct miqt_string* items_arr = static_cast(items->data); for(size_t i = 0; i < items->len; ++i) { - QString items_arr_i_QString = QString::fromUtf8(&items_arr[i]->data, items_arr[i]->len); + QString items_arr_i_QString = QString::fromUtf8(items_arr[i].data, items_arr[i].len); items_QList.push_back(items_arr_i_QString); } QString _ret = QInputDialog::getItem(parent, title_QString, label_QString, items_QList, static_cast(current), editable, ok, static_cast(flags)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QInputDialog_GetItem9(QWidget* parent, struct miqt_string* title, struct miqt_string* label, struct miqt_array* /* of struct miqt_string* */ items, int current, bool editable, bool* ok, int flags, int inputMethodHints) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString label_QString = QString::fromUtf8(&label->data, label->len); +struct miqt_string QInputDialog_GetItem9(QWidget* parent, struct miqt_string title, struct miqt_string label, struct miqt_array* /* of struct miqt_string */ items, int current, bool editable, bool* ok, int flags, int inputMethodHints) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString label_QString = QString::fromUtf8(label.data, label.len); QStringList items_QList; items_QList.reserve(items->len); - struct miqt_string** items_arr = static_cast(items->data); + struct miqt_string* items_arr = static_cast(items->data); for(size_t i = 0; i < items->len; ++i) { - QString items_arr_i_QString = QString::fromUtf8(&items_arr[i]->data, items_arr[i]->len); + QString items_arr_i_QString = QString::fromUtf8(items_arr[i].data, items_arr[i].len); items_QList.push_back(items_arr_i_QString); } QString _ret = QInputDialog::getItem(parent, title_QString, label_QString, items_QList, static_cast(current), editable, ok, static_cast(flags), static_cast(inputMethodHints)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -int QInputDialog_GetInt4(QWidget* parent, struct miqt_string* title, struct miqt_string* label, int value) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString label_QString = QString::fromUtf8(&label->data, label->len); +int QInputDialog_GetInt4(QWidget* parent, struct miqt_string title, struct miqt_string label, int value) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString label_QString = QString::fromUtf8(label.data, label.len); return QInputDialog::getInt(parent, title_QString, label_QString, static_cast(value)); } -int QInputDialog_GetInt5(QWidget* parent, struct miqt_string* title, struct miqt_string* label, int value, int minValue) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString label_QString = QString::fromUtf8(&label->data, label->len); +int QInputDialog_GetInt5(QWidget* parent, struct miqt_string title, struct miqt_string label, int value, int minValue) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString label_QString = QString::fromUtf8(label.data, label.len); return QInputDialog::getInt(parent, title_QString, label_QString, static_cast(value), static_cast(minValue)); } -int QInputDialog_GetInt6(QWidget* parent, struct miqt_string* title, struct miqt_string* label, int value, int minValue, int maxValue) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString label_QString = QString::fromUtf8(&label->data, label->len); +int QInputDialog_GetInt6(QWidget* parent, struct miqt_string title, struct miqt_string label, int value, int minValue, int maxValue) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString label_QString = QString::fromUtf8(label.data, label.len); return QInputDialog::getInt(parent, title_QString, label_QString, static_cast(value), static_cast(minValue), static_cast(maxValue)); } -int QInputDialog_GetInt7(QWidget* parent, struct miqt_string* title, struct miqt_string* label, int value, int minValue, int maxValue, int step) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString label_QString = QString::fromUtf8(&label->data, label->len); +int QInputDialog_GetInt7(QWidget* parent, struct miqt_string title, struct miqt_string label, int value, int minValue, int maxValue, int step) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString label_QString = QString::fromUtf8(label.data, label.len); return QInputDialog::getInt(parent, title_QString, label_QString, static_cast(value), static_cast(minValue), static_cast(maxValue), static_cast(step)); } -int QInputDialog_GetInt8(QWidget* parent, struct miqt_string* title, struct miqt_string* label, int value, int minValue, int maxValue, int step, bool* ok) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString label_QString = QString::fromUtf8(&label->data, label->len); +int QInputDialog_GetInt8(QWidget* parent, struct miqt_string title, struct miqt_string label, int value, int minValue, int maxValue, int step, bool* ok) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString label_QString = QString::fromUtf8(label.data, label.len); return QInputDialog::getInt(parent, title_QString, label_QString, static_cast(value), static_cast(minValue), static_cast(maxValue), static_cast(step), ok); } -int QInputDialog_GetInt9(QWidget* parent, struct miqt_string* title, struct miqt_string* label, int value, int minValue, int maxValue, int step, bool* ok, int flags) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString label_QString = QString::fromUtf8(&label->data, label->len); +int QInputDialog_GetInt9(QWidget* parent, struct miqt_string title, struct miqt_string label, int value, int minValue, int maxValue, int step, bool* ok, int flags) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString label_QString = QString::fromUtf8(label.data, label.len); return QInputDialog::getInt(parent, title_QString, label_QString, static_cast(value), static_cast(minValue), static_cast(maxValue), static_cast(step), ok, static_cast(flags)); } -double QInputDialog_GetDouble4(QWidget* parent, struct miqt_string* title, struct miqt_string* label, double value) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString label_QString = QString::fromUtf8(&label->data, label->len); +double QInputDialog_GetDouble4(QWidget* parent, struct miqt_string title, struct miqt_string label, double value) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString label_QString = QString::fromUtf8(label.data, label.len); return QInputDialog::getDouble(parent, title_QString, label_QString, static_cast(value)); } -double QInputDialog_GetDouble5(QWidget* parent, struct miqt_string* title, struct miqt_string* label, double value, double minValue) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString label_QString = QString::fromUtf8(&label->data, label->len); +double QInputDialog_GetDouble5(QWidget* parent, struct miqt_string title, struct miqt_string label, double value, double minValue) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString label_QString = QString::fromUtf8(label.data, label.len); return QInputDialog::getDouble(parent, title_QString, label_QString, static_cast(value), static_cast(minValue)); } -double QInputDialog_GetDouble6(QWidget* parent, struct miqt_string* title, struct miqt_string* label, double value, double minValue, double maxValue) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString label_QString = QString::fromUtf8(&label->data, label->len); +double QInputDialog_GetDouble6(QWidget* parent, struct miqt_string title, struct miqt_string label, double value, double minValue, double maxValue) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString label_QString = QString::fromUtf8(label.data, label.len); return QInputDialog::getDouble(parent, title_QString, label_QString, static_cast(value), static_cast(minValue), static_cast(maxValue)); } -double QInputDialog_GetDouble7(QWidget* parent, struct miqt_string* title, struct miqt_string* label, double value, double minValue, double maxValue, int decimals) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString label_QString = QString::fromUtf8(&label->data, label->len); +double QInputDialog_GetDouble7(QWidget* parent, struct miqt_string title, struct miqt_string label, double value, double minValue, double maxValue, int decimals) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString label_QString = QString::fromUtf8(label.data, label.len); return QInputDialog::getDouble(parent, title_QString, label_QString, static_cast(value), static_cast(minValue), static_cast(maxValue), static_cast(decimals)); } -double QInputDialog_GetDouble8(QWidget* parent, struct miqt_string* title, struct miqt_string* label, double value, double minValue, double maxValue, int decimals, bool* ok) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString label_QString = QString::fromUtf8(&label->data, label->len); +double QInputDialog_GetDouble8(QWidget* parent, struct miqt_string title, struct miqt_string label, double value, double minValue, double maxValue, int decimals, bool* ok) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString label_QString = QString::fromUtf8(label.data, label.len); return QInputDialog::getDouble(parent, title_QString, label_QString, static_cast(value), static_cast(minValue), static_cast(maxValue), static_cast(decimals), ok); } -double QInputDialog_GetDouble9(QWidget* parent, struct miqt_string* title, struct miqt_string* label, double value, double minValue, double maxValue, int decimals, bool* ok, int flags) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString label_QString = QString::fromUtf8(&label->data, label->len); +double QInputDialog_GetDouble9(QWidget* parent, struct miqt_string title, struct miqt_string label, double value, double minValue, double maxValue, int decimals, bool* ok, int flags) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString label_QString = QString::fromUtf8(label.data, label.len); return QInputDialog::getDouble(parent, title_QString, label_QString, static_cast(value), static_cast(minValue), static_cast(maxValue), static_cast(decimals), ok, static_cast(flags)); } diff --git a/qt/gen_qinputdialog.go b/qt/gen_qinputdialog.go index 56a930ff..9225f9e0 100644 --- a/qt/gen_qinputdialog.go +++ b/qt/gen_qinputdialog.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "runtime/cgo" "unsafe" @@ -86,24 +85,24 @@ func (this *QInputDialog) MetaObject() *QMetaObject { func (this *QInputDialog) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QInputDialog_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QInputDialog_Metacast(this.h, param1_Cstring)) } func QInputDialog_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QInputDialog_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QInputDialog_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QInputDialog_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QInputDialog_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QInputDialog_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -116,15 +115,17 @@ func (this *QInputDialog) InputMode() QInputDialog__InputMode { } func (this *QInputDialog) SetLabelText(text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QInputDialog_SetLabelText(this.h, (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QInputDialog_SetLabelText(this.h, text_ms) } func (this *QInputDialog) LabelText() string { - var _ms *C.struct_miqt_string = C.QInputDialog_LabelText(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QInputDialog_LabelText(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -145,15 +146,17 @@ func (this *QInputDialog) Options() QInputDialog__InputDialogOption { } func (this *QInputDialog) SetTextValue(text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QInputDialog_SetTextValue(this.h, (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QInputDialog_SetTextValue(this.h, text_ms) } func (this *QInputDialog) TextValue() string { - var _ms *C.struct_miqt_string = C.QInputDialog_TextValue(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QInputDialog_TextValue(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -175,12 +178,14 @@ func (this *QInputDialog) IsComboBoxEditable() bool { func (this *QInputDialog) SetComboBoxItems(items []string) { // For the C ABI, malloc a C array of raw pointers - items_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(items)))) + items_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(items)))) defer C.free(unsafe.Pointer(items_CArray)) for i := range items { - items_i_ms := libmiqt.Strdupg(items[i]) - defer C.free(items_i_ms) - items_CArray[i] = (*C.struct_miqt_string)(items_i_ms) + items_i_ms := C.struct_miqt_string{} + items_i_ms.data = C.CString(items[i]) + items_i_ms.len = C.size_t(len(items[i])) + defer C.free(unsafe.Pointer(items_i_ms.data)) + items_CArray[i] = items_i_ms } items_ma := &C.struct_miqt_array{len: C.size_t(len(items)), data: unsafe.Pointer(items_CArray)} defer runtime.KeepAlive(unsafe.Pointer(items_ma)) @@ -190,11 +195,11 @@ func (this *QInputDialog) SetComboBoxItems(items []string) { func (this *QInputDialog) ComboBoxItems() []string { var _ma *C.struct_miqt_array = C.QInputDialog_ComboBoxItems(this.h) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -274,28 +279,32 @@ func (this *QInputDialog) DoubleDecimals() int { } func (this *QInputDialog) SetOkButtonText(text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QInputDialog_SetOkButtonText(this.h, (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QInputDialog_SetOkButtonText(this.h, text_ms) } func (this *QInputDialog) OkButtonText() string { - var _ms *C.struct_miqt_string = C.QInputDialog_OkButtonText(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QInputDialog_OkButtonText(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QInputDialog) SetCancelButtonText(text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QInputDialog_SetCancelButtonText(this.h, (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QInputDialog_SetCancelButtonText(this.h, text_ms) } func (this *QInputDialog) CancelButtonText() string { - var _ms *C.struct_miqt_string = C.QInputDialog_CancelButtonText(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QInputDialog_CancelButtonText(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -318,70 +327,96 @@ func (this *QInputDialog) SetVisible(visible bool) { } func QInputDialog_GetText(parent *QWidget, title string, label string) string { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - label_ms := libmiqt.Strdupg(label) - defer C.free(label_ms) - var _ms *C.struct_miqt_string = C.QInputDialog_GetText(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(label_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + label_ms := C.struct_miqt_string{} + label_ms.data = C.CString(label) + label_ms.len = C.size_t(len(label)) + defer C.free(unsafe.Pointer(label_ms.data)) + var _ms C.struct_miqt_string = C.QInputDialog_GetText(parent.cPointer(), title_ms, label_ms) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QInputDialog_GetMultiLineText(parent *QWidget, title string, label string) string { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - label_ms := libmiqt.Strdupg(label) - defer C.free(label_ms) - var _ms *C.struct_miqt_string = C.QInputDialog_GetMultiLineText(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(label_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + label_ms := C.struct_miqt_string{} + label_ms.data = C.CString(label) + label_ms.len = C.size_t(len(label)) + defer C.free(unsafe.Pointer(label_ms.data)) + var _ms C.struct_miqt_string = C.QInputDialog_GetMultiLineText(parent.cPointer(), title_ms, label_ms) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QInputDialog_GetItem(parent *QWidget, title string, label string, items []string) string { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - label_ms := libmiqt.Strdupg(label) - defer C.free(label_ms) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + label_ms := C.struct_miqt_string{} + label_ms.data = C.CString(label) + label_ms.len = C.size_t(len(label)) + defer C.free(unsafe.Pointer(label_ms.data)) // For the C ABI, malloc a C array of raw pointers - items_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(items)))) + items_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(items)))) defer C.free(unsafe.Pointer(items_CArray)) for i := range items { - items_i_ms := libmiqt.Strdupg(items[i]) - defer C.free(items_i_ms) - items_CArray[i] = (*C.struct_miqt_string)(items_i_ms) + items_i_ms := C.struct_miqt_string{} + items_i_ms.data = C.CString(items[i]) + items_i_ms.len = C.size_t(len(items[i])) + defer C.free(unsafe.Pointer(items_i_ms.data)) + items_CArray[i] = items_i_ms } items_ma := &C.struct_miqt_array{len: C.size_t(len(items)), data: unsafe.Pointer(items_CArray)} defer runtime.KeepAlive(unsafe.Pointer(items_ma)) - var _ms *C.struct_miqt_string = C.QInputDialog_GetItem(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(label_ms), items_ma) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QInputDialog_GetItem(parent.cPointer(), title_ms, label_ms, items_ma) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QInputDialog_GetInt(parent *QWidget, title string, label string) int { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - label_ms := libmiqt.Strdupg(label) - defer C.free(label_ms) - return (int)(C.QInputDialog_GetInt(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(label_ms))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + label_ms := C.struct_miqt_string{} + label_ms.data = C.CString(label) + label_ms.len = C.size_t(len(label)) + defer C.free(unsafe.Pointer(label_ms.data)) + return (int)(C.QInputDialog_GetInt(parent.cPointer(), title_ms, label_ms)) } func QInputDialog_GetDouble(parent *QWidget, title string, label string) float64 { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - label_ms := libmiqt.Strdupg(label) - defer C.free(label_ms) - return (float64)(C.QInputDialog_GetDouble(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(label_ms))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + label_ms := C.struct_miqt_string{} + label_ms.data = C.CString(label) + label_ms.len = C.size_t(len(label)) + defer C.free(unsafe.Pointer(label_ms.data)) + return (float64)(C.QInputDialog_GetDouble(parent.cPointer(), title_ms, label_ms)) } func QInputDialog_GetDouble2(parent *QWidget, title string, label string, value float64, minValue float64, maxValue float64, decimals int, ok *bool, flags WindowType, step float64) float64 { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - label_ms := libmiqt.Strdupg(label) - defer C.free(label_ms) - return (float64)(C.QInputDialog_GetDouble2(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(label_ms), (C.double)(value), (C.double)(minValue), (C.double)(maxValue), (C.int)(decimals), (*C.bool)(unsafe.Pointer(ok)), (C.int)(flags), (C.double)(step))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + label_ms := C.struct_miqt_string{} + label_ms.data = C.CString(label) + label_ms.len = C.size_t(len(label)) + defer C.free(unsafe.Pointer(label_ms.data)) + return (float64)(C.QInputDialog_GetDouble2(parent.cPointer(), title_ms, label_ms, (C.double)(value), (C.double)(minValue), (C.double)(maxValue), (C.int)(decimals), (*C.bool)(unsafe.Pointer(ok)), (C.int)(flags), (C.double)(step))) } func (this *QInputDialog) SetDoubleStep(step float64) { @@ -393,50 +428,54 @@ func (this *QInputDialog) DoubleStep() float64 { } func (this *QInputDialog) TextValueChanged(text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QInputDialog_TextValueChanged(this.h, (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QInputDialog_TextValueChanged(this.h, text_ms) } func (this *QInputDialog) OnTextValueChanged(slot func(text string)) { C.QInputDialog_connect_TextValueChanged(this.h, C.intptr_t(cgo.NewHandle(slot))) } //export miqt_exec_callback_QInputDialog_TextValueChanged -func miqt_exec_callback_QInputDialog_TextValueChanged(cb C.intptr_t, text *C.struct_miqt_string) { +func miqt_exec_callback_QInputDialog_TextValueChanged(cb C.intptr_t, text C.struct_miqt_string) { gofunc, ok := cgo.Handle(cb).Value().(func(text string)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") } // Convert all CABI parameters to Go parameters - var text_ms *C.struct_miqt_string = text - text_ret := C.GoStringN(&text_ms.data, C.int(int64(text_ms.len))) - C.free(unsafe.Pointer(text_ms)) + var text_ms C.struct_miqt_string = text + text_ret := C.GoStringN(text_ms.data, C.int(int64(text_ms.len))) + C.free(unsafe.Pointer(text_ms.data)) slotval1 := text_ret gofunc(slotval1) } func (this *QInputDialog) TextValueSelected(text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QInputDialog_TextValueSelected(this.h, (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QInputDialog_TextValueSelected(this.h, text_ms) } func (this *QInputDialog) OnTextValueSelected(slot func(text string)) { C.QInputDialog_connect_TextValueSelected(this.h, C.intptr_t(cgo.NewHandle(slot))) } //export miqt_exec_callback_QInputDialog_TextValueSelected -func miqt_exec_callback_QInputDialog_TextValueSelected(cb C.intptr_t, text *C.struct_miqt_string) { +func miqt_exec_callback_QInputDialog_TextValueSelected(cb C.intptr_t, text C.struct_miqt_string) { gofunc, ok := cgo.Handle(cb).Value().(func(text string)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") } // Convert all CABI parameters to Go parameters - var text_ms *C.struct_miqt_string = text - text_ret := C.GoStringN(&text_ms.data, C.int(int64(text_ms.len))) - C.free(unsafe.Pointer(text_ms)) + var text_ms C.struct_miqt_string = text + text_ret := C.GoStringN(text_ms.data, C.int(int64(text_ms.len))) + C.free(unsafe.Pointer(text_ms.data)) slotval1 := text_ret gofunc(slotval1) @@ -531,9 +570,9 @@ func QInputDialog_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QInputDialog_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QInputDialog_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -542,9 +581,9 @@ func QInputDialog_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QInputDialog_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QInputDialog_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -553,9 +592,9 @@ func QInputDialog_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QInputDialog_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QInputDialog_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -564,9 +603,9 @@ func QInputDialog_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QInputDialog_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QInputDialog_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -575,319 +614,449 @@ func (this *QInputDialog) SetOption2(option QInputDialog__InputDialogOption, on } func QInputDialog_GetText4(parent *QWidget, title string, label string, echo QLineEdit__EchoMode) string { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - label_ms := libmiqt.Strdupg(label) - defer C.free(label_ms) - var _ms *C.struct_miqt_string = C.QInputDialog_GetText4(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(label_ms), (C.int)(echo)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + label_ms := C.struct_miqt_string{} + label_ms.data = C.CString(label) + label_ms.len = C.size_t(len(label)) + defer C.free(unsafe.Pointer(label_ms.data)) + var _ms C.struct_miqt_string = C.QInputDialog_GetText4(parent.cPointer(), title_ms, label_ms, (C.int)(echo)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QInputDialog_GetText5(parent *QWidget, title string, label string, echo QLineEdit__EchoMode, text string) string { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - label_ms := libmiqt.Strdupg(label) - defer C.free(label_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - var _ms *C.struct_miqt_string = C.QInputDialog_GetText5(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(label_ms), (C.int)(echo), (*C.struct_miqt_string)(text_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + label_ms := C.struct_miqt_string{} + label_ms.data = C.CString(label) + label_ms.len = C.size_t(len(label)) + defer C.free(unsafe.Pointer(label_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + var _ms C.struct_miqt_string = C.QInputDialog_GetText5(parent.cPointer(), title_ms, label_ms, (C.int)(echo), text_ms) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QInputDialog_GetText6(parent *QWidget, title string, label string, echo QLineEdit__EchoMode, text string, ok *bool) string { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - label_ms := libmiqt.Strdupg(label) - defer C.free(label_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - var _ms *C.struct_miqt_string = C.QInputDialog_GetText6(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(label_ms), (C.int)(echo), (*C.struct_miqt_string)(text_ms), (*C.bool)(unsafe.Pointer(ok))) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + label_ms := C.struct_miqt_string{} + label_ms.data = C.CString(label) + label_ms.len = C.size_t(len(label)) + defer C.free(unsafe.Pointer(label_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + var _ms C.struct_miqt_string = C.QInputDialog_GetText6(parent.cPointer(), title_ms, label_ms, (C.int)(echo), text_ms, (*C.bool)(unsafe.Pointer(ok))) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QInputDialog_GetText7(parent *QWidget, title string, label string, echo QLineEdit__EchoMode, text string, ok *bool, flags WindowType) string { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - label_ms := libmiqt.Strdupg(label) - defer C.free(label_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - var _ms *C.struct_miqt_string = C.QInputDialog_GetText7(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(label_ms), (C.int)(echo), (*C.struct_miqt_string)(text_ms), (*C.bool)(unsafe.Pointer(ok)), (C.int)(flags)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + label_ms := C.struct_miqt_string{} + label_ms.data = C.CString(label) + label_ms.len = C.size_t(len(label)) + defer C.free(unsafe.Pointer(label_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + var _ms C.struct_miqt_string = C.QInputDialog_GetText7(parent.cPointer(), title_ms, label_ms, (C.int)(echo), text_ms, (*C.bool)(unsafe.Pointer(ok)), (C.int)(flags)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QInputDialog_GetText8(parent *QWidget, title string, label string, echo QLineEdit__EchoMode, text string, ok *bool, flags WindowType, inputMethodHints InputMethodHint) string { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - label_ms := libmiqt.Strdupg(label) - defer C.free(label_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - var _ms *C.struct_miqt_string = C.QInputDialog_GetText8(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(label_ms), (C.int)(echo), (*C.struct_miqt_string)(text_ms), (*C.bool)(unsafe.Pointer(ok)), (C.int)(flags), (C.int)(inputMethodHints)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + label_ms := C.struct_miqt_string{} + label_ms.data = C.CString(label) + label_ms.len = C.size_t(len(label)) + defer C.free(unsafe.Pointer(label_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + var _ms C.struct_miqt_string = C.QInputDialog_GetText8(parent.cPointer(), title_ms, label_ms, (C.int)(echo), text_ms, (*C.bool)(unsafe.Pointer(ok)), (C.int)(flags), (C.int)(inputMethodHints)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QInputDialog_GetMultiLineText4(parent *QWidget, title string, label string, text string) string { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - label_ms := libmiqt.Strdupg(label) - defer C.free(label_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - var _ms *C.struct_miqt_string = C.QInputDialog_GetMultiLineText4(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(label_ms), (*C.struct_miqt_string)(text_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + label_ms := C.struct_miqt_string{} + label_ms.data = C.CString(label) + label_ms.len = C.size_t(len(label)) + defer C.free(unsafe.Pointer(label_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + var _ms C.struct_miqt_string = C.QInputDialog_GetMultiLineText4(parent.cPointer(), title_ms, label_ms, text_ms) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QInputDialog_GetMultiLineText5(parent *QWidget, title string, label string, text string, ok *bool) string { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - label_ms := libmiqt.Strdupg(label) - defer C.free(label_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - var _ms *C.struct_miqt_string = C.QInputDialog_GetMultiLineText5(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(label_ms), (*C.struct_miqt_string)(text_ms), (*C.bool)(unsafe.Pointer(ok))) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + label_ms := C.struct_miqt_string{} + label_ms.data = C.CString(label) + label_ms.len = C.size_t(len(label)) + defer C.free(unsafe.Pointer(label_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + var _ms C.struct_miqt_string = C.QInputDialog_GetMultiLineText5(parent.cPointer(), title_ms, label_ms, text_ms, (*C.bool)(unsafe.Pointer(ok))) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QInputDialog_GetMultiLineText6(parent *QWidget, title string, label string, text string, ok *bool, flags WindowType) string { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - label_ms := libmiqt.Strdupg(label) - defer C.free(label_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - var _ms *C.struct_miqt_string = C.QInputDialog_GetMultiLineText6(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(label_ms), (*C.struct_miqt_string)(text_ms), (*C.bool)(unsafe.Pointer(ok)), (C.int)(flags)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + label_ms := C.struct_miqt_string{} + label_ms.data = C.CString(label) + label_ms.len = C.size_t(len(label)) + defer C.free(unsafe.Pointer(label_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + var _ms C.struct_miqt_string = C.QInputDialog_GetMultiLineText6(parent.cPointer(), title_ms, label_ms, text_ms, (*C.bool)(unsafe.Pointer(ok)), (C.int)(flags)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QInputDialog_GetMultiLineText7(parent *QWidget, title string, label string, text string, ok *bool, flags WindowType, inputMethodHints InputMethodHint) string { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - label_ms := libmiqt.Strdupg(label) - defer C.free(label_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - var _ms *C.struct_miqt_string = C.QInputDialog_GetMultiLineText7(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(label_ms), (*C.struct_miqt_string)(text_ms), (*C.bool)(unsafe.Pointer(ok)), (C.int)(flags), (C.int)(inputMethodHints)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + label_ms := C.struct_miqt_string{} + label_ms.data = C.CString(label) + label_ms.len = C.size_t(len(label)) + defer C.free(unsafe.Pointer(label_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + var _ms C.struct_miqt_string = C.QInputDialog_GetMultiLineText7(parent.cPointer(), title_ms, label_ms, text_ms, (*C.bool)(unsafe.Pointer(ok)), (C.int)(flags), (C.int)(inputMethodHints)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QInputDialog_GetItem5(parent *QWidget, title string, label string, items []string, current int) string { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - label_ms := libmiqt.Strdupg(label) - defer C.free(label_ms) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + label_ms := C.struct_miqt_string{} + label_ms.data = C.CString(label) + label_ms.len = C.size_t(len(label)) + defer C.free(unsafe.Pointer(label_ms.data)) // For the C ABI, malloc a C array of raw pointers - items_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(items)))) + items_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(items)))) defer C.free(unsafe.Pointer(items_CArray)) for i := range items { - items_i_ms := libmiqt.Strdupg(items[i]) - defer C.free(items_i_ms) - items_CArray[i] = (*C.struct_miqt_string)(items_i_ms) + items_i_ms := C.struct_miqt_string{} + items_i_ms.data = C.CString(items[i]) + items_i_ms.len = C.size_t(len(items[i])) + defer C.free(unsafe.Pointer(items_i_ms.data)) + items_CArray[i] = items_i_ms } items_ma := &C.struct_miqt_array{len: C.size_t(len(items)), data: unsafe.Pointer(items_CArray)} defer runtime.KeepAlive(unsafe.Pointer(items_ma)) - var _ms *C.struct_miqt_string = C.QInputDialog_GetItem5(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(label_ms), items_ma, (C.int)(current)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QInputDialog_GetItem5(parent.cPointer(), title_ms, label_ms, items_ma, (C.int)(current)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QInputDialog_GetItem6(parent *QWidget, title string, label string, items []string, current int, editable bool) string { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - label_ms := libmiqt.Strdupg(label) - defer C.free(label_ms) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + label_ms := C.struct_miqt_string{} + label_ms.data = C.CString(label) + label_ms.len = C.size_t(len(label)) + defer C.free(unsafe.Pointer(label_ms.data)) // For the C ABI, malloc a C array of raw pointers - items_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(items)))) + items_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(items)))) defer C.free(unsafe.Pointer(items_CArray)) for i := range items { - items_i_ms := libmiqt.Strdupg(items[i]) - defer C.free(items_i_ms) - items_CArray[i] = (*C.struct_miqt_string)(items_i_ms) + items_i_ms := C.struct_miqt_string{} + items_i_ms.data = C.CString(items[i]) + items_i_ms.len = C.size_t(len(items[i])) + defer C.free(unsafe.Pointer(items_i_ms.data)) + items_CArray[i] = items_i_ms } items_ma := &C.struct_miqt_array{len: C.size_t(len(items)), data: unsafe.Pointer(items_CArray)} defer runtime.KeepAlive(unsafe.Pointer(items_ma)) - var _ms *C.struct_miqt_string = C.QInputDialog_GetItem6(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(label_ms), items_ma, (C.int)(current), (C.bool)(editable)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QInputDialog_GetItem6(parent.cPointer(), title_ms, label_ms, items_ma, (C.int)(current), (C.bool)(editable)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QInputDialog_GetItem7(parent *QWidget, title string, label string, items []string, current int, editable bool, ok *bool) string { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - label_ms := libmiqt.Strdupg(label) - defer C.free(label_ms) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + label_ms := C.struct_miqt_string{} + label_ms.data = C.CString(label) + label_ms.len = C.size_t(len(label)) + defer C.free(unsafe.Pointer(label_ms.data)) // For the C ABI, malloc a C array of raw pointers - items_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(items)))) + items_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(items)))) defer C.free(unsafe.Pointer(items_CArray)) for i := range items { - items_i_ms := libmiqt.Strdupg(items[i]) - defer C.free(items_i_ms) - items_CArray[i] = (*C.struct_miqt_string)(items_i_ms) + items_i_ms := C.struct_miqt_string{} + items_i_ms.data = C.CString(items[i]) + items_i_ms.len = C.size_t(len(items[i])) + defer C.free(unsafe.Pointer(items_i_ms.data)) + items_CArray[i] = items_i_ms } items_ma := &C.struct_miqt_array{len: C.size_t(len(items)), data: unsafe.Pointer(items_CArray)} defer runtime.KeepAlive(unsafe.Pointer(items_ma)) - var _ms *C.struct_miqt_string = C.QInputDialog_GetItem7(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(label_ms), items_ma, (C.int)(current), (C.bool)(editable), (*C.bool)(unsafe.Pointer(ok))) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QInputDialog_GetItem7(parent.cPointer(), title_ms, label_ms, items_ma, (C.int)(current), (C.bool)(editable), (*C.bool)(unsafe.Pointer(ok))) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QInputDialog_GetItem8(parent *QWidget, title string, label string, items []string, current int, editable bool, ok *bool, flags WindowType) string { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - label_ms := libmiqt.Strdupg(label) - defer C.free(label_ms) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + label_ms := C.struct_miqt_string{} + label_ms.data = C.CString(label) + label_ms.len = C.size_t(len(label)) + defer C.free(unsafe.Pointer(label_ms.data)) // For the C ABI, malloc a C array of raw pointers - items_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(items)))) + items_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(items)))) defer C.free(unsafe.Pointer(items_CArray)) for i := range items { - items_i_ms := libmiqt.Strdupg(items[i]) - defer C.free(items_i_ms) - items_CArray[i] = (*C.struct_miqt_string)(items_i_ms) + items_i_ms := C.struct_miqt_string{} + items_i_ms.data = C.CString(items[i]) + items_i_ms.len = C.size_t(len(items[i])) + defer C.free(unsafe.Pointer(items_i_ms.data)) + items_CArray[i] = items_i_ms } items_ma := &C.struct_miqt_array{len: C.size_t(len(items)), data: unsafe.Pointer(items_CArray)} defer runtime.KeepAlive(unsafe.Pointer(items_ma)) - var _ms *C.struct_miqt_string = C.QInputDialog_GetItem8(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(label_ms), items_ma, (C.int)(current), (C.bool)(editable), (*C.bool)(unsafe.Pointer(ok)), (C.int)(flags)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QInputDialog_GetItem8(parent.cPointer(), title_ms, label_ms, items_ma, (C.int)(current), (C.bool)(editable), (*C.bool)(unsafe.Pointer(ok)), (C.int)(flags)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QInputDialog_GetItem9(parent *QWidget, title string, label string, items []string, current int, editable bool, ok *bool, flags WindowType, inputMethodHints InputMethodHint) string { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - label_ms := libmiqt.Strdupg(label) - defer C.free(label_ms) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + label_ms := C.struct_miqt_string{} + label_ms.data = C.CString(label) + label_ms.len = C.size_t(len(label)) + defer C.free(unsafe.Pointer(label_ms.data)) // For the C ABI, malloc a C array of raw pointers - items_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(items)))) + items_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(items)))) defer C.free(unsafe.Pointer(items_CArray)) for i := range items { - items_i_ms := libmiqt.Strdupg(items[i]) - defer C.free(items_i_ms) - items_CArray[i] = (*C.struct_miqt_string)(items_i_ms) + items_i_ms := C.struct_miqt_string{} + items_i_ms.data = C.CString(items[i]) + items_i_ms.len = C.size_t(len(items[i])) + defer C.free(unsafe.Pointer(items_i_ms.data)) + items_CArray[i] = items_i_ms } items_ma := &C.struct_miqt_array{len: C.size_t(len(items)), data: unsafe.Pointer(items_CArray)} defer runtime.KeepAlive(unsafe.Pointer(items_ma)) - var _ms *C.struct_miqt_string = C.QInputDialog_GetItem9(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(label_ms), items_ma, (C.int)(current), (C.bool)(editable), (*C.bool)(unsafe.Pointer(ok)), (C.int)(flags), (C.int)(inputMethodHints)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QInputDialog_GetItem9(parent.cPointer(), title_ms, label_ms, items_ma, (C.int)(current), (C.bool)(editable), (*C.bool)(unsafe.Pointer(ok)), (C.int)(flags), (C.int)(inputMethodHints)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QInputDialog_GetInt4(parent *QWidget, title string, label string, value int) int { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - label_ms := libmiqt.Strdupg(label) - defer C.free(label_ms) - return (int)(C.QInputDialog_GetInt4(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(label_ms), (C.int)(value))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + label_ms := C.struct_miqt_string{} + label_ms.data = C.CString(label) + label_ms.len = C.size_t(len(label)) + defer C.free(unsafe.Pointer(label_ms.data)) + return (int)(C.QInputDialog_GetInt4(parent.cPointer(), title_ms, label_ms, (C.int)(value))) } func QInputDialog_GetInt5(parent *QWidget, title string, label string, value int, minValue int) int { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - label_ms := libmiqt.Strdupg(label) - defer C.free(label_ms) - return (int)(C.QInputDialog_GetInt5(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(label_ms), (C.int)(value), (C.int)(minValue))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + label_ms := C.struct_miqt_string{} + label_ms.data = C.CString(label) + label_ms.len = C.size_t(len(label)) + defer C.free(unsafe.Pointer(label_ms.data)) + return (int)(C.QInputDialog_GetInt5(parent.cPointer(), title_ms, label_ms, (C.int)(value), (C.int)(minValue))) } func QInputDialog_GetInt6(parent *QWidget, title string, label string, value int, minValue int, maxValue int) int { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - label_ms := libmiqt.Strdupg(label) - defer C.free(label_ms) - return (int)(C.QInputDialog_GetInt6(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(label_ms), (C.int)(value), (C.int)(minValue), (C.int)(maxValue))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + label_ms := C.struct_miqt_string{} + label_ms.data = C.CString(label) + label_ms.len = C.size_t(len(label)) + defer C.free(unsafe.Pointer(label_ms.data)) + return (int)(C.QInputDialog_GetInt6(parent.cPointer(), title_ms, label_ms, (C.int)(value), (C.int)(minValue), (C.int)(maxValue))) } func QInputDialog_GetInt7(parent *QWidget, title string, label string, value int, minValue int, maxValue int, step int) int { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - label_ms := libmiqt.Strdupg(label) - defer C.free(label_ms) - return (int)(C.QInputDialog_GetInt7(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(label_ms), (C.int)(value), (C.int)(minValue), (C.int)(maxValue), (C.int)(step))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + label_ms := C.struct_miqt_string{} + label_ms.data = C.CString(label) + label_ms.len = C.size_t(len(label)) + defer C.free(unsafe.Pointer(label_ms.data)) + return (int)(C.QInputDialog_GetInt7(parent.cPointer(), title_ms, label_ms, (C.int)(value), (C.int)(minValue), (C.int)(maxValue), (C.int)(step))) } func QInputDialog_GetInt8(parent *QWidget, title string, label string, value int, minValue int, maxValue int, step int, ok *bool) int { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - label_ms := libmiqt.Strdupg(label) - defer C.free(label_ms) - return (int)(C.QInputDialog_GetInt8(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(label_ms), (C.int)(value), (C.int)(minValue), (C.int)(maxValue), (C.int)(step), (*C.bool)(unsafe.Pointer(ok)))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + label_ms := C.struct_miqt_string{} + label_ms.data = C.CString(label) + label_ms.len = C.size_t(len(label)) + defer C.free(unsafe.Pointer(label_ms.data)) + return (int)(C.QInputDialog_GetInt8(parent.cPointer(), title_ms, label_ms, (C.int)(value), (C.int)(minValue), (C.int)(maxValue), (C.int)(step), (*C.bool)(unsafe.Pointer(ok)))) } func QInputDialog_GetInt9(parent *QWidget, title string, label string, value int, minValue int, maxValue int, step int, ok *bool, flags WindowType) int { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - label_ms := libmiqt.Strdupg(label) - defer C.free(label_ms) - return (int)(C.QInputDialog_GetInt9(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(label_ms), (C.int)(value), (C.int)(minValue), (C.int)(maxValue), (C.int)(step), (*C.bool)(unsafe.Pointer(ok)), (C.int)(flags))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + label_ms := C.struct_miqt_string{} + label_ms.data = C.CString(label) + label_ms.len = C.size_t(len(label)) + defer C.free(unsafe.Pointer(label_ms.data)) + return (int)(C.QInputDialog_GetInt9(parent.cPointer(), title_ms, label_ms, (C.int)(value), (C.int)(minValue), (C.int)(maxValue), (C.int)(step), (*C.bool)(unsafe.Pointer(ok)), (C.int)(flags))) } func QInputDialog_GetDouble4(parent *QWidget, title string, label string, value float64) float64 { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - label_ms := libmiqt.Strdupg(label) - defer C.free(label_ms) - return (float64)(C.QInputDialog_GetDouble4(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(label_ms), (C.double)(value))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + label_ms := C.struct_miqt_string{} + label_ms.data = C.CString(label) + label_ms.len = C.size_t(len(label)) + defer C.free(unsafe.Pointer(label_ms.data)) + return (float64)(C.QInputDialog_GetDouble4(parent.cPointer(), title_ms, label_ms, (C.double)(value))) } func QInputDialog_GetDouble5(parent *QWidget, title string, label string, value float64, minValue float64) float64 { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - label_ms := libmiqt.Strdupg(label) - defer C.free(label_ms) - return (float64)(C.QInputDialog_GetDouble5(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(label_ms), (C.double)(value), (C.double)(minValue))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + label_ms := C.struct_miqt_string{} + label_ms.data = C.CString(label) + label_ms.len = C.size_t(len(label)) + defer C.free(unsafe.Pointer(label_ms.data)) + return (float64)(C.QInputDialog_GetDouble5(parent.cPointer(), title_ms, label_ms, (C.double)(value), (C.double)(minValue))) } func QInputDialog_GetDouble6(parent *QWidget, title string, label string, value float64, minValue float64, maxValue float64) float64 { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - label_ms := libmiqt.Strdupg(label) - defer C.free(label_ms) - return (float64)(C.QInputDialog_GetDouble6(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(label_ms), (C.double)(value), (C.double)(minValue), (C.double)(maxValue))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + label_ms := C.struct_miqt_string{} + label_ms.data = C.CString(label) + label_ms.len = C.size_t(len(label)) + defer C.free(unsafe.Pointer(label_ms.data)) + return (float64)(C.QInputDialog_GetDouble6(parent.cPointer(), title_ms, label_ms, (C.double)(value), (C.double)(minValue), (C.double)(maxValue))) } func QInputDialog_GetDouble7(parent *QWidget, title string, label string, value float64, minValue float64, maxValue float64, decimals int) float64 { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - label_ms := libmiqt.Strdupg(label) - defer C.free(label_ms) - return (float64)(C.QInputDialog_GetDouble7(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(label_ms), (C.double)(value), (C.double)(minValue), (C.double)(maxValue), (C.int)(decimals))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + label_ms := C.struct_miqt_string{} + label_ms.data = C.CString(label) + label_ms.len = C.size_t(len(label)) + defer C.free(unsafe.Pointer(label_ms.data)) + return (float64)(C.QInputDialog_GetDouble7(parent.cPointer(), title_ms, label_ms, (C.double)(value), (C.double)(minValue), (C.double)(maxValue), (C.int)(decimals))) } func QInputDialog_GetDouble8(parent *QWidget, title string, label string, value float64, minValue float64, maxValue float64, decimals int, ok *bool) float64 { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - label_ms := libmiqt.Strdupg(label) - defer C.free(label_ms) - return (float64)(C.QInputDialog_GetDouble8(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(label_ms), (C.double)(value), (C.double)(minValue), (C.double)(maxValue), (C.int)(decimals), (*C.bool)(unsafe.Pointer(ok)))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + label_ms := C.struct_miqt_string{} + label_ms.data = C.CString(label) + label_ms.len = C.size_t(len(label)) + defer C.free(unsafe.Pointer(label_ms.data)) + return (float64)(C.QInputDialog_GetDouble8(parent.cPointer(), title_ms, label_ms, (C.double)(value), (C.double)(minValue), (C.double)(maxValue), (C.int)(decimals), (*C.bool)(unsafe.Pointer(ok)))) } func QInputDialog_GetDouble9(parent *QWidget, title string, label string, value float64, minValue float64, maxValue float64, decimals int, ok *bool, flags WindowType) float64 { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - label_ms := libmiqt.Strdupg(label) - defer C.free(label_ms) - return (float64)(C.QInputDialog_GetDouble9(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(label_ms), (C.double)(value), (C.double)(minValue), (C.double)(maxValue), (C.int)(decimals), (*C.bool)(unsafe.Pointer(ok)), (C.int)(flags))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + label_ms := C.struct_miqt_string{} + label_ms.data = C.CString(label) + label_ms.len = C.size_t(len(label)) + defer C.free(unsafe.Pointer(label_ms.data)) + return (float64)(C.QInputDialog_GetDouble9(parent.cPointer(), title_ms, label_ms, (C.double)(value), (C.double)(minValue), (C.double)(maxValue), (C.int)(decimals), (*C.bool)(unsafe.Pointer(ok)), (C.int)(flags))) } // Delete this object from C++ memory. diff --git a/qt/gen_qinputdialog.h b/qt/gen_qinputdialog.h index 2c4db6f5..9a1dc8bf 100644 --- a/qt/gen_qinputdialog.h +++ b/qt/gen_qinputdialog.h @@ -30,23 +30,23 @@ QInputDialog* QInputDialog_new2(QWidget* parent); QInputDialog* QInputDialog_new3(QWidget* parent, int flags); QMetaObject* QInputDialog_MetaObject(const QInputDialog* self); void* QInputDialog_Metacast(QInputDialog* self, const char* param1); -struct miqt_string* QInputDialog_Tr(const char* s); -struct miqt_string* QInputDialog_TrUtf8(const char* s); +struct miqt_string QInputDialog_Tr(const char* s); +struct miqt_string QInputDialog_TrUtf8(const char* s); void QInputDialog_SetInputMode(QInputDialog* self, int mode); int QInputDialog_InputMode(const QInputDialog* self); -void QInputDialog_SetLabelText(QInputDialog* self, struct miqt_string* text); -struct miqt_string* QInputDialog_LabelText(const QInputDialog* self); +void QInputDialog_SetLabelText(QInputDialog* self, struct miqt_string text); +struct miqt_string QInputDialog_LabelText(const QInputDialog* self); void QInputDialog_SetOption(QInputDialog* self, int option); bool QInputDialog_TestOption(const QInputDialog* self, int option); void QInputDialog_SetOptions(QInputDialog* self, int options); int QInputDialog_Options(const QInputDialog* self); -void QInputDialog_SetTextValue(QInputDialog* self, struct miqt_string* text); -struct miqt_string* QInputDialog_TextValue(const QInputDialog* self); +void QInputDialog_SetTextValue(QInputDialog* self, struct miqt_string text); +struct miqt_string QInputDialog_TextValue(const QInputDialog* self); void QInputDialog_SetTextEchoMode(QInputDialog* self, int mode); int QInputDialog_TextEchoMode(const QInputDialog* self); void QInputDialog_SetComboBoxEditable(QInputDialog* self, bool editable); bool QInputDialog_IsComboBoxEditable(const QInputDialog* self); -void QInputDialog_SetComboBoxItems(QInputDialog* self, struct miqt_array* /* of struct miqt_string* */ items); +void QInputDialog_SetComboBoxItems(QInputDialog* self, struct miqt_array* /* of struct miqt_string */ items); struct miqt_array* QInputDialog_ComboBoxItems(const QInputDialog* self); void QInputDialog_SetIntValue(QInputDialog* self, int value); int QInputDialog_IntValue(const QInputDialog* self); @@ -66,24 +66,24 @@ double QInputDialog_DoubleMaximum(const QInputDialog* self); void QInputDialog_SetDoubleRange(QInputDialog* self, double min, double max); void QInputDialog_SetDoubleDecimals(QInputDialog* self, int decimals); int QInputDialog_DoubleDecimals(const QInputDialog* self); -void QInputDialog_SetOkButtonText(QInputDialog* self, struct miqt_string* text); -struct miqt_string* QInputDialog_OkButtonText(const QInputDialog* self); -void QInputDialog_SetCancelButtonText(QInputDialog* self, struct miqt_string* text); -struct miqt_string* QInputDialog_CancelButtonText(const QInputDialog* self); +void QInputDialog_SetOkButtonText(QInputDialog* self, struct miqt_string text); +struct miqt_string QInputDialog_OkButtonText(const QInputDialog* self); +void QInputDialog_SetCancelButtonText(QInputDialog* self, struct miqt_string text); +struct miqt_string QInputDialog_CancelButtonText(const QInputDialog* self); QSize* QInputDialog_MinimumSizeHint(const QInputDialog* self); QSize* QInputDialog_SizeHint(const QInputDialog* self); void QInputDialog_SetVisible(QInputDialog* self, bool visible); -struct miqt_string* QInputDialog_GetText(QWidget* parent, struct miqt_string* title, struct miqt_string* label); -struct miqt_string* QInputDialog_GetMultiLineText(QWidget* parent, struct miqt_string* title, struct miqt_string* label); -struct miqt_string* QInputDialog_GetItem(QWidget* parent, struct miqt_string* title, struct miqt_string* label, struct miqt_array* /* of struct miqt_string* */ items); -int QInputDialog_GetInt(QWidget* parent, struct miqt_string* title, struct miqt_string* label); -double QInputDialog_GetDouble(QWidget* parent, struct miqt_string* title, struct miqt_string* label); -double QInputDialog_GetDouble2(QWidget* parent, struct miqt_string* title, struct miqt_string* label, double value, double minValue, double maxValue, int decimals, bool* ok, int flags, double step); +struct miqt_string QInputDialog_GetText(QWidget* parent, struct miqt_string title, struct miqt_string label); +struct miqt_string QInputDialog_GetMultiLineText(QWidget* parent, struct miqt_string title, struct miqt_string label); +struct miqt_string QInputDialog_GetItem(QWidget* parent, struct miqt_string title, struct miqt_string label, struct miqt_array* /* of struct miqt_string */ items); +int QInputDialog_GetInt(QWidget* parent, struct miqt_string title, struct miqt_string label); +double QInputDialog_GetDouble(QWidget* parent, struct miqt_string title, struct miqt_string label); +double QInputDialog_GetDouble2(QWidget* parent, struct miqt_string title, struct miqt_string label, double value, double minValue, double maxValue, int decimals, bool* ok, int flags, double step); void QInputDialog_SetDoubleStep(QInputDialog* self, double step); double QInputDialog_DoubleStep(const QInputDialog* self); -void QInputDialog_TextValueChanged(QInputDialog* self, struct miqt_string* text); +void QInputDialog_TextValueChanged(QInputDialog* self, struct miqt_string text); void QInputDialog_connect_TextValueChanged(QInputDialog* self, intptr_t slot); -void QInputDialog_TextValueSelected(QInputDialog* self, struct miqt_string* text); +void QInputDialog_TextValueSelected(QInputDialog* self, struct miqt_string text); void QInputDialog_connect_TextValueSelected(QInputDialog* self, intptr_t slot); void QInputDialog_IntValueChanged(QInputDialog* self, int value); void QInputDialog_connect_IntValueChanged(QInputDialog* self, intptr_t slot); @@ -94,37 +94,37 @@ void QInputDialog_connect_DoubleValueChanged(QInputDialog* self, intptr_t slot); void QInputDialog_DoubleValueSelected(QInputDialog* self, double value); void QInputDialog_connect_DoubleValueSelected(QInputDialog* self, intptr_t slot); void QInputDialog_Done(QInputDialog* self, int result); -struct miqt_string* QInputDialog_Tr2(const char* s, const char* c); -struct miqt_string* QInputDialog_Tr3(const char* s, const char* c, int n); -struct miqt_string* QInputDialog_TrUtf82(const char* s, const char* c); -struct miqt_string* QInputDialog_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QInputDialog_Tr2(const char* s, const char* c); +struct miqt_string QInputDialog_Tr3(const char* s, const char* c, int n); +struct miqt_string QInputDialog_TrUtf82(const char* s, const char* c); +struct miqt_string QInputDialog_TrUtf83(const char* s, const char* c, int n); void QInputDialog_SetOption2(QInputDialog* self, int option, bool on); -struct miqt_string* QInputDialog_GetText4(QWidget* parent, struct miqt_string* title, struct miqt_string* label, int echo); -struct miqt_string* QInputDialog_GetText5(QWidget* parent, struct miqt_string* title, struct miqt_string* label, int echo, struct miqt_string* text); -struct miqt_string* QInputDialog_GetText6(QWidget* parent, struct miqt_string* title, struct miqt_string* label, int echo, struct miqt_string* text, bool* ok); -struct miqt_string* QInputDialog_GetText7(QWidget* parent, struct miqt_string* title, struct miqt_string* label, int echo, struct miqt_string* text, bool* ok, int flags); -struct miqt_string* QInputDialog_GetText8(QWidget* parent, struct miqt_string* title, struct miqt_string* label, int echo, struct miqt_string* text, bool* ok, int flags, int inputMethodHints); -struct miqt_string* QInputDialog_GetMultiLineText4(QWidget* parent, struct miqt_string* title, struct miqt_string* label, struct miqt_string* text); -struct miqt_string* QInputDialog_GetMultiLineText5(QWidget* parent, struct miqt_string* title, struct miqt_string* label, struct miqt_string* text, bool* ok); -struct miqt_string* QInputDialog_GetMultiLineText6(QWidget* parent, struct miqt_string* title, struct miqt_string* label, struct miqt_string* text, bool* ok, int flags); -struct miqt_string* QInputDialog_GetMultiLineText7(QWidget* parent, struct miqt_string* title, struct miqt_string* label, struct miqt_string* text, bool* ok, int flags, int inputMethodHints); -struct miqt_string* QInputDialog_GetItem5(QWidget* parent, struct miqt_string* title, struct miqt_string* label, struct miqt_array* /* of struct miqt_string* */ items, int current); -struct miqt_string* QInputDialog_GetItem6(QWidget* parent, struct miqt_string* title, struct miqt_string* label, struct miqt_array* /* of struct miqt_string* */ items, int current, bool editable); -struct miqt_string* QInputDialog_GetItem7(QWidget* parent, struct miqt_string* title, struct miqt_string* label, struct miqt_array* /* of struct miqt_string* */ items, int current, bool editable, bool* ok); -struct miqt_string* QInputDialog_GetItem8(QWidget* parent, struct miqt_string* title, struct miqt_string* label, struct miqt_array* /* of struct miqt_string* */ items, int current, bool editable, bool* ok, int flags); -struct miqt_string* QInputDialog_GetItem9(QWidget* parent, struct miqt_string* title, struct miqt_string* label, struct miqt_array* /* of struct miqt_string* */ items, int current, bool editable, bool* ok, int flags, int inputMethodHints); -int QInputDialog_GetInt4(QWidget* parent, struct miqt_string* title, struct miqt_string* label, int value); -int QInputDialog_GetInt5(QWidget* parent, struct miqt_string* title, struct miqt_string* label, int value, int minValue); -int QInputDialog_GetInt6(QWidget* parent, struct miqt_string* title, struct miqt_string* label, int value, int minValue, int maxValue); -int QInputDialog_GetInt7(QWidget* parent, struct miqt_string* title, struct miqt_string* label, int value, int minValue, int maxValue, int step); -int QInputDialog_GetInt8(QWidget* parent, struct miqt_string* title, struct miqt_string* label, int value, int minValue, int maxValue, int step, bool* ok); -int QInputDialog_GetInt9(QWidget* parent, struct miqt_string* title, struct miqt_string* label, int value, int minValue, int maxValue, int step, bool* ok, int flags); -double QInputDialog_GetDouble4(QWidget* parent, struct miqt_string* title, struct miqt_string* label, double value); -double QInputDialog_GetDouble5(QWidget* parent, struct miqt_string* title, struct miqt_string* label, double value, double minValue); -double QInputDialog_GetDouble6(QWidget* parent, struct miqt_string* title, struct miqt_string* label, double value, double minValue, double maxValue); -double QInputDialog_GetDouble7(QWidget* parent, struct miqt_string* title, struct miqt_string* label, double value, double minValue, double maxValue, int decimals); -double QInputDialog_GetDouble8(QWidget* parent, struct miqt_string* title, struct miqt_string* label, double value, double minValue, double maxValue, int decimals, bool* ok); -double QInputDialog_GetDouble9(QWidget* parent, struct miqt_string* title, struct miqt_string* label, double value, double minValue, double maxValue, int decimals, bool* ok, int flags); +struct miqt_string QInputDialog_GetText4(QWidget* parent, struct miqt_string title, struct miqt_string label, int echo); +struct miqt_string QInputDialog_GetText5(QWidget* parent, struct miqt_string title, struct miqt_string label, int echo, struct miqt_string text); +struct miqt_string QInputDialog_GetText6(QWidget* parent, struct miqt_string title, struct miqt_string label, int echo, struct miqt_string text, bool* ok); +struct miqt_string QInputDialog_GetText7(QWidget* parent, struct miqt_string title, struct miqt_string label, int echo, struct miqt_string text, bool* ok, int flags); +struct miqt_string QInputDialog_GetText8(QWidget* parent, struct miqt_string title, struct miqt_string label, int echo, struct miqt_string text, bool* ok, int flags, int inputMethodHints); +struct miqt_string QInputDialog_GetMultiLineText4(QWidget* parent, struct miqt_string title, struct miqt_string label, struct miqt_string text); +struct miqt_string QInputDialog_GetMultiLineText5(QWidget* parent, struct miqt_string title, struct miqt_string label, struct miqt_string text, bool* ok); +struct miqt_string QInputDialog_GetMultiLineText6(QWidget* parent, struct miqt_string title, struct miqt_string label, struct miqt_string text, bool* ok, int flags); +struct miqt_string QInputDialog_GetMultiLineText7(QWidget* parent, struct miqt_string title, struct miqt_string label, struct miqt_string text, bool* ok, int flags, int inputMethodHints); +struct miqt_string QInputDialog_GetItem5(QWidget* parent, struct miqt_string title, struct miqt_string label, struct miqt_array* /* of struct miqt_string */ items, int current); +struct miqt_string QInputDialog_GetItem6(QWidget* parent, struct miqt_string title, struct miqt_string label, struct miqt_array* /* of struct miqt_string */ items, int current, bool editable); +struct miqt_string QInputDialog_GetItem7(QWidget* parent, struct miqt_string title, struct miqt_string label, struct miqt_array* /* of struct miqt_string */ items, int current, bool editable, bool* ok); +struct miqt_string QInputDialog_GetItem8(QWidget* parent, struct miqt_string title, struct miqt_string label, struct miqt_array* /* of struct miqt_string */ items, int current, bool editable, bool* ok, int flags); +struct miqt_string QInputDialog_GetItem9(QWidget* parent, struct miqt_string title, struct miqt_string label, struct miqt_array* /* of struct miqt_string */ items, int current, bool editable, bool* ok, int flags, int inputMethodHints); +int QInputDialog_GetInt4(QWidget* parent, struct miqt_string title, struct miqt_string label, int value); +int QInputDialog_GetInt5(QWidget* parent, struct miqt_string title, struct miqt_string label, int value, int minValue); +int QInputDialog_GetInt6(QWidget* parent, struct miqt_string title, struct miqt_string label, int value, int minValue, int maxValue); +int QInputDialog_GetInt7(QWidget* parent, struct miqt_string title, struct miqt_string label, int value, int minValue, int maxValue, int step); +int QInputDialog_GetInt8(QWidget* parent, struct miqt_string title, struct miqt_string label, int value, int minValue, int maxValue, int step, bool* ok); +int QInputDialog_GetInt9(QWidget* parent, struct miqt_string title, struct miqt_string label, int value, int minValue, int maxValue, int step, bool* ok, int flags); +double QInputDialog_GetDouble4(QWidget* parent, struct miqt_string title, struct miqt_string label, double value); +double QInputDialog_GetDouble5(QWidget* parent, struct miqt_string title, struct miqt_string label, double value, double minValue); +double QInputDialog_GetDouble6(QWidget* parent, struct miqt_string title, struct miqt_string label, double value, double minValue, double maxValue); +double QInputDialog_GetDouble7(QWidget* parent, struct miqt_string title, struct miqt_string label, double value, double minValue, double maxValue, int decimals); +double QInputDialog_GetDouble8(QWidget* parent, struct miqt_string title, struct miqt_string label, double value, double minValue, double maxValue, int decimals, bool* ok); +double QInputDialog_GetDouble9(QWidget* parent, struct miqt_string title, struct miqt_string label, double value, double minValue, double maxValue, int decimals, bool* ok, int flags); void QInputDialog_Delete(QInputDialog* self); #ifdef __cplusplus diff --git a/qt/gen_qinputmethod.cpp b/qt/gen_qinputmethod.cpp index ef8b3699..3ca33edf 100644 --- a/qt/gen_qinputmethod.cpp +++ b/qt/gen_qinputmethod.cpp @@ -19,18 +19,26 @@ void* QInputMethod_Metacast(QInputMethod* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QInputMethod_Tr(const char* s) { +struct miqt_string QInputMethod_Tr(const char* s) { QString _ret = QInputMethod::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QInputMethod_TrUtf8(const char* s) { +struct miqt_string QInputMethod_TrUtf8(const char* s) { QString _ret = QInputMethod::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QTransform* QInputMethod_InputItemTransform(const QInputMethod* self) { @@ -196,31 +204,47 @@ void QInputMethod_connect_InputDirectionChanged(QInputMethod* self, intptr_t slo }); } -struct miqt_string* QInputMethod_Tr2(const char* s, const char* c) { +struct miqt_string QInputMethod_Tr2(const char* s, const char* c) { QString _ret = QInputMethod::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QInputMethod_Tr3(const char* s, const char* c, int n) { +struct miqt_string QInputMethod_Tr3(const char* s, const char* c, int n) { QString _ret = QInputMethod::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QInputMethod_TrUtf82(const char* s, const char* c) { +struct miqt_string QInputMethod_TrUtf82(const char* s, const char* c) { QString _ret = QInputMethod::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QInputMethod_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QInputMethod_TrUtf83(const char* s, const char* c, int n) { QString _ret = QInputMethod::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } diff --git a/qt/gen_qinputmethod.go b/qt/gen_qinputmethod.go index 95ea4592..2a7c4d51 100644 --- a/qt/gen_qinputmethod.go +++ b/qt/gen_qinputmethod.go @@ -57,24 +57,24 @@ func (this *QInputMethod) MetaObject() *QMetaObject { func (this *QInputMethod) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QInputMethod_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QInputMethod_Metacast(this.h, param1_Cstring)) } func QInputMethod_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QInputMethod_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QInputMethod_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QInputMethod_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QInputMethod_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QInputMethod_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -326,9 +326,9 @@ func QInputMethod_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QInputMethod_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QInputMethod_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -337,9 +337,9 @@ func QInputMethod_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QInputMethod_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QInputMethod_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -348,9 +348,9 @@ func QInputMethod_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QInputMethod_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QInputMethod_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -359,8 +359,8 @@ func QInputMethod_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QInputMethod_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QInputMethod_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qinputmethod.h b/qt/gen_qinputmethod.h index 4a4640d8..b1fa0242 100644 --- a/qt/gen_qinputmethod.h +++ b/qt/gen_qinputmethod.h @@ -31,8 +31,8 @@ typedef struct QVariant QVariant; QMetaObject* QInputMethod_MetaObject(const QInputMethod* self); void* QInputMethod_Metacast(QInputMethod* self, const char* param1); -struct miqt_string* QInputMethod_Tr(const char* s); -struct miqt_string* QInputMethod_TrUtf8(const char* s); +struct miqt_string QInputMethod_Tr(const char* s); +struct miqt_string QInputMethod_TrUtf8(const char* s); QTransform* QInputMethod_InputItemTransform(const QInputMethod* self); void QInputMethod_SetInputItemTransform(QInputMethod* self, QTransform* transform); QRectF* QInputMethod_InputItemRectangle(const QInputMethod* self); @@ -69,10 +69,10 @@ void QInputMethod_LocaleChanged(QInputMethod* self); void QInputMethod_connect_LocaleChanged(QInputMethod* self, intptr_t slot); void QInputMethod_InputDirectionChanged(QInputMethod* self, int newDirection); void QInputMethod_connect_InputDirectionChanged(QInputMethod* self, intptr_t slot); -struct miqt_string* QInputMethod_Tr2(const char* s, const char* c); -struct miqt_string* QInputMethod_Tr3(const char* s, const char* c, int n); -struct miqt_string* QInputMethod_TrUtf82(const char* s, const char* c); -struct miqt_string* QInputMethod_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QInputMethod_Tr2(const char* s, const char* c); +struct miqt_string QInputMethod_Tr3(const char* s, const char* c, int n); +struct miqt_string QInputMethod_TrUtf82(const char* s, const char* c); +struct miqt_string QInputMethod_TrUtf83(const char* s, const char* c, int n); #ifdef __cplusplus } /* extern C */ diff --git a/qt/gen_qiodevice.cpp b/qt/gen_qiodevice.cpp index 3f109206..2c84c62c 100644 --- a/qt/gen_qiodevice.cpp +++ b/qt/gen_qiodevice.cpp @@ -16,18 +16,26 @@ void* QIODevice_Metacast(QIODevice* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QIODevice_Tr(const char* s) { +struct miqt_string QIODevice_Tr(const char* s) { QString _ret = QIODevice::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QIODevice_TrUtf8(const char* s) { +struct miqt_string QIODevice_TrUtf8(const char* s) { QString _ret = QIODevice::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QIODevice_OpenMode(const QIODevice* self) { @@ -128,12 +136,22 @@ long long QIODevice_Read(QIODevice* self, char* data, long long maxlen) { return static_cast(_ret); } -QByteArray* QIODevice_ReadWithMaxlen(QIODevice* self, long long maxlen) { - return new QByteArray(self->read(static_cast(maxlen))); +struct miqt_string QIODevice_ReadWithMaxlen(QIODevice* self, long long maxlen) { + QByteArray _qb = self->read(static_cast(maxlen)); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } -QByteArray* QIODevice_ReadAll(QIODevice* self) { - return new QByteArray(self->readAll()); +struct miqt_string QIODevice_ReadAll(QIODevice* self) { + QByteArray _qb = self->readAll(); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } long long QIODevice_ReadLine(QIODevice* self, char* data, long long maxlen) { @@ -141,8 +159,13 @@ long long QIODevice_ReadLine(QIODevice* self, char* data, long long maxlen) { return static_cast(_ret); } -QByteArray* QIODevice_ReadLine2(QIODevice* self) { - return new QByteArray(self->readLine()); +struct miqt_string QIODevice_ReadLine2(QIODevice* self) { + QByteArray _qb = self->readLine(); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } bool QIODevice_CanReadLine(const QIODevice* self) { @@ -175,8 +198,9 @@ long long QIODevice_WriteWithData(QIODevice* self, const char* data) { return static_cast(_ret); } -long long QIODevice_Write2(QIODevice* self, QByteArray* data) { - qint64 _ret = self->write(*data); +long long QIODevice_Write2(QIODevice* self, struct miqt_string data) { + QByteArray data_QByteArray(data.data, data.len); + qint64 _ret = self->write(data_QByteArray); return static_cast(_ret); } @@ -185,8 +209,13 @@ long long QIODevice_Peek(QIODevice* self, char* data, long long maxlen) { return static_cast(_ret); } -QByteArray* QIODevice_PeekWithMaxlen(QIODevice* self, long long maxlen) { - return new QByteArray(self->peek(static_cast(maxlen))); +struct miqt_string QIODevice_PeekWithMaxlen(QIODevice* self, long long maxlen) { + QByteArray _qb = self->peek(static_cast(maxlen)); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } long long QIODevice_Skip(QIODevice* self, long long maxSize) { @@ -214,11 +243,15 @@ bool QIODevice_GetChar(QIODevice* self, char* c) { return self->getChar(c); } -struct miqt_string* QIODevice_ErrorString(const QIODevice* self) { +struct miqt_string QIODevice_ErrorString(const QIODevice* self) { QString _ret = self->errorString(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QIODevice_ReadyRead(QIODevice* self) { @@ -287,36 +320,57 @@ void QIODevice_connect_ReadChannelFinished(QIODevice* self, intptr_t slot) { }); } -struct miqt_string* QIODevice_Tr2(const char* s, const char* c) { +struct miqt_string QIODevice_Tr2(const char* s, const char* c) { QString _ret = QIODevice::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QIODevice_Tr3(const char* s, const char* c, int n) { +struct miqt_string QIODevice_Tr3(const char* s, const char* c, int n) { QString _ret = QIODevice::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QIODevice_TrUtf82(const char* s, const char* c) { +struct miqt_string QIODevice_TrUtf82(const char* s, const char* c) { QString _ret = QIODevice::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QIODevice_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QIODevice_TrUtf83(const char* s, const char* c, int n) { QString _ret = QIODevice::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -QByteArray* QIODevice_ReadLine1(QIODevice* self, long long maxlen) { - return new QByteArray(self->readLine(static_cast(maxlen))); +struct miqt_string QIODevice_ReadLine1(QIODevice* self, long long maxlen) { + QByteArray _qb = self->readLine(static_cast(maxlen)); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } void QIODevice_Delete(QIODevice* self) { diff --git a/qt/gen_qiodevice.go b/qt/gen_qiodevice.go index b5557aa4..4909bc82 100644 --- a/qt/gen_qiodevice.go +++ b/qt/gen_qiodevice.go @@ -66,24 +66,24 @@ func (this *QIODevice) MetaObject() *QMetaObject { func (this *QIODevice) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QIODevice_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QIODevice_Metacast(this.h, param1_Cstring)) } func QIODevice_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QIODevice_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QIODevice_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QIODevice_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QIODevice_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QIODevice_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -181,18 +181,18 @@ func (this *QIODevice) Read(data string, maxlen int64) int64 { return (int64)(C.QIODevice_Read(this.h, data_Cstring, (C.longlong)(maxlen))) } -func (this *QIODevice) ReadWithMaxlen(maxlen int64) *QByteArray { - _ret := C.QIODevice_ReadWithMaxlen(this.h, (C.longlong)(maxlen)) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QIODevice) ReadWithMaxlen(maxlen int64) []byte { + var _bytearray C.struct_miqt_string = C.QIODevice_ReadWithMaxlen(this.h, (C.longlong)(maxlen)) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } -func (this *QIODevice) ReadAll() *QByteArray { - _ret := C.QIODevice_ReadAll(this.h) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QIODevice) ReadAll() []byte { + var _bytearray C.struct_miqt_string = C.QIODevice_ReadAll(this.h) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } func (this *QIODevice) ReadLine(data string, maxlen int64) int64 { @@ -201,11 +201,11 @@ func (this *QIODevice) ReadLine(data string, maxlen int64) int64 { return (int64)(C.QIODevice_ReadLine(this.h, data_Cstring, (C.longlong)(maxlen))) } -func (this *QIODevice) ReadLine2() *QByteArray { - _ret := C.QIODevice_ReadLine2(this.h) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QIODevice) ReadLine2() []byte { + var _bytearray C.struct_miqt_string = C.QIODevice_ReadLine2(this.h) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } func (this *QIODevice) CanReadLine() bool { @@ -240,8 +240,11 @@ func (this *QIODevice) WriteWithData(data string) int64 { return (int64)(C.QIODevice_WriteWithData(this.h, data_Cstring)) } -func (this *QIODevice) Write2(data *QByteArray) int64 { - return (int64)(C.QIODevice_Write2(this.h, data.cPointer())) +func (this *QIODevice) Write2(data []byte) int64 { + data_alias := C.struct_miqt_string{} + data_alias.data = (*C.char)(unsafe.Pointer(&data[0])) + data_alias.len = C.size_t(len(data)) + return (int64)(C.QIODevice_Write2(this.h, data_alias)) } func (this *QIODevice) Peek(data string, maxlen int64) int64 { @@ -250,11 +253,11 @@ func (this *QIODevice) Peek(data string, maxlen int64) int64 { return (int64)(C.QIODevice_Peek(this.h, data_Cstring, (C.longlong)(maxlen))) } -func (this *QIODevice) PeekWithMaxlen(maxlen int64) *QByteArray { - _ret := C.QIODevice_PeekWithMaxlen(this.h, (C.longlong)(maxlen)) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QIODevice) PeekWithMaxlen(maxlen int64) []byte { + var _bytearray C.struct_miqt_string = C.QIODevice_PeekWithMaxlen(this.h, (C.longlong)(maxlen)) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } func (this *QIODevice) Skip(maxSize int64) int64 { @@ -284,9 +287,9 @@ func (this *QIODevice) GetChar(c string) bool { } func (this *QIODevice) ErrorString() string { - var _ms *C.struct_miqt_string = C.QIODevice_ErrorString(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QIODevice_ErrorString(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -408,9 +411,9 @@ func QIODevice_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QIODevice_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QIODevice_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -419,9 +422,9 @@ func QIODevice_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QIODevice_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QIODevice_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -430,9 +433,9 @@ func QIODevice_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QIODevice_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QIODevice_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -441,17 +444,17 @@ func QIODevice_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QIODevice_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QIODevice_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } -func (this *QIODevice) ReadLine1(maxlen int64) *QByteArray { - _ret := C.QIODevice_ReadLine1(this.h, (C.longlong)(maxlen)) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QIODevice) ReadLine1(maxlen int64) []byte { + var _bytearray C.struct_miqt_string = C.QIODevice_ReadLine1(this.h, (C.longlong)(maxlen)) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } // Delete this object from C++ memory. diff --git a/qt/gen_qiodevice.h b/qt/gen_qiodevice.h index 2630866c..9606a60a 100644 --- a/qt/gen_qiodevice.h +++ b/qt/gen_qiodevice.h @@ -25,8 +25,8 @@ typedef struct QMetaObject QMetaObject; QMetaObject* QIODevice_MetaObject(const QIODevice* self); void* QIODevice_Metacast(QIODevice* self, const char* param1); -struct miqt_string* QIODevice_Tr(const char* s); -struct miqt_string* QIODevice_TrUtf8(const char* s); +struct miqt_string QIODevice_Tr(const char* s); +struct miqt_string QIODevice_TrUtf8(const char* s); int QIODevice_OpenMode(const QIODevice* self); void QIODevice_SetTextModeEnabled(QIODevice* self, bool enabled); bool QIODevice_IsTextModeEnabled(const QIODevice* self); @@ -50,10 +50,10 @@ bool QIODevice_Reset(QIODevice* self); long long QIODevice_BytesAvailable(const QIODevice* self); long long QIODevice_BytesToWrite(const QIODevice* self); long long QIODevice_Read(QIODevice* self, char* data, long long maxlen); -QByteArray* QIODevice_ReadWithMaxlen(QIODevice* self, long long maxlen); -QByteArray* QIODevice_ReadAll(QIODevice* self); +struct miqt_string QIODevice_ReadWithMaxlen(QIODevice* self, long long maxlen); +struct miqt_string QIODevice_ReadAll(QIODevice* self); long long QIODevice_ReadLine(QIODevice* self, char* data, long long maxlen); -QByteArray* QIODevice_ReadLine2(QIODevice* self); +struct miqt_string QIODevice_ReadLine2(QIODevice* self); bool QIODevice_CanReadLine(const QIODevice* self); void QIODevice_StartTransaction(QIODevice* self); void QIODevice_CommitTransaction(QIODevice* self); @@ -61,16 +61,16 @@ void QIODevice_RollbackTransaction(QIODevice* self); bool QIODevice_IsTransactionStarted(const QIODevice* self); long long QIODevice_Write(QIODevice* self, const char* data, long long lenVal); long long QIODevice_WriteWithData(QIODevice* self, const char* data); -long long QIODevice_Write2(QIODevice* self, QByteArray* data); +long long QIODevice_Write2(QIODevice* self, struct miqt_string data); long long QIODevice_Peek(QIODevice* self, char* data, long long maxlen); -QByteArray* QIODevice_PeekWithMaxlen(QIODevice* self, long long maxlen); +struct miqt_string QIODevice_PeekWithMaxlen(QIODevice* self, long long maxlen); long long QIODevice_Skip(QIODevice* self, long long maxSize); bool QIODevice_WaitForReadyRead(QIODevice* self, int msecs); bool QIODevice_WaitForBytesWritten(QIODevice* self, int msecs); void QIODevice_UngetChar(QIODevice* self, char c); bool QIODevice_PutChar(QIODevice* self, char c); bool QIODevice_GetChar(QIODevice* self, char* c); -struct miqt_string* QIODevice_ErrorString(const QIODevice* self); +struct miqt_string QIODevice_ErrorString(const QIODevice* self); void QIODevice_ReadyRead(QIODevice* self); void QIODevice_connect_ReadyRead(QIODevice* self, intptr_t slot); void QIODevice_ChannelReadyRead(QIODevice* self, int channel); @@ -83,11 +83,11 @@ void QIODevice_AboutToClose(QIODevice* self); void QIODevice_connect_AboutToClose(QIODevice* self, intptr_t slot); void QIODevice_ReadChannelFinished(QIODevice* self); void QIODevice_connect_ReadChannelFinished(QIODevice* self, intptr_t slot); -struct miqt_string* QIODevice_Tr2(const char* s, const char* c); -struct miqt_string* QIODevice_Tr3(const char* s, const char* c, int n); -struct miqt_string* QIODevice_TrUtf82(const char* s, const char* c); -struct miqt_string* QIODevice_TrUtf83(const char* s, const char* c, int n); -QByteArray* QIODevice_ReadLine1(QIODevice* self, long long maxlen); +struct miqt_string QIODevice_Tr2(const char* s, const char* c); +struct miqt_string QIODevice_Tr3(const char* s, const char* c, int n); +struct miqt_string QIODevice_TrUtf82(const char* s, const char* c); +struct miqt_string QIODevice_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QIODevice_ReadLine1(QIODevice* self, long long maxlen); void QIODevice_Delete(QIODevice* self); #ifdef __cplusplus diff --git a/qt/gen_qitemdelegate.cpp b/qt/gen_qitemdelegate.cpp index 89dd2818..6e6ac35b 100644 --- a/qt/gen_qitemdelegate.cpp +++ b/qt/gen_qitemdelegate.cpp @@ -31,18 +31,26 @@ void* QItemDelegate_Metacast(QItemDelegate* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QItemDelegate_Tr(const char* s) { +struct miqt_string QItemDelegate_Tr(const char* s) { QString _ret = QItemDelegate::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QItemDelegate_TrUtf8(const char* s) { +struct miqt_string QItemDelegate_TrUtf8(const char* s) { QString _ret = QItemDelegate::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } bool QItemDelegate_HasClipping(const QItemDelegate* self) { @@ -85,32 +93,48 @@ void QItemDelegate_SetItemEditorFactory(QItemDelegate* self, QItemEditorFactory* self->setItemEditorFactory(factory); } -struct miqt_string* QItemDelegate_Tr2(const char* s, const char* c) { +struct miqt_string QItemDelegate_Tr2(const char* s, const char* c) { QString _ret = QItemDelegate::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QItemDelegate_Tr3(const char* s, const char* c, int n) { +struct miqt_string QItemDelegate_Tr3(const char* s, const char* c, int n) { QString _ret = QItemDelegate::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QItemDelegate_TrUtf82(const char* s, const char* c) { +struct miqt_string QItemDelegate_TrUtf82(const char* s, const char* c) { QString _ret = QItemDelegate::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QItemDelegate_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QItemDelegate_TrUtf83(const char* s, const char* c, int n) { QString _ret = QItemDelegate::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QItemDelegate_Delete(QItemDelegate* self) { diff --git a/qt/gen_qitemdelegate.go b/qt/gen_qitemdelegate.go index 0158692d..05344b4a 100644 --- a/qt/gen_qitemdelegate.go +++ b/qt/gen_qitemdelegate.go @@ -62,24 +62,24 @@ func (this *QItemDelegate) MetaObject() *QMetaObject { func (this *QItemDelegate) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QItemDelegate_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QItemDelegate_Metacast(this.h, param1_Cstring)) } func QItemDelegate_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QItemDelegate_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QItemDelegate_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QItemDelegate_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QItemDelegate_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QItemDelegate_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -131,9 +131,9 @@ func QItemDelegate_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QItemDelegate_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QItemDelegate_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -142,9 +142,9 @@ func QItemDelegate_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QItemDelegate_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QItemDelegate_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -153,9 +153,9 @@ func QItemDelegate_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QItemDelegate_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QItemDelegate_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -164,9 +164,9 @@ func QItemDelegate_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QItemDelegate_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QItemDelegate_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qitemdelegate.h b/qt/gen_qitemdelegate.h index 5781fd8b..513dec57 100644 --- a/qt/gen_qitemdelegate.h +++ b/qt/gen_qitemdelegate.h @@ -41,8 +41,8 @@ QItemDelegate* QItemDelegate_new(); QItemDelegate* QItemDelegate_new2(QObject* parent); QMetaObject* QItemDelegate_MetaObject(const QItemDelegate* self); void* QItemDelegate_Metacast(QItemDelegate* self, const char* param1); -struct miqt_string* QItemDelegate_Tr(const char* s); -struct miqt_string* QItemDelegate_TrUtf8(const char* s); +struct miqt_string QItemDelegate_Tr(const char* s); +struct miqt_string QItemDelegate_TrUtf8(const char* s); bool QItemDelegate_HasClipping(const QItemDelegate* self); void QItemDelegate_SetClipping(QItemDelegate* self, bool clip); void QItemDelegate_Paint(const QItemDelegate* self, QPainter* painter, QStyleOptionViewItem* option, QModelIndex* index); @@ -53,10 +53,10 @@ void QItemDelegate_SetModelData(const QItemDelegate* self, QWidget* editor, QAbs void QItemDelegate_UpdateEditorGeometry(const QItemDelegate* self, QWidget* editor, QStyleOptionViewItem* option, QModelIndex* index); QItemEditorFactory* QItemDelegate_ItemEditorFactory(const QItemDelegate* self); void QItemDelegate_SetItemEditorFactory(QItemDelegate* self, QItemEditorFactory* factory); -struct miqt_string* QItemDelegate_Tr2(const char* s, const char* c); -struct miqt_string* QItemDelegate_Tr3(const char* s, const char* c, int n); -struct miqt_string* QItemDelegate_TrUtf82(const char* s, const char* c); -struct miqt_string* QItemDelegate_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QItemDelegate_Tr2(const char* s, const char* c); +struct miqt_string QItemDelegate_Tr3(const char* s, const char* c, int n); +struct miqt_string QItemDelegate_TrUtf82(const char* s, const char* c); +struct miqt_string QItemDelegate_TrUtf83(const char* s, const char* c, int n); void QItemDelegate_Delete(QItemDelegate* self); #ifdef __cplusplus diff --git a/qt/gen_qitemeditorfactory.cpp b/qt/gen_qitemeditorfactory.cpp index 41d40b50..ece20aa6 100644 --- a/qt/gen_qitemeditorfactory.cpp +++ b/qt/gen_qitemeditorfactory.cpp @@ -10,8 +10,13 @@ QWidget* QItemEditorCreatorBase_CreateWidget(const QItemEditorCreatorBase* self, return self->createWidget(parent); } -QByteArray* QItemEditorCreatorBase_ValuePropertyName(const QItemEditorCreatorBase* self) { - return new QByteArray(self->valuePropertyName()); +struct miqt_string QItemEditorCreatorBase_ValuePropertyName(const QItemEditorCreatorBase* self) { + QByteArray _qb = self->valuePropertyName(); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } void QItemEditorCreatorBase_OperatorAssign(QItemEditorCreatorBase* self, QItemEditorCreatorBase* param1) { @@ -34,8 +39,13 @@ QWidget* QItemEditorFactory_CreateEditor(const QItemEditorFactory* self, int use return self->createEditor(static_cast(userType), parent); } -QByteArray* QItemEditorFactory_ValuePropertyName(const QItemEditorFactory* self, int userType) { - return new QByteArray(self->valuePropertyName(static_cast(userType))); +struct miqt_string QItemEditorFactory_ValuePropertyName(const QItemEditorFactory* self, int userType) { + QByteArray _qb = self->valuePropertyName(static_cast(userType)); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } void QItemEditorFactory_RegisterEditor(QItemEditorFactory* self, int userType, QItemEditorCreatorBase* creator) { diff --git a/qt/gen_qitemeditorfactory.go b/qt/gen_qitemeditorfactory.go index 36c4d5d1..fda6b464 100644 --- a/qt/gen_qitemeditorfactory.go +++ b/qt/gen_qitemeditorfactory.go @@ -46,11 +46,11 @@ func (this *QItemEditorCreatorBase) CreateWidget(parent *QWidget) *QWidget { return UnsafeNewQWidget(unsafe.Pointer(C.QItemEditorCreatorBase_CreateWidget(this.h, parent.cPointer()))) } -func (this *QItemEditorCreatorBase) ValuePropertyName() *QByteArray { - _ret := C.QItemEditorCreatorBase_ValuePropertyName(this.h) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QItemEditorCreatorBase) ValuePropertyName() []byte { + var _bytearray C.struct_miqt_string = C.QItemEditorCreatorBase_ValuePropertyName(this.h) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } func (this *QItemEditorCreatorBase) OperatorAssign(param1 *QItemEditorCreatorBase) { @@ -116,11 +116,11 @@ func (this *QItemEditorFactory) CreateEditor(userType int, parent *QWidget) *QWi return UnsafeNewQWidget(unsafe.Pointer(C.QItemEditorFactory_CreateEditor(this.h, (C.int)(userType), parent.cPointer()))) } -func (this *QItemEditorFactory) ValuePropertyName(userType int) *QByteArray { - _ret := C.QItemEditorFactory_ValuePropertyName(this.h, (C.int)(userType)) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QItemEditorFactory) ValuePropertyName(userType int) []byte { + var _bytearray C.struct_miqt_string = C.QItemEditorFactory_ValuePropertyName(this.h, (C.int)(userType)) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } func (this *QItemEditorFactory) RegisterEditor(userType int, creator *QItemEditorCreatorBase) { diff --git a/qt/gen_qitemeditorfactory.h b/qt/gen_qitemeditorfactory.h index 5d3153f7..2060ba9c 100644 --- a/qt/gen_qitemeditorfactory.h +++ b/qt/gen_qitemeditorfactory.h @@ -26,14 +26,14 @@ typedef struct QWidget QWidget; #endif QWidget* QItemEditorCreatorBase_CreateWidget(const QItemEditorCreatorBase* self, QWidget* parent); -QByteArray* QItemEditorCreatorBase_ValuePropertyName(const QItemEditorCreatorBase* self); +struct miqt_string QItemEditorCreatorBase_ValuePropertyName(const QItemEditorCreatorBase* self); void QItemEditorCreatorBase_OperatorAssign(QItemEditorCreatorBase* self, QItemEditorCreatorBase* param1); void QItemEditorCreatorBase_Delete(QItemEditorCreatorBase* self); QItemEditorFactory* QItemEditorFactory_new(); QItemEditorFactory* QItemEditorFactory_new2(QItemEditorFactory* param1); QWidget* QItemEditorFactory_CreateEditor(const QItemEditorFactory* self, int userType, QWidget* parent); -QByteArray* QItemEditorFactory_ValuePropertyName(const QItemEditorFactory* self, int userType); +struct miqt_string QItemEditorFactory_ValuePropertyName(const QItemEditorFactory* self, int userType); void QItemEditorFactory_RegisterEditor(QItemEditorFactory* self, int userType, QItemEditorCreatorBase* creator); QItemEditorFactory* QItemEditorFactory_DefaultFactory(); void QItemEditorFactory_SetDefaultFactory(QItemEditorFactory* factory); diff --git a/qt/gen_qitemselectionmodel.cpp b/qt/gen_qitemselectionmodel.cpp index 9dc41dfb..47347a2a 100644 --- a/qt/gen_qitemselectionmodel.cpp +++ b/qt/gen_qitemselectionmodel.cpp @@ -154,18 +154,26 @@ void* QItemSelectionModel_Metacast(QItemSelectionModel* self, const char* param1 return self->qt_metacast(param1); } -struct miqt_string* QItemSelectionModel_Tr(const char* s) { +struct miqt_string QItemSelectionModel_Tr(const char* s) { QString _ret = QItemSelectionModel::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QItemSelectionModel_TrUtf8(const char* s) { +struct miqt_string QItemSelectionModel_TrUtf8(const char* s) { QString _ret = QItemSelectionModel::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QModelIndex* QItemSelectionModel_CurrentIndex(const QItemSelectionModel* self) { @@ -330,32 +338,48 @@ void QItemSelectionModel_connect_ModelChanged(QItemSelectionModel* self, intptr_ }); } -struct miqt_string* QItemSelectionModel_Tr2(const char* s, const char* c) { +struct miqt_string QItemSelectionModel_Tr2(const char* s, const char* c) { QString _ret = QItemSelectionModel::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QItemSelectionModel_Tr3(const char* s, const char* c, int n) { +struct miqt_string QItemSelectionModel_Tr3(const char* s, const char* c, int n) { QString _ret = QItemSelectionModel::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QItemSelectionModel_TrUtf82(const char* s, const char* c) { +struct miqt_string QItemSelectionModel_TrUtf82(const char* s, const char* c) { QString _ret = QItemSelectionModel::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QItemSelectionModel_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QItemSelectionModel_TrUtf83(const char* s, const char* c, int n) { QString _ret = QItemSelectionModel::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } bool QItemSelectionModel_IsRowSelected2(const QItemSelectionModel* self, int row, QModelIndex* parent) { diff --git a/qt/gen_qitemselectionmodel.go b/qt/gen_qitemselectionmodel.go index fff54c40..91619e85 100644 --- a/qt/gen_qitemselectionmodel.go +++ b/qt/gen_qitemselectionmodel.go @@ -256,24 +256,24 @@ func (this *QItemSelectionModel) MetaObject() *QMetaObject { func (this *QItemSelectionModel) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QItemSelectionModel_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QItemSelectionModel_Metacast(this.h, param1_Cstring)) } func QItemSelectionModel_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QItemSelectionModel_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QItemSelectionModel_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QItemSelectionModel_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QItemSelectionModel_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QItemSelectionModel_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -474,9 +474,9 @@ func QItemSelectionModel_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QItemSelectionModel_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QItemSelectionModel_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -485,9 +485,9 @@ func QItemSelectionModel_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QItemSelectionModel_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QItemSelectionModel_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -496,9 +496,9 @@ func QItemSelectionModel_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QItemSelectionModel_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QItemSelectionModel_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -507,9 +507,9 @@ func QItemSelectionModel_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QItemSelectionModel_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QItemSelectionModel_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qitemselectionmodel.h b/qt/gen_qitemselectionmodel.h index 19c5b0ef..a94b395b 100644 --- a/qt/gen_qitemselectionmodel.h +++ b/qt/gen_qitemselectionmodel.h @@ -64,8 +64,8 @@ QItemSelectionModel* QItemSelectionModel_new2(QAbstractItemModel* model, QObject QItemSelectionModel* QItemSelectionModel_new3(QAbstractItemModel* model); QMetaObject* QItemSelectionModel_MetaObject(const QItemSelectionModel* self); void* QItemSelectionModel_Metacast(QItemSelectionModel* self, const char* param1); -struct miqt_string* QItemSelectionModel_Tr(const char* s); -struct miqt_string* QItemSelectionModel_TrUtf8(const char* s); +struct miqt_string QItemSelectionModel_Tr(const char* s); +struct miqt_string QItemSelectionModel_TrUtf8(const char* s); QModelIndex* QItemSelectionModel_CurrentIndex(const QItemSelectionModel* self); bool QItemSelectionModel_IsSelected(const QItemSelectionModel* self, QModelIndex* index); bool QItemSelectionModel_IsRowSelected(const QItemSelectionModel* self, int row); @@ -93,10 +93,10 @@ void QItemSelectionModel_CurrentColumnChanged(QItemSelectionModel* self, QModelI void QItemSelectionModel_connect_CurrentColumnChanged(QItemSelectionModel* self, intptr_t slot); void QItemSelectionModel_ModelChanged(QItemSelectionModel* self, QAbstractItemModel* model); void QItemSelectionModel_connect_ModelChanged(QItemSelectionModel* self, intptr_t slot); -struct miqt_string* QItemSelectionModel_Tr2(const char* s, const char* c); -struct miqt_string* QItemSelectionModel_Tr3(const char* s, const char* c, int n); -struct miqt_string* QItemSelectionModel_TrUtf82(const char* s, const char* c); -struct miqt_string* QItemSelectionModel_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QItemSelectionModel_Tr2(const char* s, const char* c); +struct miqt_string QItemSelectionModel_Tr3(const char* s, const char* c, int n); +struct miqt_string QItemSelectionModel_TrUtf82(const char* s, const char* c); +struct miqt_string QItemSelectionModel_TrUtf83(const char* s, const char* c, int n); bool QItemSelectionModel_IsRowSelected2(const QItemSelectionModel* self, int row, QModelIndex* parent); bool QItemSelectionModel_IsColumnSelected2(const QItemSelectionModel* self, int column, QModelIndex* parent); bool QItemSelectionModel_RowIntersectsSelection2(const QItemSelectionModel* self, int row, QModelIndex* parent); diff --git a/qt/gen_qjsonarray.cpp b/qt/gen_qjsonarray.cpp index 3141aed0..cd4c44a5 100644 --- a/qt/gen_qjsonarray.cpp +++ b/qt/gen_qjsonarray.cpp @@ -25,12 +25,12 @@ void QJsonArray_OperatorAssign(QJsonArray* self, QJsonArray* other) { self->operator=(*other); } -QJsonArray* QJsonArray_FromStringList(struct miqt_array* /* of struct miqt_string* */ list) { +QJsonArray* QJsonArray_FromStringList(struct miqt_array* /* of struct miqt_string */ list) { QStringList list_QList; list_QList.reserve(list->len); - struct miqt_string** list_arr = static_cast(list->data); + struct miqt_string* list_arr = static_cast(list->data); for(size_t i = 0; i < list->len; ++i) { - QString list_arr_i_QString = QString::fromUtf8(&list_arr[i]->data, list_arr[i]->len); + QString list_arr_i_QString = QString::fromUtf8(list_arr[i].data, list_arr[i].len); list_QList.push_back(list_arr_i_QString); } return new QJsonArray(QJsonArray::fromStringList(list_QList)); diff --git a/qt/gen_qjsonarray.go b/qt/gen_qjsonarray.go index fbfd189e..929d1466 100644 --- a/qt/gen_qjsonarray.go +++ b/qt/gen_qjsonarray.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -61,12 +60,14 @@ func (this *QJsonArray) OperatorAssign(other *QJsonArray) { func QJsonArray_FromStringList(list []string) *QJsonArray { // For the C ABI, malloc a C array of raw pointers - list_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(list)))) + list_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(list)))) defer C.free(unsafe.Pointer(list_CArray)) for i := range list { - list_i_ms := libmiqt.Strdupg(list[i]) - defer C.free(list_i_ms) - list_CArray[i] = (*C.struct_miqt_string)(list_i_ms) + list_i_ms := C.struct_miqt_string{} + list_i_ms.data = C.CString(list[i]) + list_i_ms.len = C.size_t(len(list[i])) + defer C.free(unsafe.Pointer(list_i_ms.data)) + list_CArray[i] = list_i_ms } list_ma := &C.struct_miqt_array{len: C.size_t(len(list)), data: unsafe.Pointer(list_CArray)} defer runtime.KeepAlive(unsafe.Pointer(list_ma)) diff --git a/qt/gen_qjsonarray.h b/qt/gen_qjsonarray.h index 246747fe..2d02d510 100644 --- a/qt/gen_qjsonarray.h +++ b/qt/gen_qjsonarray.h @@ -42,7 +42,7 @@ typedef struct QJsonValueRefPtr QJsonValueRefPtr; QJsonArray* QJsonArray_new(); QJsonArray* QJsonArray_new2(QJsonArray* other); void QJsonArray_OperatorAssign(QJsonArray* self, QJsonArray* other); -QJsonArray* QJsonArray_FromStringList(struct miqt_array* /* of struct miqt_string* */ list); +QJsonArray* QJsonArray_FromStringList(struct miqt_array* /* of struct miqt_string */ list); int QJsonArray_Size(const QJsonArray* self); int QJsonArray_Count(const QJsonArray* self); bool QJsonArray_IsEmpty(const QJsonArray* self); diff --git a/qt/gen_qjsondocument.cpp b/qt/gen_qjsondocument.cpp index 0b59a3d3..28e022bb 100644 --- a/qt/gen_qjsondocument.cpp +++ b/qt/gen_qjsondocument.cpp @@ -12,11 +12,15 @@ #include "gen_qjsondocument.h" #include "_cgo_export.h" -struct miqt_string* QJsonParseError_ErrorString(const QJsonParseError* self) { +struct miqt_string QJsonParseError_ErrorString(const QJsonParseError* self) { QString _ret = self->errorString(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QJsonParseError_Delete(QJsonParseError* self) { @@ -55,12 +59,18 @@ const char* QJsonDocument_RawData(const QJsonDocument* self, int* size) { return (const char*) self->rawData(static_cast(size)); } -QJsonDocument* QJsonDocument_FromBinaryData(QByteArray* data) { - return new QJsonDocument(QJsonDocument::fromBinaryData(*data)); +QJsonDocument* QJsonDocument_FromBinaryData(struct miqt_string data) { + QByteArray data_QByteArray(data.data, data.len); + return new QJsonDocument(QJsonDocument::fromBinaryData(data_QByteArray)); } -QByteArray* QJsonDocument_ToBinaryData(const QJsonDocument* self) { - return new QByteArray(self->toBinaryData()); +struct miqt_string QJsonDocument_ToBinaryData(const QJsonDocument* self) { + QByteArray _qb = self->toBinaryData(); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } QJsonDocument* QJsonDocument_FromVariant(QVariant* variant) { @@ -71,16 +81,27 @@ QVariant* QJsonDocument_ToVariant(const QJsonDocument* self) { return new QVariant(self->toVariant()); } -QJsonDocument* QJsonDocument_FromJson(QByteArray* json) { - return new QJsonDocument(QJsonDocument::fromJson(*json)); +QJsonDocument* QJsonDocument_FromJson(struct miqt_string json) { + QByteArray json_QByteArray(json.data, json.len); + return new QJsonDocument(QJsonDocument::fromJson(json_QByteArray)); } -QByteArray* QJsonDocument_ToJson(const QJsonDocument* self) { - return new QByteArray(self->toJson()); +struct miqt_string QJsonDocument_ToJson(const QJsonDocument* self) { + QByteArray _qb = self->toJson(); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } -QByteArray* QJsonDocument_ToJsonWithFormat(const QJsonDocument* self, int format) { - return new QByteArray(self->toJson(static_cast(format))); +struct miqt_string QJsonDocument_ToJsonWithFormat(const QJsonDocument* self, int format) { + QByteArray _qb = self->toJson(static_cast(format)); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } bool QJsonDocument_IsEmpty(const QJsonDocument* self) { @@ -111,8 +132,8 @@ void QJsonDocument_SetArray(QJsonDocument* self, QJsonArray* array) { self->setArray(*array); } -QJsonValue* QJsonDocument_OperatorSubscript(const QJsonDocument* self, struct miqt_string* key) { - QString key_QString = QString::fromUtf8(&key->data, key->len); +QJsonValue* QJsonDocument_OperatorSubscript(const QJsonDocument* self, struct miqt_string key) { + QString key_QString = QString::fromUtf8(key.data, key.len); return new QJsonValue(self->operator[](key_QString)); } @@ -136,12 +157,14 @@ QJsonDocument* QJsonDocument_FromRawData3(const char* data, int size, int valida return new QJsonDocument(QJsonDocument::fromRawData(data, static_cast(size), static_cast(validation))); } -QJsonDocument* QJsonDocument_FromBinaryData2(QByteArray* data, int validation) { - return new QJsonDocument(QJsonDocument::fromBinaryData(*data, static_cast(validation))); +QJsonDocument* QJsonDocument_FromBinaryData2(struct miqt_string data, int validation) { + QByteArray data_QByteArray(data.data, data.len); + return new QJsonDocument(QJsonDocument::fromBinaryData(data_QByteArray, static_cast(validation))); } -QJsonDocument* QJsonDocument_FromJson2(QByteArray* json, QJsonParseError* error) { - return new QJsonDocument(QJsonDocument::fromJson(*json, error)); +QJsonDocument* QJsonDocument_FromJson2(struct miqt_string json, QJsonParseError* error) { + QByteArray json_QByteArray(json.data, json.len); + return new QJsonDocument(QJsonDocument::fromJson(json_QByteArray, error)); } void QJsonDocument_Delete(QJsonDocument* self) { diff --git a/qt/gen_qjsondocument.go b/qt/gen_qjsondocument.go index e88001fc..8739974f 100644 --- a/qt/gen_qjsondocument.go +++ b/qt/gen_qjsondocument.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -78,9 +77,9 @@ func UnsafeNewQJsonParseError(h unsafe.Pointer) *QJsonParseError { } func (this *QJsonParseError) ErrorString() string { - var _ms *C.struct_miqt_string = C.QJsonParseError_ErrorString(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QJsonParseError_ErrorString(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -168,23 +167,26 @@ func QJsonDocument_FromRawData(data string, size int) *QJsonDocument { return _goptr } -func (this *QJsonDocument) RawData(size *int) unsafe.Pointer { +func (this *QJsonDocument) RawData(size *int) string { _ret := C.QJsonDocument_RawData(this.h, (*C.int)(unsafe.Pointer(size))) - return (unsafe.Pointer)(_ret) + return C.GoString(_ret) } -func QJsonDocument_FromBinaryData(data *QByteArray) *QJsonDocument { - _ret := C.QJsonDocument_FromBinaryData(data.cPointer()) +func QJsonDocument_FromBinaryData(data []byte) *QJsonDocument { + data_alias := C.struct_miqt_string{} + data_alias.data = (*C.char)(unsafe.Pointer(&data[0])) + data_alias.len = C.size_t(len(data)) + _ret := C.QJsonDocument_FromBinaryData(data_alias) _goptr := newQJsonDocument(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QJsonDocument) ToBinaryData() *QByteArray { - _ret := C.QJsonDocument_ToBinaryData(this.h) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QJsonDocument) ToBinaryData() []byte { + var _bytearray C.struct_miqt_string = C.QJsonDocument_ToBinaryData(this.h) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } func QJsonDocument_FromVariant(variant *QVariant) *QJsonDocument { @@ -201,25 +203,28 @@ func (this *QJsonDocument) ToVariant() *QVariant { return _goptr } -func QJsonDocument_FromJson(json *QByteArray) *QJsonDocument { - _ret := C.QJsonDocument_FromJson(json.cPointer()) +func QJsonDocument_FromJson(json []byte) *QJsonDocument { + json_alias := C.struct_miqt_string{} + json_alias.data = (*C.char)(unsafe.Pointer(&json[0])) + json_alias.len = C.size_t(len(json)) + _ret := C.QJsonDocument_FromJson(json_alias) _goptr := newQJsonDocument(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QJsonDocument) ToJson() *QByteArray { - _ret := C.QJsonDocument_ToJson(this.h) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QJsonDocument) ToJson() []byte { + var _bytearray C.struct_miqt_string = C.QJsonDocument_ToJson(this.h) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } -func (this *QJsonDocument) ToJsonWithFormat(format QJsonDocument__JsonFormat) *QByteArray { - _ret := C.QJsonDocument_ToJsonWithFormat(this.h, (C.int)(format)) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QJsonDocument) ToJsonWithFormat(format QJsonDocument__JsonFormat) []byte { + var _bytearray C.struct_miqt_string = C.QJsonDocument_ToJsonWithFormat(this.h, (C.int)(format)) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } func (this *QJsonDocument) IsEmpty() bool { @@ -257,9 +262,11 @@ func (this *QJsonDocument) SetArray(array *QJsonArray) { } func (this *QJsonDocument) OperatorSubscript(key string) *QJsonValue { - key_ms := libmiqt.Strdupg(key) - defer C.free(key_ms) - _ret := C.QJsonDocument_OperatorSubscript(this.h, (*C.struct_miqt_string)(key_ms)) + key_ms := C.struct_miqt_string{} + key_ms.data = C.CString(key) + key_ms.len = C.size_t(len(key)) + defer C.free(unsafe.Pointer(key_ms.data)) + _ret := C.QJsonDocument_OperatorSubscript(this.h, key_ms) _goptr := newQJsonValue(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -293,15 +300,21 @@ func QJsonDocument_FromRawData3(data string, size int, validation QJsonDocument_ return _goptr } -func QJsonDocument_FromBinaryData2(data *QByteArray, validation QJsonDocument__DataValidation) *QJsonDocument { - _ret := C.QJsonDocument_FromBinaryData2(data.cPointer(), (C.int)(validation)) +func QJsonDocument_FromBinaryData2(data []byte, validation QJsonDocument__DataValidation) *QJsonDocument { + data_alias := C.struct_miqt_string{} + data_alias.data = (*C.char)(unsafe.Pointer(&data[0])) + data_alias.len = C.size_t(len(data)) + _ret := C.QJsonDocument_FromBinaryData2(data_alias, (C.int)(validation)) _goptr := newQJsonDocument(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func QJsonDocument_FromJson2(json *QByteArray, error *QJsonParseError) *QJsonDocument { - _ret := C.QJsonDocument_FromJson2(json.cPointer(), error.cPointer()) +func QJsonDocument_FromJson2(json []byte, error *QJsonParseError) *QJsonDocument { + json_alias := C.struct_miqt_string{} + json_alias.data = (*C.char)(unsafe.Pointer(&json[0])) + json_alias.len = C.size_t(len(json)) + _ret := C.QJsonDocument_FromJson2(json_alias, error.cPointer()) _goptr := newQJsonDocument(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr diff --git a/qt/gen_qjsondocument.h b/qt/gen_qjsondocument.h index 582bc43e..072ec09f 100644 --- a/qt/gen_qjsondocument.h +++ b/qt/gen_qjsondocument.h @@ -31,7 +31,7 @@ typedef struct QJsonValue QJsonValue; typedef struct QVariant QVariant; #endif -struct miqt_string* QJsonParseError_ErrorString(const QJsonParseError* self); +struct miqt_string QJsonParseError_ErrorString(const QJsonParseError* self); void QJsonParseError_Delete(QJsonParseError* self); QJsonDocument* QJsonDocument_new(); @@ -42,13 +42,13 @@ void QJsonDocument_OperatorAssign(QJsonDocument* self, QJsonDocument* other); void QJsonDocument_Swap(QJsonDocument* self, QJsonDocument* other); QJsonDocument* QJsonDocument_FromRawData(const char* data, int size); const char* QJsonDocument_RawData(const QJsonDocument* self, int* size); -QJsonDocument* QJsonDocument_FromBinaryData(QByteArray* data); -QByteArray* QJsonDocument_ToBinaryData(const QJsonDocument* self); +QJsonDocument* QJsonDocument_FromBinaryData(struct miqt_string data); +struct miqt_string QJsonDocument_ToBinaryData(const QJsonDocument* self); QJsonDocument* QJsonDocument_FromVariant(QVariant* variant); QVariant* QJsonDocument_ToVariant(const QJsonDocument* self); -QJsonDocument* QJsonDocument_FromJson(QByteArray* json); -QByteArray* QJsonDocument_ToJson(const QJsonDocument* self); -QByteArray* QJsonDocument_ToJsonWithFormat(const QJsonDocument* self, int format); +QJsonDocument* QJsonDocument_FromJson(struct miqt_string json); +struct miqt_string QJsonDocument_ToJson(const QJsonDocument* self); +struct miqt_string QJsonDocument_ToJsonWithFormat(const QJsonDocument* self, int format); bool QJsonDocument_IsEmpty(const QJsonDocument* self); bool QJsonDocument_IsArray(const QJsonDocument* self); bool QJsonDocument_IsObject(const QJsonDocument* self); @@ -56,14 +56,14 @@ QJsonObject* QJsonDocument_Object(const QJsonDocument* self); QJsonArray* QJsonDocument_Array(const QJsonDocument* self); void QJsonDocument_SetObject(QJsonDocument* self, QJsonObject* object); void QJsonDocument_SetArray(QJsonDocument* self, QJsonArray* array); -QJsonValue* QJsonDocument_OperatorSubscript(const QJsonDocument* self, struct miqt_string* key); +QJsonValue* QJsonDocument_OperatorSubscript(const QJsonDocument* self, struct miqt_string key); QJsonValue* QJsonDocument_OperatorSubscriptWithInt(const QJsonDocument* self, int i); bool QJsonDocument_OperatorEqual(const QJsonDocument* self, QJsonDocument* other); bool QJsonDocument_OperatorNotEqual(const QJsonDocument* self, QJsonDocument* other); bool QJsonDocument_IsNull(const QJsonDocument* self); QJsonDocument* QJsonDocument_FromRawData3(const char* data, int size, int validation); -QJsonDocument* QJsonDocument_FromBinaryData2(QByteArray* data, int validation); -QJsonDocument* QJsonDocument_FromJson2(QByteArray* json, QJsonParseError* error); +QJsonDocument* QJsonDocument_FromBinaryData2(struct miqt_string data, int validation); +QJsonDocument* QJsonDocument_FromJson2(struct miqt_string json, QJsonParseError* error); void QJsonDocument_Delete(QJsonDocument* self); #ifdef __cplusplus diff --git a/qt/gen_qjsonobject.cpp b/qt/gen_qjsonobject.cpp index 4a9fa4d5..48fcec1e 100644 --- a/qt/gen_qjsonobject.cpp +++ b/qt/gen_qjsonobject.cpp @@ -32,12 +32,16 @@ void QJsonObject_Swap(QJsonObject* self, QJsonObject* other) { struct miqt_array* QJsonObject_Keys(const QJsonObject* self) { QStringList _ret = self->keys(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -61,33 +65,33 @@ bool QJsonObject_IsEmpty(const QJsonObject* self) { return self->isEmpty(); } -QJsonValue* QJsonObject_Value(const QJsonObject* self, struct miqt_string* key) { - QString key_QString = QString::fromUtf8(&key->data, key->len); +QJsonValue* QJsonObject_Value(const QJsonObject* self, struct miqt_string key) { + QString key_QString = QString::fromUtf8(key.data, key.len); return new QJsonValue(self->value(key_QString)); } -QJsonValue* QJsonObject_OperatorSubscript(const QJsonObject* self, struct miqt_string* key) { - QString key_QString = QString::fromUtf8(&key->data, key->len); +QJsonValue* QJsonObject_OperatorSubscript(const QJsonObject* self, struct miqt_string key) { + QString key_QString = QString::fromUtf8(key.data, key.len); return new QJsonValue(self->operator[](key_QString)); } -QJsonValueRef* QJsonObject_OperatorSubscriptWithKey(QJsonObject* self, struct miqt_string* key) { - QString key_QString = QString::fromUtf8(&key->data, key->len); +QJsonValueRef* QJsonObject_OperatorSubscriptWithKey(QJsonObject* self, struct miqt_string key) { + QString key_QString = QString::fromUtf8(key.data, key.len); return new QJsonValueRef(self->operator[](key_QString)); } -void QJsonObject_Remove(QJsonObject* self, struct miqt_string* key) { - QString key_QString = QString::fromUtf8(&key->data, key->len); +void QJsonObject_Remove(QJsonObject* self, struct miqt_string key) { + QString key_QString = QString::fromUtf8(key.data, key.len); self->remove(key_QString); } -QJsonValue* QJsonObject_Take(QJsonObject* self, struct miqt_string* key) { - QString key_QString = QString::fromUtf8(&key->data, key->len); +QJsonValue* QJsonObject_Take(QJsonObject* self, struct miqt_string key) { + QString key_QString = QString::fromUtf8(key.data, key.len); return new QJsonValue(self->take(key_QString)); } -bool QJsonObject_Contains(const QJsonObject* self, struct miqt_string* key) { - QString key_QString = QString::fromUtf8(&key->data, key->len); +bool QJsonObject_Contains(const QJsonObject* self, struct miqt_string key) { + QString key_QString = QString::fromUtf8(key.data, key.len); return self->contains(key_QString); } @@ -127,23 +131,23 @@ QJsonObject__iterator* QJsonObject_Erase(QJsonObject* self, QJsonObject__iterato return new QJsonObject::iterator(self->erase(*it)); } -QJsonObject__iterator* QJsonObject_Find(QJsonObject* self, struct miqt_string* key) { - QString key_QString = QString::fromUtf8(&key->data, key->len); +QJsonObject__iterator* QJsonObject_Find(QJsonObject* self, struct miqt_string key) { + QString key_QString = QString::fromUtf8(key.data, key.len); return new QJsonObject::iterator(self->find(key_QString)); } -QJsonObject__const_iterator* QJsonObject_FindWithKey(const QJsonObject* self, struct miqt_string* key) { - QString key_QString = QString::fromUtf8(&key->data, key->len); +QJsonObject__const_iterator* QJsonObject_FindWithKey(const QJsonObject* self, struct miqt_string key) { + QString key_QString = QString::fromUtf8(key.data, key.len); return new QJsonObject::const_iterator(self->find(key_QString)); } -QJsonObject__const_iterator* QJsonObject_ConstFind(const QJsonObject* self, struct miqt_string* key) { - QString key_QString = QString::fromUtf8(&key->data, key->len); +QJsonObject__const_iterator* QJsonObject_ConstFind(const QJsonObject* self, struct miqt_string key) { + QString key_QString = QString::fromUtf8(key.data, key.len); return new QJsonObject::const_iterator(self->constFind(key_QString)); } -QJsonObject__iterator* QJsonObject_Insert(QJsonObject* self, struct miqt_string* key, QJsonValue* value) { - QString key_QString = QString::fromUtf8(&key->data, key->len); +QJsonObject__iterator* QJsonObject_Insert(QJsonObject* self, struct miqt_string key, QJsonValue* value) { + QString key_QString = QString::fromUtf8(key.data, key.len); return new QJsonObject::iterator(self->insert(key_QString, *value)); } @@ -167,11 +171,15 @@ QJsonObject__iterator* QJsonObject__iterator_new3(QJsonObject__iterator* param1) return new QJsonObject::iterator(*param1); } -struct miqt_string* QJsonObject__iterator_Key(const QJsonObject__iterator* self) { +struct miqt_string QJsonObject__iterator_Key(const QJsonObject__iterator* self) { QString _ret = self->key(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QJsonValueRef* QJsonObject__iterator_Value(const QJsonObject__iterator* self) { @@ -302,11 +310,15 @@ QJsonObject__const_iterator* QJsonObject__const_iterator_new4(QJsonObject__const return new QJsonObject::const_iterator(*param1); } -struct miqt_string* QJsonObject__const_iterator_Key(const QJsonObject__const_iterator* self) { +struct miqt_string QJsonObject__const_iterator_Key(const QJsonObject__const_iterator* self) { QString _ret = self->key(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QJsonValue* QJsonObject__const_iterator_Value(const QJsonObject__const_iterator* self) { diff --git a/qt/gen_qjsonobject.go b/qt/gen_qjsonobject.go index f894d956..0fc68fab 100644 --- a/qt/gen_qjsonobject.go +++ b/qt/gen_qjsonobject.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -66,11 +65,11 @@ func (this *QJsonObject) Swap(other *QJsonObject) { func (this *QJsonObject) Keys() []string { var _ma *C.struct_miqt_array = C.QJsonObject_Keys(this.h) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -94,51 +93,63 @@ func (this *QJsonObject) IsEmpty() bool { } func (this *QJsonObject) Value(key string) *QJsonValue { - key_ms := libmiqt.Strdupg(key) - defer C.free(key_ms) - _ret := C.QJsonObject_Value(this.h, (*C.struct_miqt_string)(key_ms)) + key_ms := C.struct_miqt_string{} + key_ms.data = C.CString(key) + key_ms.len = C.size_t(len(key)) + defer C.free(unsafe.Pointer(key_ms.data)) + _ret := C.QJsonObject_Value(this.h, key_ms) _goptr := newQJsonValue(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QJsonObject) OperatorSubscript(key string) *QJsonValue { - key_ms := libmiqt.Strdupg(key) - defer C.free(key_ms) - _ret := C.QJsonObject_OperatorSubscript(this.h, (*C.struct_miqt_string)(key_ms)) + key_ms := C.struct_miqt_string{} + key_ms.data = C.CString(key) + key_ms.len = C.size_t(len(key)) + defer C.free(unsafe.Pointer(key_ms.data)) + _ret := C.QJsonObject_OperatorSubscript(this.h, key_ms) _goptr := newQJsonValue(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QJsonObject) OperatorSubscriptWithKey(key string) *QJsonValueRef { - key_ms := libmiqt.Strdupg(key) - defer C.free(key_ms) - _ret := C.QJsonObject_OperatorSubscriptWithKey(this.h, (*C.struct_miqt_string)(key_ms)) + key_ms := C.struct_miqt_string{} + key_ms.data = C.CString(key) + key_ms.len = C.size_t(len(key)) + defer C.free(unsafe.Pointer(key_ms.data)) + _ret := C.QJsonObject_OperatorSubscriptWithKey(this.h, key_ms) _goptr := newQJsonValueRef(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QJsonObject) Remove(key string) { - key_ms := libmiqt.Strdupg(key) - defer C.free(key_ms) - C.QJsonObject_Remove(this.h, (*C.struct_miqt_string)(key_ms)) + key_ms := C.struct_miqt_string{} + key_ms.data = C.CString(key) + key_ms.len = C.size_t(len(key)) + defer C.free(unsafe.Pointer(key_ms.data)) + C.QJsonObject_Remove(this.h, key_ms) } func (this *QJsonObject) Take(key string) *QJsonValue { - key_ms := libmiqt.Strdupg(key) - defer C.free(key_ms) - _ret := C.QJsonObject_Take(this.h, (*C.struct_miqt_string)(key_ms)) + key_ms := C.struct_miqt_string{} + key_ms.data = C.CString(key) + key_ms.len = C.size_t(len(key)) + defer C.free(unsafe.Pointer(key_ms.data)) + _ret := C.QJsonObject_Take(this.h, key_ms) _goptr := newQJsonValue(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QJsonObject) Contains(key string) bool { - key_ms := libmiqt.Strdupg(key) - defer C.free(key_ms) - return (bool)(C.QJsonObject_Contains(this.h, (*C.struct_miqt_string)(key_ms))) + key_ms := C.struct_miqt_string{} + key_ms.data = C.CString(key) + key_ms.len = C.size_t(len(key)) + defer C.free(unsafe.Pointer(key_ms.data)) + return (bool)(C.QJsonObject_Contains(this.h, key_ms)) } func (this *QJsonObject) OperatorEqual(other *QJsonObject) bool { @@ -199,36 +210,44 @@ func (this *QJsonObject) Erase(it QJsonObject__iterator) *QJsonObject__iterator } func (this *QJsonObject) Find(key string) *QJsonObject__iterator { - key_ms := libmiqt.Strdupg(key) - defer C.free(key_ms) - _ret := C.QJsonObject_Find(this.h, (*C.struct_miqt_string)(key_ms)) + key_ms := C.struct_miqt_string{} + key_ms.data = C.CString(key) + key_ms.len = C.size_t(len(key)) + defer C.free(unsafe.Pointer(key_ms.data)) + _ret := C.QJsonObject_Find(this.h, key_ms) _goptr := newQJsonObject__iterator(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QJsonObject) FindWithKey(key string) *QJsonObject__const_iterator { - key_ms := libmiqt.Strdupg(key) - defer C.free(key_ms) - _ret := C.QJsonObject_FindWithKey(this.h, (*C.struct_miqt_string)(key_ms)) + key_ms := C.struct_miqt_string{} + key_ms.data = C.CString(key) + key_ms.len = C.size_t(len(key)) + defer C.free(unsafe.Pointer(key_ms.data)) + _ret := C.QJsonObject_FindWithKey(this.h, key_ms) _goptr := newQJsonObject__const_iterator(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QJsonObject) ConstFind(key string) *QJsonObject__const_iterator { - key_ms := libmiqt.Strdupg(key) - defer C.free(key_ms) - _ret := C.QJsonObject_ConstFind(this.h, (*C.struct_miqt_string)(key_ms)) + key_ms := C.struct_miqt_string{} + key_ms.data = C.CString(key) + key_ms.len = C.size_t(len(key)) + defer C.free(unsafe.Pointer(key_ms.data)) + _ret := C.QJsonObject_ConstFind(this.h, key_ms) _goptr := newQJsonObject__const_iterator(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QJsonObject) Insert(key string, value *QJsonValue) *QJsonObject__iterator { - key_ms := libmiqt.Strdupg(key) - defer C.free(key_ms) - _ret := C.QJsonObject_Insert(this.h, (*C.struct_miqt_string)(key_ms), value.cPointer()) + key_ms := C.struct_miqt_string{} + key_ms.data = C.CString(key) + key_ms.len = C.size_t(len(key)) + defer C.free(unsafe.Pointer(key_ms.data)) + _ret := C.QJsonObject_Insert(this.h, key_ms, value.cPointer()) _goptr := newQJsonObject__iterator(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -300,9 +319,9 @@ func NewQJsonObject__iterator3(param1 *QJsonObject__iterator) *QJsonObject__iter } func (this *QJsonObject__iterator) Key() string { - var _ms *C.struct_miqt_string = C.QJsonObject__iterator_Key(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QJsonObject__iterator_Key(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -498,9 +517,9 @@ func NewQJsonObject__const_iterator4(param1 *QJsonObject__const_iterator) *QJson } func (this *QJsonObject__const_iterator) Key() string { - var _ms *C.struct_miqt_string = C.QJsonObject__const_iterator_Key(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QJsonObject__const_iterator_Key(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qjsonobject.h b/qt/gen_qjsonobject.h index 073cd1aa..f33e98fa 100644 --- a/qt/gen_qjsonobject.h +++ b/qt/gen_qjsonobject.h @@ -48,12 +48,12 @@ int QJsonObject_Size(const QJsonObject* self); int QJsonObject_Count(const QJsonObject* self); int QJsonObject_Length(const QJsonObject* self); bool QJsonObject_IsEmpty(const QJsonObject* self); -QJsonValue* QJsonObject_Value(const QJsonObject* self, struct miqt_string* key); -QJsonValue* QJsonObject_OperatorSubscript(const QJsonObject* self, struct miqt_string* key); -QJsonValueRef* QJsonObject_OperatorSubscriptWithKey(QJsonObject* self, struct miqt_string* key); -void QJsonObject_Remove(QJsonObject* self, struct miqt_string* key); -QJsonValue* QJsonObject_Take(QJsonObject* self, struct miqt_string* key); -bool QJsonObject_Contains(const QJsonObject* self, struct miqt_string* key); +QJsonValue* QJsonObject_Value(const QJsonObject* self, struct miqt_string key); +QJsonValue* QJsonObject_OperatorSubscript(const QJsonObject* self, struct miqt_string key); +QJsonValueRef* QJsonObject_OperatorSubscriptWithKey(QJsonObject* self, struct miqt_string key); +void QJsonObject_Remove(QJsonObject* self, struct miqt_string key); +QJsonValue* QJsonObject_Take(QJsonObject* self, struct miqt_string key); +bool QJsonObject_Contains(const QJsonObject* self, struct miqt_string key); bool QJsonObject_OperatorEqual(const QJsonObject* self, QJsonObject* other); bool QJsonObject_OperatorNotEqual(const QJsonObject* self, QJsonObject* other); QJsonObject__iterator* QJsonObject_Begin(QJsonObject* self); @@ -63,17 +63,17 @@ QJsonObject__iterator* QJsonObject_End(QJsonObject* self); QJsonObject__const_iterator* QJsonObject_End2(const QJsonObject* self); QJsonObject__const_iterator* QJsonObject_ConstEnd(const QJsonObject* self); QJsonObject__iterator* QJsonObject_Erase(QJsonObject* self, QJsonObject__iterator* it); -QJsonObject__iterator* QJsonObject_Find(QJsonObject* self, struct miqt_string* key); -QJsonObject__const_iterator* QJsonObject_FindWithKey(const QJsonObject* self, struct miqt_string* key); -QJsonObject__const_iterator* QJsonObject_ConstFind(const QJsonObject* self, struct miqt_string* key); -QJsonObject__iterator* QJsonObject_Insert(QJsonObject* self, struct miqt_string* key, QJsonValue* value); +QJsonObject__iterator* QJsonObject_Find(QJsonObject* self, struct miqt_string key); +QJsonObject__const_iterator* QJsonObject_FindWithKey(const QJsonObject* self, struct miqt_string key); +QJsonObject__const_iterator* QJsonObject_ConstFind(const QJsonObject* self, struct miqt_string key); +QJsonObject__iterator* QJsonObject_Insert(QJsonObject* self, struct miqt_string key, QJsonValue* value); bool QJsonObject_Empty(const QJsonObject* self); void QJsonObject_Delete(QJsonObject* self); QJsonObject__iterator* QJsonObject__iterator_new(); QJsonObject__iterator* QJsonObject__iterator_new2(QJsonObject* obj, int index); QJsonObject__iterator* QJsonObject__iterator_new3(QJsonObject__iterator* param1); -struct miqt_string* QJsonObject__iterator_Key(const QJsonObject__iterator* self); +struct miqt_string QJsonObject__iterator_Key(const QJsonObject__iterator* self); QJsonValueRef* QJsonObject__iterator_Value(const QJsonObject__iterator* self); QJsonValueRef* QJsonObject__iterator_OperatorMultiply(const QJsonObject__iterator* self); QJsonValueRefPtr* QJsonObject__iterator_OperatorMinusGreater(const QJsonObject__iterator* self); @@ -105,7 +105,7 @@ QJsonObject__const_iterator* QJsonObject__const_iterator_new(); QJsonObject__const_iterator* QJsonObject__const_iterator_new2(QJsonObject* obj, int index); QJsonObject__const_iterator* QJsonObject__const_iterator_new3(QJsonObject__iterator* other); QJsonObject__const_iterator* QJsonObject__const_iterator_new4(QJsonObject__const_iterator* param1); -struct miqt_string* QJsonObject__const_iterator_Key(const QJsonObject__const_iterator* self); +struct miqt_string QJsonObject__const_iterator_Key(const QJsonObject__const_iterator* self); QJsonValue* QJsonObject__const_iterator_Value(const QJsonObject__const_iterator* self); QJsonValue* QJsonObject__const_iterator_OperatorMultiply(const QJsonObject__const_iterator* self); QJsonValuePtr* QJsonObject__const_iterator_OperatorMinusGreater(const QJsonObject__const_iterator* self); diff --git a/qt/gen_qjsonvalue.cpp b/qt/gen_qjsonvalue.cpp index 5c61f674..87d54021 100644 --- a/qt/gen_qjsonvalue.cpp +++ b/qt/gen_qjsonvalue.cpp @@ -32,8 +32,8 @@ QJsonValue* QJsonValue_new5(long long v) { return new QJsonValue(static_cast(v)); } -QJsonValue* QJsonValue_new6(struct miqt_string* s) { - QString s_QString = QString::fromUtf8(&s->data, s->len); +QJsonValue* QJsonValue_new6(struct miqt_string s) { + QString s_QString = QString::fromUtf8(s.data, s.len); return new QJsonValue(s_QString); } @@ -118,19 +118,27 @@ double QJsonValue_ToDouble(const QJsonValue* self) { return self->toDouble(); } -struct miqt_string* QJsonValue_ToString(const QJsonValue* self) { +struct miqt_string QJsonValue_ToString(const QJsonValue* self) { QString _ret = self->toString(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QJsonValue_ToStringWithDefaultValue(const QJsonValue* self, struct miqt_string* defaultValue) { - QString defaultValue_QString = QString::fromUtf8(&defaultValue->data, defaultValue->len); +struct miqt_string QJsonValue_ToStringWithDefaultValue(const QJsonValue* self, struct miqt_string defaultValue) { + QString defaultValue_QString = QString::fromUtf8(defaultValue.data, defaultValue.len); QString _ret = self->toString(defaultValue_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QJsonArray* QJsonValue_ToArray(const QJsonValue* self) { @@ -149,8 +157,8 @@ QJsonObject* QJsonValue_ToObjectWithDefaultValue(const QJsonValue* self, QJsonOb return new QJsonObject(self->toObject(*defaultValue)); } -QJsonValue* QJsonValue_OperatorSubscript(const QJsonValue* self, struct miqt_string* key) { - QString key_QString = QString::fromUtf8(&key->data, key->len); +QJsonValue* QJsonValue_OperatorSubscript(const QJsonValue* self, struct miqt_string key) { + QString key_QString = QString::fromUtf8(key.data, key.len); return new QJsonValue(self->operator[](key_QString)); } @@ -251,11 +259,15 @@ double QJsonValueRef_ToDouble(const QJsonValueRef* self) { return self->toDouble(); } -struct miqt_string* QJsonValueRef_ToString(const QJsonValueRef* self) { +struct miqt_string QJsonValueRef_ToString(const QJsonValueRef* self) { QString _ret = self->toString(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QJsonArray* QJsonValueRef_ToArray(const QJsonValueRef* self) { @@ -278,12 +290,16 @@ double QJsonValueRef_ToDoubleWithDefaultValue(const QJsonValueRef* self, double return self->toDouble(static_cast(defaultValue)); } -struct miqt_string* QJsonValueRef_ToStringWithDefaultValue(const QJsonValueRef* self, struct miqt_string* defaultValue) { - QString defaultValue_QString = QString::fromUtf8(&defaultValue->data, defaultValue->len); +struct miqt_string QJsonValueRef_ToStringWithDefaultValue(const QJsonValueRef* self, struct miqt_string defaultValue) { + QString defaultValue_QString = QString::fromUtf8(defaultValue.data, defaultValue.len); QString _ret = self->toString(defaultValue_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } bool QJsonValueRef_OperatorEqual(const QJsonValueRef* self, QJsonValue* other) { diff --git a/qt/gen_qjsonvalue.go b/qt/gen_qjsonvalue.go index c9957d3b..fa4d552f 100644 --- a/qt/gen_qjsonvalue.go +++ b/qt/gen_qjsonvalue.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -87,9 +86,11 @@ func NewQJsonValue5(v int64) *QJsonValue { // NewQJsonValue6 constructs a new QJsonValue object. func NewQJsonValue6(s string) *QJsonValue { - s_ms := libmiqt.Strdupg(s) - defer C.free(s_ms) - ret := C.QJsonValue_new6((*C.struct_miqt_string)(s_ms)) + s_ms := C.struct_miqt_string{} + s_ms.data = C.CString(s) + s_ms.len = C.size_t(len(s)) + defer C.free(unsafe.Pointer(s_ms.data)) + ret := C.QJsonValue_new6(s_ms) return newQJsonValue(ret) } @@ -192,18 +193,20 @@ func (this *QJsonValue) ToDouble() float64 { } func (this *QJsonValue) ToString() string { - var _ms *C.struct_miqt_string = C.QJsonValue_ToString(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QJsonValue_ToString(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QJsonValue) ToStringWithDefaultValue(defaultValue string) string { - defaultValue_ms := libmiqt.Strdupg(defaultValue) - defer C.free(defaultValue_ms) - var _ms *C.struct_miqt_string = C.QJsonValue_ToStringWithDefaultValue(this.h, (*C.struct_miqt_string)(defaultValue_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + defaultValue_ms := C.struct_miqt_string{} + defaultValue_ms.data = C.CString(defaultValue) + defaultValue_ms.len = C.size_t(len(defaultValue)) + defer C.free(unsafe.Pointer(defaultValue_ms.data)) + var _ms C.struct_miqt_string = C.QJsonValue_ToStringWithDefaultValue(this.h, defaultValue_ms) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -236,9 +239,11 @@ func (this *QJsonValue) ToObjectWithDefaultValue(defaultValue *QJsonObject) *QJs } func (this *QJsonValue) OperatorSubscript(key string) *QJsonValue { - key_ms := libmiqt.Strdupg(key) - defer C.free(key_ms) - _ret := C.QJsonValue_OperatorSubscript(this.h, (*C.struct_miqt_string)(key_ms)) + key_ms := C.struct_miqt_string{} + key_ms.data = C.CString(key) + key_ms.len = C.size_t(len(key)) + defer C.free(unsafe.Pointer(key_ms.data)) + _ret := C.QJsonValue_OperatorSubscript(this.h, key_ms) _goptr := newQJsonValue(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -392,9 +397,9 @@ func (this *QJsonValueRef) ToDouble() float64 { } func (this *QJsonValueRef) ToString() string { - var _ms *C.struct_miqt_string = C.QJsonValueRef_ToString(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QJsonValueRef_ToString(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -425,11 +430,13 @@ func (this *QJsonValueRef) ToDoubleWithDefaultValue(defaultValue float64) float6 } func (this *QJsonValueRef) ToStringWithDefaultValue(defaultValue string) string { - defaultValue_ms := libmiqt.Strdupg(defaultValue) - defer C.free(defaultValue_ms) - var _ms *C.struct_miqt_string = C.QJsonValueRef_ToStringWithDefaultValue(this.h, (*C.struct_miqt_string)(defaultValue_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + defaultValue_ms := C.struct_miqt_string{} + defaultValue_ms.data = C.CString(defaultValue) + defaultValue_ms.len = C.size_t(len(defaultValue)) + defer C.free(unsafe.Pointer(defaultValue_ms.data)) + var _ms C.struct_miqt_string = C.QJsonValueRef_ToStringWithDefaultValue(this.h, defaultValue_ms) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qjsonvalue.h b/qt/gen_qjsonvalue.h index 32661296..42d22d63 100644 --- a/qt/gen_qjsonvalue.h +++ b/qt/gen_qjsonvalue.h @@ -36,7 +36,7 @@ QJsonValue* QJsonValue_new2(bool b); QJsonValue* QJsonValue_new3(double n); QJsonValue* QJsonValue_new4(int n); QJsonValue* QJsonValue_new5(long long v); -QJsonValue* QJsonValue_new6(struct miqt_string* s); +QJsonValue* QJsonValue_new6(struct miqt_string s); QJsonValue* QJsonValue_new7(const char* s); QJsonValue* QJsonValue_new8(QJsonArray* a); QJsonValue* QJsonValue_new9(QJsonObject* o); @@ -57,13 +57,13 @@ bool QJsonValue_IsUndefined(const QJsonValue* self); bool QJsonValue_ToBool(const QJsonValue* self); int QJsonValue_ToInt(const QJsonValue* self); double QJsonValue_ToDouble(const QJsonValue* self); -struct miqt_string* QJsonValue_ToString(const QJsonValue* self); -struct miqt_string* QJsonValue_ToStringWithDefaultValue(const QJsonValue* self, struct miqt_string* defaultValue); +struct miqt_string QJsonValue_ToString(const QJsonValue* self); +struct miqt_string QJsonValue_ToStringWithDefaultValue(const QJsonValue* self, struct miqt_string defaultValue); QJsonArray* QJsonValue_ToArray(const QJsonValue* self); QJsonArray* QJsonValue_ToArrayWithDefaultValue(const QJsonValue* self, QJsonArray* defaultValue); QJsonObject* QJsonValue_ToObject(const QJsonValue* self); QJsonObject* QJsonValue_ToObjectWithDefaultValue(const QJsonValue* self, QJsonObject* defaultValue); -QJsonValue* QJsonValue_OperatorSubscript(const QJsonValue* self, struct miqt_string* key); +QJsonValue* QJsonValue_OperatorSubscript(const QJsonValue* self, struct miqt_string key); QJsonValue* QJsonValue_OperatorSubscriptWithInt(const QJsonValue* self, int i); bool QJsonValue_OperatorEqual(const QJsonValue* self, QJsonValue* other); bool QJsonValue_OperatorNotEqual(const QJsonValue* self, QJsonValue* other); @@ -89,13 +89,13 @@ bool QJsonValueRef_IsUndefined(const QJsonValueRef* self); bool QJsonValueRef_ToBool(const QJsonValueRef* self); int QJsonValueRef_ToInt(const QJsonValueRef* self); double QJsonValueRef_ToDouble(const QJsonValueRef* self); -struct miqt_string* QJsonValueRef_ToString(const QJsonValueRef* self); +struct miqt_string QJsonValueRef_ToString(const QJsonValueRef* self); QJsonArray* QJsonValueRef_ToArray(const QJsonValueRef* self); QJsonObject* QJsonValueRef_ToObject(const QJsonValueRef* self); bool QJsonValueRef_ToBoolWithDefaultValue(const QJsonValueRef* self, bool defaultValue); int QJsonValueRef_ToIntWithDefaultValue(const QJsonValueRef* self, int defaultValue); double QJsonValueRef_ToDoubleWithDefaultValue(const QJsonValueRef* self, double defaultValue); -struct miqt_string* QJsonValueRef_ToStringWithDefaultValue(const QJsonValueRef* self, struct miqt_string* defaultValue); +struct miqt_string QJsonValueRef_ToStringWithDefaultValue(const QJsonValueRef* self, struct miqt_string defaultValue); bool QJsonValueRef_OperatorEqual(const QJsonValueRef* self, QJsonValue* other); bool QJsonValueRef_OperatorNotEqual(const QJsonValueRef* self, QJsonValue* other); void QJsonValueRef_Delete(QJsonValueRef* self); diff --git a/qt/gen_qkeyeventtransition.cpp b/qt/gen_qkeyeventtransition.cpp index 1b24f97c..b984b6d9 100644 --- a/qt/gen_qkeyeventtransition.cpp +++ b/qt/gen_qkeyeventtransition.cpp @@ -33,18 +33,26 @@ void* QKeyEventTransition_Metacast(QKeyEventTransition* self, const char* param1 return self->qt_metacast(param1); } -struct miqt_string* QKeyEventTransition_Tr(const char* s) { +struct miqt_string QKeyEventTransition_Tr(const char* s) { QString _ret = QKeyEventTransition::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QKeyEventTransition_TrUtf8(const char* s) { +struct miqt_string QKeyEventTransition_TrUtf8(const char* s) { QString _ret = QKeyEventTransition::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QKeyEventTransition_Key(const QKeyEventTransition* self) { @@ -64,32 +72,48 @@ void QKeyEventTransition_SetModifierMask(QKeyEventTransition* self, int modifier self->setModifierMask(static_cast(modifiers)); } -struct miqt_string* QKeyEventTransition_Tr2(const char* s, const char* c) { +struct miqt_string QKeyEventTransition_Tr2(const char* s, const char* c) { QString _ret = QKeyEventTransition::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QKeyEventTransition_Tr3(const char* s, const char* c, int n) { +struct miqt_string QKeyEventTransition_Tr3(const char* s, const char* c, int n) { QString _ret = QKeyEventTransition::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QKeyEventTransition_TrUtf82(const char* s, const char* c) { +struct miqt_string QKeyEventTransition_TrUtf82(const char* s, const char* c) { QString _ret = QKeyEventTransition::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QKeyEventTransition_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QKeyEventTransition_TrUtf83(const char* s, const char* c, int n) { QString _ret = QKeyEventTransition::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QKeyEventTransition_Delete(QKeyEventTransition* self) { diff --git a/qt/gen_qkeyeventtransition.go b/qt/gen_qkeyeventtransition.go index 0b7eb406..e5038252 100644 --- a/qt/gen_qkeyeventtransition.go +++ b/qt/gen_qkeyeventtransition.go @@ -74,24 +74,24 @@ func (this *QKeyEventTransition) MetaObject() *QMetaObject { func (this *QKeyEventTransition) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QKeyEventTransition_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QKeyEventTransition_Metacast(this.h, param1_Cstring)) } func QKeyEventTransition_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QKeyEventTransition_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QKeyEventTransition_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QKeyEventTransition_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QKeyEventTransition_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QKeyEventTransition_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -116,9 +116,9 @@ func QKeyEventTransition_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QKeyEventTransition_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QKeyEventTransition_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -127,9 +127,9 @@ func QKeyEventTransition_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QKeyEventTransition_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QKeyEventTransition_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -138,9 +138,9 @@ func QKeyEventTransition_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QKeyEventTransition_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QKeyEventTransition_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -149,9 +149,9 @@ func QKeyEventTransition_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QKeyEventTransition_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QKeyEventTransition_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qkeyeventtransition.h b/qt/gen_qkeyeventtransition.h index 2b96878d..9c10914b 100644 --- a/qt/gen_qkeyeventtransition.h +++ b/qt/gen_qkeyeventtransition.h @@ -31,16 +31,16 @@ QKeyEventTransition* QKeyEventTransition_new3(QState* sourceState); QKeyEventTransition* QKeyEventTransition_new4(QObject* object, int typeVal, int key, QState* sourceState); QMetaObject* QKeyEventTransition_MetaObject(const QKeyEventTransition* self); void* QKeyEventTransition_Metacast(QKeyEventTransition* self, const char* param1); -struct miqt_string* QKeyEventTransition_Tr(const char* s); -struct miqt_string* QKeyEventTransition_TrUtf8(const char* s); +struct miqt_string QKeyEventTransition_Tr(const char* s); +struct miqt_string QKeyEventTransition_TrUtf8(const char* s); int QKeyEventTransition_Key(const QKeyEventTransition* self); void QKeyEventTransition_SetKey(QKeyEventTransition* self, int key); int QKeyEventTransition_ModifierMask(const QKeyEventTransition* self); void QKeyEventTransition_SetModifierMask(QKeyEventTransition* self, int modifiers); -struct miqt_string* QKeyEventTransition_Tr2(const char* s, const char* c); -struct miqt_string* QKeyEventTransition_Tr3(const char* s, const char* c, int n); -struct miqt_string* QKeyEventTransition_TrUtf82(const char* s, const char* c); -struct miqt_string* QKeyEventTransition_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QKeyEventTransition_Tr2(const char* s, const char* c); +struct miqt_string QKeyEventTransition_Tr3(const char* s, const char* c, int n); +struct miqt_string QKeyEventTransition_TrUtf82(const char* s, const char* c); +struct miqt_string QKeyEventTransition_TrUtf83(const char* s, const char* c, int n); void QKeyEventTransition_Delete(QKeyEventTransition* self); #ifdef __cplusplus diff --git a/qt/gen_qkeysequence.cpp b/qt/gen_qkeysequence.cpp index 22340375..230cb265 100644 --- a/qt/gen_qkeysequence.cpp +++ b/qt/gen_qkeysequence.cpp @@ -11,8 +11,8 @@ QKeySequence* QKeySequence_new() { return new QKeySequence(); } -QKeySequence* QKeySequence_new2(struct miqt_string* key) { - QString key_QString = QString::fromUtf8(&key->data, key->len); +QKeySequence* QKeySequence_new2(struct miqt_string key) { + QString key_QString = QString::fromUtf8(key.data, key.len); return new QKeySequence(key_QString); } @@ -28,8 +28,8 @@ QKeySequence* QKeySequence_new5(int key) { return new QKeySequence(static_cast(key)); } -QKeySequence* QKeySequence_new6(struct miqt_string* key, int format) { - QString key_QString = QString::fromUtf8(&key->data, key->len); +QKeySequence* QKeySequence_new6(struct miqt_string key, int format) { + QString key_QString = QString::fromUtf8(key.data, key.len); return new QKeySequence(key_QString, static_cast(format)); } @@ -53,20 +53,24 @@ bool QKeySequence_IsEmpty(const QKeySequence* self) { return self->isEmpty(); } -struct miqt_string* QKeySequence_ToString(const QKeySequence* self) { +struct miqt_string QKeySequence_ToString(const QKeySequence* self) { QString _ret = self->toString(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -QKeySequence* QKeySequence_FromString(struct miqt_string* str) { - QString str_QString = QString::fromUtf8(&str->data, str->len); +QKeySequence* QKeySequence_FromString(struct miqt_string str) { + QString str_QString = QString::fromUtf8(str.data, str.len); return new QKeySequence(QKeySequence::fromString(str_QString)); } -struct miqt_array* QKeySequence_ListFromString(struct miqt_string* str) { - QString str_QString = QString::fromUtf8(&str->data, str->len); +struct miqt_array* QKeySequence_ListFromString(struct miqt_string str) { + QString str_QString = QString::fromUtf8(str.data, str.len); QList _ret = QKeySequence::listFromString(str_QString); // Convert QList<> from C++ memory to manually-managed C memory QKeySequence** _arr = static_cast(malloc(sizeof(QKeySequence*) * _ret.length())); @@ -79,7 +83,7 @@ struct miqt_array* QKeySequence_ListFromString(struct miqt_string* str) { return _out; } -struct miqt_string* QKeySequence_ListToString(struct miqt_array* /* of QKeySequence* */ list) { +struct miqt_string QKeySequence_ListToString(struct miqt_array* /* of QKeySequence* */ list) { QList list_QList; list_QList.reserve(list->len); QKeySequence** list_arr = static_cast(list->data); @@ -89,7 +93,11 @@ struct miqt_string* QKeySequence_ListToString(struct miqt_array* /* of QKeySeque QString _ret = QKeySequence::listToString(list_QList); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QKeySequence_Matches(const QKeySequence* self, QKeySequence* seq) { @@ -97,8 +105,8 @@ int QKeySequence_Matches(const QKeySequence* self, QKeySequence* seq) { return static_cast(_ret); } -QKeySequence* QKeySequence_Mnemonic(struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QKeySequence* QKeySequence_Mnemonic(struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QKeySequence(QKeySequence::mnemonic(text_QString)); } @@ -155,20 +163,24 @@ bool QKeySequence_IsDetached(const QKeySequence* self) { return self->isDetached(); } -struct miqt_string* QKeySequence_ToString1(const QKeySequence* self, int format) { +struct miqt_string QKeySequence_ToString1(const QKeySequence* self, int format) { QString _ret = self->toString(static_cast(format)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -QKeySequence* QKeySequence_FromString2(struct miqt_string* str, int format) { - QString str_QString = QString::fromUtf8(&str->data, str->len); +QKeySequence* QKeySequence_FromString2(struct miqt_string str, int format) { + QString str_QString = QString::fromUtf8(str.data, str.len); return new QKeySequence(QKeySequence::fromString(str_QString, static_cast(format))); } -struct miqt_array* QKeySequence_ListFromString2(struct miqt_string* str, int format) { - QString str_QString = QString::fromUtf8(&str->data, str->len); +struct miqt_array* QKeySequence_ListFromString2(struct miqt_string str, int format) { + QString str_QString = QString::fromUtf8(str.data, str.len); QList _ret = QKeySequence::listFromString(str_QString, static_cast(format)); // Convert QList<> from C++ memory to manually-managed C memory QKeySequence** _arr = static_cast(malloc(sizeof(QKeySequence*) * _ret.length())); @@ -181,7 +193,7 @@ struct miqt_array* QKeySequence_ListFromString2(struct miqt_string* str, int for return _out; } -struct miqt_string* QKeySequence_ListToString2(struct miqt_array* /* of QKeySequence* */ list, int format) { +struct miqt_string QKeySequence_ListToString2(struct miqt_array* /* of QKeySequence* */ list, int format) { QList list_QList; list_QList.reserve(list->len); QKeySequence** list_arr = static_cast(list->data); @@ -191,7 +203,11 @@ struct miqt_string* QKeySequence_ListToString2(struct miqt_array* /* of QKeySequ QString _ret = QKeySequence::listToString(list_QList, static_cast(format)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QKeySequence_Delete(QKeySequence* self) { diff --git a/qt/gen_qkeysequence.go b/qt/gen_qkeysequence.go index dcb2b3ed..07a8ad4b 100644 --- a/qt/gen_qkeysequence.go +++ b/qt/gen_qkeysequence.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -142,9 +141,11 @@ func NewQKeySequence() *QKeySequence { // NewQKeySequence2 constructs a new QKeySequence object. func NewQKeySequence2(key string) *QKeySequence { - key_ms := libmiqt.Strdupg(key) - defer C.free(key_ms) - ret := C.QKeySequence_new2((*C.struct_miqt_string)(key_ms)) + key_ms := C.struct_miqt_string{} + key_ms.data = C.CString(key) + key_ms.len = C.size_t(len(key)) + defer C.free(unsafe.Pointer(key_ms.data)) + ret := C.QKeySequence_new2(key_ms) return newQKeySequence(ret) } @@ -168,9 +169,11 @@ func NewQKeySequence5(key QKeySequence__StandardKey) *QKeySequence { // NewQKeySequence6 constructs a new QKeySequence object. func NewQKeySequence6(key string, format QKeySequence__SequenceFormat) *QKeySequence { - key_ms := libmiqt.Strdupg(key) - defer C.free(key_ms) - ret := C.QKeySequence_new6((*C.struct_miqt_string)(key_ms), (C.int)(format)) + key_ms := C.struct_miqt_string{} + key_ms.data = C.CString(key) + key_ms.len = C.size_t(len(key)) + defer C.free(unsafe.Pointer(key_ms.data)) + ret := C.QKeySequence_new6(key_ms, (C.int)(format)) return newQKeySequence(ret) } @@ -201,25 +204,29 @@ func (this *QKeySequence) IsEmpty() bool { } func (this *QKeySequence) ToString() string { - var _ms *C.struct_miqt_string = C.QKeySequence_ToString(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QKeySequence_ToString(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QKeySequence_FromString(str string) *QKeySequence { - str_ms := libmiqt.Strdupg(str) - defer C.free(str_ms) - _ret := C.QKeySequence_FromString((*C.struct_miqt_string)(str_ms)) + str_ms := C.struct_miqt_string{} + str_ms.data = C.CString(str) + str_ms.len = C.size_t(len(str)) + defer C.free(unsafe.Pointer(str_ms.data)) + _ret := C.QKeySequence_FromString(str_ms) _goptr := newQKeySequence(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func QKeySequence_ListFromString(str string) []QKeySequence { - str_ms := libmiqt.Strdupg(str) - defer C.free(str_ms) - var _ma *C.struct_miqt_array = C.QKeySequence_ListFromString((*C.struct_miqt_string)(str_ms)) + str_ms := C.struct_miqt_string{} + str_ms.data = C.CString(str) + str_ms.len = C.size_t(len(str)) + defer C.free(unsafe.Pointer(str_ms.data)) + var _ma *C.struct_miqt_array = C.QKeySequence_ListFromString(str_ms) _ret := make([]QKeySequence, int(_ma.len)) _outCast := (*[0xffff]*C.QKeySequence)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -241,9 +248,9 @@ func QKeySequence_ListToString(list []QKeySequence) string { } list_ma := &C.struct_miqt_array{len: C.size_t(len(list)), data: unsafe.Pointer(list_CArray)} defer runtime.KeepAlive(unsafe.Pointer(list_ma)) - var _ms *C.struct_miqt_string = C.QKeySequence_ListToString(list_ma) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QKeySequence_ListToString(list_ma) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -252,9 +259,11 @@ func (this *QKeySequence) Matches(seq *QKeySequence) QKeySequence__SequenceMatch } func QKeySequence_Mnemonic(text string) *QKeySequence { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - _ret := C.QKeySequence_Mnemonic((*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + _ret := C.QKeySequence_Mnemonic(text_ms) _goptr := newQKeySequence(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -315,25 +324,29 @@ func (this *QKeySequence) IsDetached() bool { } func (this *QKeySequence) ToString1(format QKeySequence__SequenceFormat) string { - var _ms *C.struct_miqt_string = C.QKeySequence_ToString1(this.h, (C.int)(format)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QKeySequence_ToString1(this.h, (C.int)(format)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QKeySequence_FromString2(str string, format QKeySequence__SequenceFormat) *QKeySequence { - str_ms := libmiqt.Strdupg(str) - defer C.free(str_ms) - _ret := C.QKeySequence_FromString2((*C.struct_miqt_string)(str_ms), (C.int)(format)) + str_ms := C.struct_miqt_string{} + str_ms.data = C.CString(str) + str_ms.len = C.size_t(len(str)) + defer C.free(unsafe.Pointer(str_ms.data)) + _ret := C.QKeySequence_FromString2(str_ms, (C.int)(format)) _goptr := newQKeySequence(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func QKeySequence_ListFromString2(str string, format QKeySequence__SequenceFormat) []QKeySequence { - str_ms := libmiqt.Strdupg(str) - defer C.free(str_ms) - var _ma *C.struct_miqt_array = C.QKeySequence_ListFromString2((*C.struct_miqt_string)(str_ms), (C.int)(format)) + str_ms := C.struct_miqt_string{} + str_ms.data = C.CString(str) + str_ms.len = C.size_t(len(str)) + defer C.free(unsafe.Pointer(str_ms.data)) + var _ma *C.struct_miqt_array = C.QKeySequence_ListFromString2(str_ms, (C.int)(format)) _ret := make([]QKeySequence, int(_ma.len)) _outCast := (*[0xffff]*C.QKeySequence)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -355,9 +368,9 @@ func QKeySequence_ListToString2(list []QKeySequence, format QKeySequence__Sequen } list_ma := &C.struct_miqt_array{len: C.size_t(len(list)), data: unsafe.Pointer(list_CArray)} defer runtime.KeepAlive(unsafe.Pointer(list_ma)) - var _ms *C.struct_miqt_string = C.QKeySequence_ListToString2(list_ma, (C.int)(format)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QKeySequence_ListToString2(list_ma, (C.int)(format)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qkeysequence.h b/qt/gen_qkeysequence.h index 188241e9..8f0a8739 100644 --- a/qt/gen_qkeysequence.h +++ b/qt/gen_qkeysequence.h @@ -20,22 +20,22 @@ typedef struct QKeySequence QKeySequence; #endif QKeySequence* QKeySequence_new(); -QKeySequence* QKeySequence_new2(struct miqt_string* key); +QKeySequence* QKeySequence_new2(struct miqt_string key); QKeySequence* QKeySequence_new3(int k1); QKeySequence* QKeySequence_new4(QKeySequence* ks); QKeySequence* QKeySequence_new5(int key); -QKeySequence* QKeySequence_new6(struct miqt_string* key, int format); +QKeySequence* QKeySequence_new6(struct miqt_string key, int format); QKeySequence* QKeySequence_new7(int k1, int k2); QKeySequence* QKeySequence_new8(int k1, int k2, int k3); QKeySequence* QKeySequence_new9(int k1, int k2, int k3, int k4); int QKeySequence_Count(const QKeySequence* self); bool QKeySequence_IsEmpty(const QKeySequence* self); -struct miqt_string* QKeySequence_ToString(const QKeySequence* self); -QKeySequence* QKeySequence_FromString(struct miqt_string* str); -struct miqt_array* QKeySequence_ListFromString(struct miqt_string* str); -struct miqt_string* QKeySequence_ListToString(struct miqt_array* /* of QKeySequence* */ list); +struct miqt_string QKeySequence_ToString(const QKeySequence* self); +QKeySequence* QKeySequence_FromString(struct miqt_string str); +struct miqt_array* QKeySequence_ListFromString(struct miqt_string str); +struct miqt_string QKeySequence_ListToString(struct miqt_array* /* of QKeySequence* */ list); int QKeySequence_Matches(const QKeySequence* self, QKeySequence* seq); -QKeySequence* QKeySequence_Mnemonic(struct miqt_string* text); +QKeySequence* QKeySequence_Mnemonic(struct miqt_string text); struct miqt_array* QKeySequence_KeyBindings(int key); int QKeySequence_OperatorSubscript(const QKeySequence* self, unsigned int i); void QKeySequence_OperatorAssign(QKeySequence* self, QKeySequence* other); @@ -47,10 +47,10 @@ bool QKeySequence_OperatorGreater(const QKeySequence* self, QKeySequence* other) bool QKeySequence_OperatorLesserOrEqual(const QKeySequence* self, QKeySequence* other); bool QKeySequence_OperatorGreaterOrEqual(const QKeySequence* self, QKeySequence* other); bool QKeySequence_IsDetached(const QKeySequence* self); -struct miqt_string* QKeySequence_ToString1(const QKeySequence* self, int format); -QKeySequence* QKeySequence_FromString2(struct miqt_string* str, int format); -struct miqt_array* QKeySequence_ListFromString2(struct miqt_string* str, int format); -struct miqt_string* QKeySequence_ListToString2(struct miqt_array* /* of QKeySequence* */ list, int format); +struct miqt_string QKeySequence_ToString1(const QKeySequence* self, int format); +QKeySequence* QKeySequence_FromString2(struct miqt_string str, int format); +struct miqt_array* QKeySequence_ListFromString2(struct miqt_string str, int format); +struct miqt_string QKeySequence_ListToString2(struct miqt_array* /* of QKeySequence* */ list, int format); void QKeySequence_Delete(QKeySequence* self); #ifdef __cplusplus diff --git a/qt/gen_qkeysequenceedit.cpp b/qt/gen_qkeysequenceedit.cpp index d598260e..6e220596 100644 --- a/qt/gen_qkeysequenceedit.cpp +++ b/qt/gen_qkeysequenceedit.cpp @@ -33,18 +33,26 @@ void* QKeySequenceEdit_Metacast(QKeySequenceEdit* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QKeySequenceEdit_Tr(const char* s) { +struct miqt_string QKeySequenceEdit_Tr(const char* s) { QString _ret = QKeySequenceEdit::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QKeySequenceEdit_TrUtf8(const char* s) { +struct miqt_string QKeySequenceEdit_TrUtf8(const char* s) { QString _ret = QKeySequenceEdit::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QKeySequence* QKeySequenceEdit_KeySequence(const QKeySequenceEdit* self) { @@ -82,32 +90,48 @@ void QKeySequenceEdit_connect_KeySequenceChanged(QKeySequenceEdit* self, intptr_ }); } -struct miqt_string* QKeySequenceEdit_Tr2(const char* s, const char* c) { +struct miqt_string QKeySequenceEdit_Tr2(const char* s, const char* c) { QString _ret = QKeySequenceEdit::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QKeySequenceEdit_Tr3(const char* s, const char* c, int n) { +struct miqt_string QKeySequenceEdit_Tr3(const char* s, const char* c, int n) { QString _ret = QKeySequenceEdit::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QKeySequenceEdit_TrUtf82(const char* s, const char* c) { +struct miqt_string QKeySequenceEdit_TrUtf82(const char* s, const char* c) { QString _ret = QKeySequenceEdit::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QKeySequenceEdit_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QKeySequenceEdit_TrUtf83(const char* s, const char* c, int n) { QString _ret = QKeySequenceEdit::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QKeySequenceEdit_Delete(QKeySequenceEdit* self) { diff --git a/qt/gen_qkeysequenceedit.go b/qt/gen_qkeysequenceedit.go index 5e122d5c..3431dfb9 100644 --- a/qt/gen_qkeysequenceedit.go +++ b/qt/gen_qkeysequenceedit.go @@ -75,24 +75,24 @@ func (this *QKeySequenceEdit) MetaObject() *QMetaObject { func (this *QKeySequenceEdit) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QKeySequenceEdit_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QKeySequenceEdit_Metacast(this.h, param1_Cstring)) } func QKeySequenceEdit_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QKeySequenceEdit_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QKeySequenceEdit_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QKeySequenceEdit_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QKeySequenceEdit_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QKeySequenceEdit_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -153,9 +153,9 @@ func QKeySequenceEdit_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QKeySequenceEdit_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QKeySequenceEdit_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -164,9 +164,9 @@ func QKeySequenceEdit_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QKeySequenceEdit_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QKeySequenceEdit_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -175,9 +175,9 @@ func QKeySequenceEdit_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QKeySequenceEdit_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QKeySequenceEdit_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -186,9 +186,9 @@ func QKeySequenceEdit_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QKeySequenceEdit_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QKeySequenceEdit_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qkeysequenceedit.h b/qt/gen_qkeysequenceedit.h index 431b0e95..0b0d7587 100644 --- a/qt/gen_qkeysequenceedit.h +++ b/qt/gen_qkeysequenceedit.h @@ -31,8 +31,8 @@ QKeySequenceEdit* QKeySequenceEdit_new3(QWidget* parent); QKeySequenceEdit* QKeySequenceEdit_new4(QKeySequence* keySequence, QWidget* parent); QMetaObject* QKeySequenceEdit_MetaObject(const QKeySequenceEdit* self); void* QKeySequenceEdit_Metacast(QKeySequenceEdit* self, const char* param1); -struct miqt_string* QKeySequenceEdit_Tr(const char* s); -struct miqt_string* QKeySequenceEdit_TrUtf8(const char* s); +struct miqt_string QKeySequenceEdit_Tr(const char* s); +struct miqt_string QKeySequenceEdit_TrUtf8(const char* s); QKeySequence* QKeySequenceEdit_KeySequence(const QKeySequenceEdit* self); void QKeySequenceEdit_SetKeySequence(QKeySequenceEdit* self, QKeySequence* keySequence); void QKeySequenceEdit_Clear(QKeySequenceEdit* self); @@ -40,10 +40,10 @@ void QKeySequenceEdit_EditingFinished(QKeySequenceEdit* self); void QKeySequenceEdit_connect_EditingFinished(QKeySequenceEdit* self, intptr_t slot); void QKeySequenceEdit_KeySequenceChanged(QKeySequenceEdit* self, QKeySequence* keySequence); void QKeySequenceEdit_connect_KeySequenceChanged(QKeySequenceEdit* self, intptr_t slot); -struct miqt_string* QKeySequenceEdit_Tr2(const char* s, const char* c); -struct miqt_string* QKeySequenceEdit_Tr3(const char* s, const char* c, int n); -struct miqt_string* QKeySequenceEdit_TrUtf82(const char* s, const char* c); -struct miqt_string* QKeySequenceEdit_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QKeySequenceEdit_Tr2(const char* s, const char* c); +struct miqt_string QKeySequenceEdit_Tr3(const char* s, const char* c, int n); +struct miqt_string QKeySequenceEdit_TrUtf82(const char* s, const char* c); +struct miqt_string QKeySequenceEdit_TrUtf83(const char* s, const char* c, int n); void QKeySequenceEdit_Delete(QKeySequenceEdit* self); #ifdef __cplusplus diff --git a/qt/gen_qlabel.cpp b/qt/gen_qlabel.cpp index e5a189b4..ddb23ed4 100644 --- a/qt/gen_qlabel.cpp +++ b/qt/gen_qlabel.cpp @@ -16,8 +16,8 @@ QLabel* QLabel_new() { return new QLabel(); } -QLabel* QLabel_new2(struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QLabel* QLabel_new2(struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QLabel(text_QString); } @@ -29,13 +29,13 @@ QLabel* QLabel_new4(QWidget* parent, int f) { return new QLabel(parent, static_cast(f)); } -QLabel* QLabel_new5(struct miqt_string* text, QWidget* parent) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QLabel* QLabel_new5(struct miqt_string text, QWidget* parent) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QLabel(text_QString, parent); } -QLabel* QLabel_new6(struct miqt_string* text, QWidget* parent, int f) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QLabel* QLabel_new6(struct miqt_string text, QWidget* parent, int f) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QLabel(text_QString, parent, static_cast(f)); } @@ -47,25 +47,37 @@ void* QLabel_Metacast(QLabel* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QLabel_Tr(const char* s) { +struct miqt_string QLabel_Tr(const char* s) { QString _ret = QLabel::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLabel_TrUtf8(const char* s) { +struct miqt_string QLabel_TrUtf8(const char* s) { QString _ret = QLabel::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLabel_Text(const QLabel* self) { +struct miqt_string QLabel_Text(const QLabel* self) { QString _ret = self->text(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QPixmap* QLabel_Pixmap(const QLabel* self) { @@ -183,19 +195,23 @@ bool QLabel_HasSelectedText(const QLabel* self) { return self->hasSelectedText(); } -struct miqt_string* QLabel_SelectedText(const QLabel* self) { +struct miqt_string QLabel_SelectedText(const QLabel* self) { QString _ret = self->selectedText(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QLabel_SelectionStart(const QLabel* self) { return self->selectionStart(); } -void QLabel_SetText(QLabel* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QLabel_SetText(QLabel* self, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->setText(text_QString); } @@ -223,8 +239,8 @@ void QLabel_Clear(QLabel* self) { self->clear(); } -void QLabel_LinkActivated(QLabel* self, struct miqt_string* link) { - QString link_QString = QString::fromUtf8(&link->data, link->len); +void QLabel_LinkActivated(QLabel* self, struct miqt_string link) { + QString link_QString = QString::fromUtf8(link.data, link.len); self->linkActivated(link_QString); } @@ -233,13 +249,17 @@ void QLabel_connect_LinkActivated(QLabel* self, intptr_t slot) { const QString link_ret = link; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray link_b = link_ret.toUtf8(); - struct miqt_string* sigval1 = miqt_strdup(link_b.data(), link_b.length()); + struct miqt_string link_ms; + link_ms.len = link_b.length(); + link_ms.data = static_cast(malloc(link_ms.len)); + memcpy(link_ms.data, link_b.data(), link_ms.len); + struct miqt_string sigval1 = link_ms; miqt_exec_callback_QLabel_LinkActivated(slot, sigval1); }); } -void QLabel_LinkHovered(QLabel* self, struct miqt_string* link) { - QString link_QString = QString::fromUtf8(&link->data, link->len); +void QLabel_LinkHovered(QLabel* self, struct miqt_string link) { + QString link_QString = QString::fromUtf8(link.data, link.len); self->linkHovered(link_QString); } @@ -248,37 +268,57 @@ void QLabel_connect_LinkHovered(QLabel* self, intptr_t slot) { const QString link_ret = link; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray link_b = link_ret.toUtf8(); - struct miqt_string* sigval1 = miqt_strdup(link_b.data(), link_b.length()); + struct miqt_string link_ms; + link_ms.len = link_b.length(); + link_ms.data = static_cast(malloc(link_ms.len)); + memcpy(link_ms.data, link_b.data(), link_ms.len); + struct miqt_string sigval1 = link_ms; miqt_exec_callback_QLabel_LinkHovered(slot, sigval1); }); } -struct miqt_string* QLabel_Tr2(const char* s, const char* c) { +struct miqt_string QLabel_Tr2(const char* s, const char* c) { QString _ret = QLabel::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLabel_Tr3(const char* s, const char* c, int n) { +struct miqt_string QLabel_Tr3(const char* s, const char* c, int n) { QString _ret = QLabel::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLabel_TrUtf82(const char* s, const char* c) { +struct miqt_string QLabel_TrUtf82(const char* s, const char* c) { QString _ret = QLabel::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLabel_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QLabel_TrUtf83(const char* s, const char* c, int n) { QString _ret = QLabel::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QLabel_Delete(QLabel* self) { diff --git a/qt/gen_qlabel.go b/qt/gen_qlabel.go index 1c30e753..5fff058c 100644 --- a/qt/gen_qlabel.go +++ b/qt/gen_qlabel.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "runtime/cgo" "unsafe" @@ -53,9 +52,11 @@ func NewQLabel() *QLabel { // NewQLabel2 constructs a new QLabel object. func NewQLabel2(text string) *QLabel { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - ret := C.QLabel_new2((*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + ret := C.QLabel_new2(text_ms) return newQLabel(ret) } @@ -73,17 +74,21 @@ func NewQLabel4(parent *QWidget, f WindowType) *QLabel { // NewQLabel5 constructs a new QLabel object. func NewQLabel5(text string, parent *QWidget) *QLabel { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - ret := C.QLabel_new5((*C.struct_miqt_string)(text_ms), parent.cPointer()) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + ret := C.QLabel_new5(text_ms, parent.cPointer()) return newQLabel(ret) } // NewQLabel6 constructs a new QLabel object. func NewQLabel6(text string, parent *QWidget, f WindowType) *QLabel { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - ret := C.QLabel_new6((*C.struct_miqt_string)(text_ms), parent.cPointer(), (C.int)(f)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + ret := C.QLabel_new6(text_ms, parent.cPointer(), (C.int)(f)) return newQLabel(ret) } @@ -94,31 +99,31 @@ func (this *QLabel) MetaObject() *QMetaObject { func (this *QLabel) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QLabel_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QLabel_Metacast(this.h, param1_Cstring)) } func QLabel_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QLabel_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLabel_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QLabel_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QLabel_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLabel_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLabel) Text() string { - var _ms *C.struct_miqt_string = C.QLabel_Text(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLabel_Text(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -247,9 +252,9 @@ func (this *QLabel) HasSelectedText() bool { } func (this *QLabel) SelectedText() string { - var _ms *C.struct_miqt_string = C.QLabel_SelectedText(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLabel_SelectedText(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -258,9 +263,11 @@ func (this *QLabel) SelectionStart() int { } func (this *QLabel) SetText(text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QLabel_SetText(this.h, (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QLabel_SetText(this.h, text_ms) } func (this *QLabel) SetPixmap(pixmap *QPixmap) { @@ -288,50 +295,54 @@ func (this *QLabel) Clear() { } func (this *QLabel) LinkActivated(link string) { - link_ms := libmiqt.Strdupg(link) - defer C.free(link_ms) - C.QLabel_LinkActivated(this.h, (*C.struct_miqt_string)(link_ms)) + link_ms := C.struct_miqt_string{} + link_ms.data = C.CString(link) + link_ms.len = C.size_t(len(link)) + defer C.free(unsafe.Pointer(link_ms.data)) + C.QLabel_LinkActivated(this.h, link_ms) } func (this *QLabel) OnLinkActivated(slot func(link string)) { C.QLabel_connect_LinkActivated(this.h, C.intptr_t(cgo.NewHandle(slot))) } //export miqt_exec_callback_QLabel_LinkActivated -func miqt_exec_callback_QLabel_LinkActivated(cb C.intptr_t, link *C.struct_miqt_string) { +func miqt_exec_callback_QLabel_LinkActivated(cb C.intptr_t, link C.struct_miqt_string) { gofunc, ok := cgo.Handle(cb).Value().(func(link string)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") } // Convert all CABI parameters to Go parameters - var link_ms *C.struct_miqt_string = link - link_ret := C.GoStringN(&link_ms.data, C.int(int64(link_ms.len))) - C.free(unsafe.Pointer(link_ms)) + var link_ms C.struct_miqt_string = link + link_ret := C.GoStringN(link_ms.data, C.int(int64(link_ms.len))) + C.free(unsafe.Pointer(link_ms.data)) slotval1 := link_ret gofunc(slotval1) } func (this *QLabel) LinkHovered(link string) { - link_ms := libmiqt.Strdupg(link) - defer C.free(link_ms) - C.QLabel_LinkHovered(this.h, (*C.struct_miqt_string)(link_ms)) + link_ms := C.struct_miqt_string{} + link_ms.data = C.CString(link) + link_ms.len = C.size_t(len(link)) + defer C.free(unsafe.Pointer(link_ms.data)) + C.QLabel_LinkHovered(this.h, link_ms) } func (this *QLabel) OnLinkHovered(slot func(link string)) { C.QLabel_connect_LinkHovered(this.h, C.intptr_t(cgo.NewHandle(slot))) } //export miqt_exec_callback_QLabel_LinkHovered -func miqt_exec_callback_QLabel_LinkHovered(cb C.intptr_t, link *C.struct_miqt_string) { +func miqt_exec_callback_QLabel_LinkHovered(cb C.intptr_t, link C.struct_miqt_string) { gofunc, ok := cgo.Handle(cb).Value().(func(link string)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") } // Convert all CABI parameters to Go parameters - var link_ms *C.struct_miqt_string = link - link_ret := C.GoStringN(&link_ms.data, C.int(int64(link_ms.len))) - C.free(unsafe.Pointer(link_ms)) + var link_ms C.struct_miqt_string = link + link_ret := C.GoStringN(link_ms.data, C.int(int64(link_ms.len))) + C.free(unsafe.Pointer(link_ms.data)) slotval1 := link_ret gofunc(slotval1) @@ -342,9 +353,9 @@ func QLabel_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QLabel_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLabel_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -353,9 +364,9 @@ func QLabel_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QLabel_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLabel_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -364,9 +375,9 @@ func QLabel_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QLabel_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLabel_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -375,9 +386,9 @@ func QLabel_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QLabel_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLabel_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qlabel.h b/qt/gen_qlabel.h index b9a23259..fd9cbac4 100644 --- a/qt/gen_qlabel.h +++ b/qt/gen_qlabel.h @@ -32,16 +32,16 @@ typedef struct QWidget QWidget; #endif QLabel* QLabel_new(); -QLabel* QLabel_new2(struct miqt_string* text); +QLabel* QLabel_new2(struct miqt_string text); QLabel* QLabel_new3(QWidget* parent); QLabel* QLabel_new4(QWidget* parent, int f); -QLabel* QLabel_new5(struct miqt_string* text, QWidget* parent); -QLabel* QLabel_new6(struct miqt_string* text, QWidget* parent, int f); +QLabel* QLabel_new5(struct miqt_string text, QWidget* parent); +QLabel* QLabel_new6(struct miqt_string text, QWidget* parent, int f); QMetaObject* QLabel_MetaObject(const QLabel* self); void* QLabel_Metacast(QLabel* self, const char* param1); -struct miqt_string* QLabel_Tr(const char* s); -struct miqt_string* QLabel_TrUtf8(const char* s); -struct miqt_string* QLabel_Text(const QLabel* self); +struct miqt_string QLabel_Tr(const char* s); +struct miqt_string QLabel_TrUtf8(const char* s); +struct miqt_string QLabel_Text(const QLabel* self); QPixmap* QLabel_Pixmap(const QLabel* self); QPixmap* QLabel_PixmapWithQtReturnByValueConstant(const QLabel* self, int param1); QPicture* QLabel_Picture(const QLabel* self); @@ -70,23 +70,23 @@ void QLabel_SetTextInteractionFlags(QLabel* self, int flags); int QLabel_TextInteractionFlags(const QLabel* self); void QLabel_SetSelection(QLabel* self, int param1, int param2); bool QLabel_HasSelectedText(const QLabel* self); -struct miqt_string* QLabel_SelectedText(const QLabel* self); +struct miqt_string QLabel_SelectedText(const QLabel* self); int QLabel_SelectionStart(const QLabel* self); -void QLabel_SetText(QLabel* self, struct miqt_string* text); +void QLabel_SetText(QLabel* self, struct miqt_string text); void QLabel_SetPixmap(QLabel* self, QPixmap* pixmap); void QLabel_SetPicture(QLabel* self, QPicture* picture); void QLabel_SetMovie(QLabel* self, QMovie* movie); void QLabel_SetNum(QLabel* self, int num); void QLabel_SetNumWithNum(QLabel* self, double num); void QLabel_Clear(QLabel* self); -void QLabel_LinkActivated(QLabel* self, struct miqt_string* link); +void QLabel_LinkActivated(QLabel* self, struct miqt_string link); void QLabel_connect_LinkActivated(QLabel* self, intptr_t slot); -void QLabel_LinkHovered(QLabel* self, struct miqt_string* link); +void QLabel_LinkHovered(QLabel* self, struct miqt_string link); void QLabel_connect_LinkHovered(QLabel* self, intptr_t slot); -struct miqt_string* QLabel_Tr2(const char* s, const char* c); -struct miqt_string* QLabel_Tr3(const char* s, const char* c, int n); -struct miqt_string* QLabel_TrUtf82(const char* s, const char* c); -struct miqt_string* QLabel_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QLabel_Tr2(const char* s, const char* c); +struct miqt_string QLabel_Tr3(const char* s, const char* c, int n); +struct miqt_string QLabel_TrUtf82(const char* s, const char* c); +struct miqt_string QLabel_TrUtf83(const char* s, const char* c, int n); void QLabel_Delete(QLabel* self); #ifdef __cplusplus diff --git a/qt/gen_qlayout.cpp b/qt/gen_qlayout.cpp index 9800627c..7ae86adc 100644 --- a/qt/gen_qlayout.cpp +++ b/qt/gen_qlayout.cpp @@ -20,18 +20,26 @@ void* QLayout_Metacast(QLayout* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QLayout_Tr(const char* s) { +struct miqt_string QLayout_Tr(const char* s) { QString _ret = QLayout::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLayout_TrUtf8(const char* s) { +struct miqt_string QLayout_TrUtf8(const char* s) { QString _ret = QLayout::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QLayout_Margin(const QLayout* self) { @@ -213,32 +221,48 @@ QSize* QLayout_ClosestAcceptableSize(QWidget* w, QSize* s) { return new QSize(QLayout::closestAcceptableSize(w, *s)); } -struct miqt_string* QLayout_Tr2(const char* s, const char* c) { +struct miqt_string QLayout_Tr2(const char* s, const char* c) { QString _ret = QLayout::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLayout_Tr3(const char* s, const char* c, int n) { +struct miqt_string QLayout_Tr3(const char* s, const char* c, int n) { QString _ret = QLayout::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLayout_TrUtf82(const char* s, const char* c) { +struct miqt_string QLayout_TrUtf82(const char* s, const char* c) { QString _ret = QLayout::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLayout_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QLayout_TrUtf83(const char* s, const char* c, int n) { QString _ret = QLayout::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QLayoutItem* QLayout_ReplaceWidget3(QLayout* self, QWidget* from, QWidget* to, int options) { diff --git a/qt/gen_qlayout.go b/qt/gen_qlayout.go index f7360c82..0b0f9a62 100644 --- a/qt/gen_qlayout.go +++ b/qt/gen_qlayout.go @@ -62,24 +62,24 @@ func (this *QLayout) MetaObject() *QMetaObject { func (this *QLayout) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QLayout_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QLayout_Metacast(this.h, param1_Cstring)) } func QLayout_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QLayout_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLayout_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QLayout_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QLayout_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLayout_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -291,9 +291,9 @@ func QLayout_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QLayout_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLayout_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -302,9 +302,9 @@ func QLayout_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QLayout_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLayout_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -313,9 +313,9 @@ func QLayout_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QLayout_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLayout_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -324,9 +324,9 @@ func QLayout_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QLayout_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLayout_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qlayout.h b/qt/gen_qlayout.h index dcc13213..5df81243 100644 --- a/qt/gen_qlayout.h +++ b/qt/gen_qlayout.h @@ -33,8 +33,8 @@ typedef struct QWidget QWidget; QMetaObject* QLayout_MetaObject(const QLayout* self); void* QLayout_Metacast(QLayout* self, const char* param1); -struct miqt_string* QLayout_Tr(const char* s); -struct miqt_string* QLayout_TrUtf8(const char* s); +struct miqt_string QLayout_Tr(const char* s); +struct miqt_string QLayout_TrUtf8(const char* s); int QLayout_Margin(const QLayout* self); void QLayout_SetMargin(QLayout* self, int margin); int QLayout_Spacing(const QLayout* self); @@ -79,10 +79,10 @@ QLayout* QLayout_Layout(QLayout* self); void QLayout_SetEnabled(QLayout* self, bool enabled); bool QLayout_IsEnabled(const QLayout* self); QSize* QLayout_ClosestAcceptableSize(QWidget* w, QSize* s); -struct miqt_string* QLayout_Tr2(const char* s, const char* c); -struct miqt_string* QLayout_Tr3(const char* s, const char* c, int n); -struct miqt_string* QLayout_TrUtf82(const char* s, const char* c); -struct miqt_string* QLayout_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QLayout_Tr2(const char* s, const char* c); +struct miqt_string QLayout_Tr3(const char* s, const char* c, int n); +struct miqt_string QLayout_TrUtf82(const char* s, const char* c); +struct miqt_string QLayout_TrUtf83(const char* s, const char* c, int n); QLayoutItem* QLayout_ReplaceWidget3(QLayout* self, QWidget* from, QWidget* to, int options); void QLayout_Delete(QLayout* self); diff --git a/qt/gen_qlcdnumber.cpp b/qt/gen_qlcdnumber.cpp index 31170966..89931071 100644 --- a/qt/gen_qlcdnumber.cpp +++ b/qt/gen_qlcdnumber.cpp @@ -33,18 +33,26 @@ void* QLCDNumber_Metacast(QLCDNumber* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QLCDNumber_Tr(const char* s) { +struct miqt_string QLCDNumber_Tr(const char* s) { QString _ret = QLCDNumber::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLCDNumber_TrUtf8(const char* s) { +struct miqt_string QLCDNumber_TrUtf8(const char* s) { QString _ret = QLCDNumber::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } bool QLCDNumber_SmallDecimalPoint(const QLCDNumber* self) { @@ -97,8 +105,8 @@ QSize* QLCDNumber_SizeHint(const QLCDNumber* self) { return new QSize(self->sizeHint()); } -void QLCDNumber_Display(QLCDNumber* self, struct miqt_string* str) { - QString str_QString = QString::fromUtf8(&str->data, str->len); +void QLCDNumber_Display(QLCDNumber* self, struct miqt_string str) { + QString str_QString = QString::fromUtf8(str.data, str.len); self->display(str_QString); } @@ -140,32 +148,48 @@ void QLCDNumber_connect_Overflow(QLCDNumber* self, intptr_t slot) { }); } -struct miqt_string* QLCDNumber_Tr2(const char* s, const char* c) { +struct miqt_string QLCDNumber_Tr2(const char* s, const char* c) { QString _ret = QLCDNumber::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLCDNumber_Tr3(const char* s, const char* c, int n) { +struct miqt_string QLCDNumber_Tr3(const char* s, const char* c, int n) { QString _ret = QLCDNumber::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLCDNumber_TrUtf82(const char* s, const char* c) { +struct miqt_string QLCDNumber_TrUtf82(const char* s, const char* c) { QString _ret = QLCDNumber::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLCDNumber_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QLCDNumber_TrUtf83(const char* s, const char* c, int n) { QString _ret = QLCDNumber::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QLCDNumber_Delete(QLCDNumber* self) { diff --git a/qt/gen_qlcdnumber.go b/qt/gen_qlcdnumber.go index 984bf742..6f3f4060 100644 --- a/qt/gen_qlcdnumber.go +++ b/qt/gen_qlcdnumber.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "runtime/cgo" "unsafe" @@ -93,24 +92,24 @@ func (this *QLCDNumber) MetaObject() *QMetaObject { func (this *QLCDNumber) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QLCDNumber_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QLCDNumber_Metacast(this.h, param1_Cstring)) } func QLCDNumber_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QLCDNumber_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLCDNumber_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QLCDNumber_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QLCDNumber_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLCDNumber_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -166,9 +165,11 @@ func (this *QLCDNumber) SizeHint() *QSize { } func (this *QLCDNumber) Display(str string) { - str_ms := libmiqt.Strdupg(str) - defer C.free(str_ms) - C.QLCDNumber_Display(this.h, (*C.struct_miqt_string)(str_ms)) + str_ms := C.struct_miqt_string{} + str_ms.data = C.CString(str) + str_ms.len = C.size_t(len(str)) + defer C.free(unsafe.Pointer(str_ms.data)) + C.QLCDNumber_Display(this.h, str_ms) } func (this *QLCDNumber) DisplayWithNum(num int) { @@ -221,9 +222,9 @@ func QLCDNumber_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QLCDNumber_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLCDNumber_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -232,9 +233,9 @@ func QLCDNumber_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QLCDNumber_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLCDNumber_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -243,9 +244,9 @@ func QLCDNumber_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QLCDNumber_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLCDNumber_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -254,9 +255,9 @@ func QLCDNumber_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QLCDNumber_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLCDNumber_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qlcdnumber.h b/qt/gen_qlcdnumber.h index e763259b..d3f966c6 100644 --- a/qt/gen_qlcdnumber.h +++ b/qt/gen_qlcdnumber.h @@ -31,8 +31,8 @@ QLCDNumber* QLCDNumber_new3(QWidget* parent); QLCDNumber* QLCDNumber_new4(unsigned int numDigits, QWidget* parent); QMetaObject* QLCDNumber_MetaObject(const QLCDNumber* self); void* QLCDNumber_Metacast(QLCDNumber* self, const char* param1); -struct miqt_string* QLCDNumber_Tr(const char* s); -struct miqt_string* QLCDNumber_TrUtf8(const char* s); +struct miqt_string QLCDNumber_Tr(const char* s); +struct miqt_string QLCDNumber_TrUtf8(const char* s); bool QLCDNumber_SmallDecimalPoint(const QLCDNumber* self); int QLCDNumber_DigitCount(const QLCDNumber* self); void QLCDNumber_SetDigitCount(QLCDNumber* self, int nDigits); @@ -45,7 +45,7 @@ void QLCDNumber_SetSegmentStyle(QLCDNumber* self, int segmentStyle); double QLCDNumber_Value(const QLCDNumber* self); int QLCDNumber_IntValue(const QLCDNumber* self); QSize* QLCDNumber_SizeHint(const QLCDNumber* self); -void QLCDNumber_Display(QLCDNumber* self, struct miqt_string* str); +void QLCDNumber_Display(QLCDNumber* self, struct miqt_string str); void QLCDNumber_DisplayWithNum(QLCDNumber* self, int num); void QLCDNumber_Display2(QLCDNumber* self, double num); void QLCDNumber_SetHexMode(QLCDNumber* self); @@ -55,10 +55,10 @@ void QLCDNumber_SetBinMode(QLCDNumber* self); void QLCDNumber_SetSmallDecimalPoint(QLCDNumber* self, bool smallDecimalPoint); void QLCDNumber_Overflow(QLCDNumber* self); void QLCDNumber_connect_Overflow(QLCDNumber* self, intptr_t slot); -struct miqt_string* QLCDNumber_Tr2(const char* s, const char* c); -struct miqt_string* QLCDNumber_Tr3(const char* s, const char* c, int n); -struct miqt_string* QLCDNumber_TrUtf82(const char* s, const char* c); -struct miqt_string* QLCDNumber_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QLCDNumber_Tr2(const char* s, const char* c); +struct miqt_string QLCDNumber_Tr3(const char* s, const char* c, int n); +struct miqt_string QLCDNumber_TrUtf82(const char* s, const char* c); +struct miqt_string QLCDNumber_TrUtf83(const char* s, const char* c, int n); void QLCDNumber_Delete(QLCDNumber* self); #ifdef __cplusplus diff --git a/qt/gen_qlibrary.cpp b/qt/gen_qlibrary.cpp index 86b3a685..82e336e3 100644 --- a/qt/gen_qlibrary.cpp +++ b/qt/gen_qlibrary.cpp @@ -12,19 +12,19 @@ QLibrary* QLibrary_new() { return new QLibrary(); } -QLibrary* QLibrary_new2(struct miqt_string* fileName) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +QLibrary* QLibrary_new2(struct miqt_string fileName) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); return new QLibrary(fileName_QString); } -QLibrary* QLibrary_new3(struct miqt_string* fileName, int verNum) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +QLibrary* QLibrary_new3(struct miqt_string fileName, int verNum) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); return new QLibrary(fileName_QString, static_cast(verNum)); } -QLibrary* QLibrary_new4(struct miqt_string* fileName, struct miqt_string* version) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); - QString version_QString = QString::fromUtf8(&version->data, version->len); +QLibrary* QLibrary_new4(struct miqt_string fileName, struct miqt_string version) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); + QString version_QString = QString::fromUtf8(version.data, version.len); return new QLibrary(fileName_QString, version_QString); } @@ -32,19 +32,19 @@ QLibrary* QLibrary_new5(QObject* parent) { return new QLibrary(parent); } -QLibrary* QLibrary_new6(struct miqt_string* fileName, QObject* parent) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +QLibrary* QLibrary_new6(struct miqt_string fileName, QObject* parent) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); return new QLibrary(fileName_QString, parent); } -QLibrary* QLibrary_new7(struct miqt_string* fileName, int verNum, QObject* parent) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +QLibrary* QLibrary_new7(struct miqt_string fileName, int verNum, QObject* parent) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); return new QLibrary(fileName_QString, static_cast(verNum), parent); } -QLibrary* QLibrary_new8(struct miqt_string* fileName, struct miqt_string* version, QObject* parent) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); - QString version_QString = QString::fromUtf8(&version->data, version->len); +QLibrary* QLibrary_new8(struct miqt_string fileName, struct miqt_string version, QObject* parent) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); + QString version_QString = QString::fromUtf8(version.data, version.len); return new QLibrary(fileName_QString, version_QString, parent); } @@ -56,18 +56,26 @@ void* QLibrary_Metacast(QLibrary* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QLibrary_Tr(const char* s) { +struct miqt_string QLibrary_Tr(const char* s) { QString _ret = QLibrary::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLibrary_TrUtf8(const char* s) { +struct miqt_string QLibrary_TrUtf8(const char* s) { QString _ret = QLibrary::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } bool QLibrary_Load(QLibrary* self) { @@ -82,39 +90,47 @@ bool QLibrary_IsLoaded(const QLibrary* self) { return self->isLoaded(); } -bool QLibrary_IsLibrary(struct miqt_string* fileName) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +bool QLibrary_IsLibrary(struct miqt_string fileName) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); return QLibrary::isLibrary(fileName_QString); } -void QLibrary_SetFileName(QLibrary* self, struct miqt_string* fileName) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +void QLibrary_SetFileName(QLibrary* self, struct miqt_string fileName) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); self->setFileName(fileName_QString); } -struct miqt_string* QLibrary_FileName(const QLibrary* self) { +struct miqt_string QLibrary_FileName(const QLibrary* self) { QString _ret = self->fileName(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QLibrary_SetFileNameAndVersion(QLibrary* self, struct miqt_string* fileName, int verNum) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +void QLibrary_SetFileNameAndVersion(QLibrary* self, struct miqt_string fileName, int verNum) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); self->setFileNameAndVersion(fileName_QString, static_cast(verNum)); } -void QLibrary_SetFileNameAndVersion2(QLibrary* self, struct miqt_string* fileName, struct miqt_string* version) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); - QString version_QString = QString::fromUtf8(&version->data, version->len); +void QLibrary_SetFileNameAndVersion2(QLibrary* self, struct miqt_string fileName, struct miqt_string version) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); + QString version_QString = QString::fromUtf8(version.data, version.len); self->setFileNameAndVersion(fileName_QString, version_QString); } -struct miqt_string* QLibrary_ErrorString(const QLibrary* self) { +struct miqt_string QLibrary_ErrorString(const QLibrary* self) { QString _ret = self->errorString(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QLibrary_SetLoadHints(QLibrary* self, int hints) { @@ -126,32 +142,48 @@ int QLibrary_LoadHints(const QLibrary* self) { return static_cast(_ret); } -struct miqt_string* QLibrary_Tr2(const char* s, const char* c) { +struct miqt_string QLibrary_Tr2(const char* s, const char* c) { QString _ret = QLibrary::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLibrary_Tr3(const char* s, const char* c, int n) { +struct miqt_string QLibrary_Tr3(const char* s, const char* c, int n) { QString _ret = QLibrary::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLibrary_TrUtf82(const char* s, const char* c) { +struct miqt_string QLibrary_TrUtf82(const char* s, const char* c) { QString _ret = QLibrary::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLibrary_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QLibrary_TrUtf83(const char* s, const char* c, int n) { QString _ret = QLibrary::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QLibrary_Delete(QLibrary* self) { diff --git a/qt/gen_qlibrary.go b/qt/gen_qlibrary.go index 1c36170a..7efd4f5a 100644 --- a/qt/gen_qlibrary.go +++ b/qt/gen_qlibrary.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -62,27 +61,35 @@ func NewQLibrary() *QLibrary { // NewQLibrary2 constructs a new QLibrary object. func NewQLibrary2(fileName string) *QLibrary { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - ret := C.QLibrary_new2((*C.struct_miqt_string)(fileName_ms)) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + ret := C.QLibrary_new2(fileName_ms) return newQLibrary(ret) } // NewQLibrary3 constructs a new QLibrary object. func NewQLibrary3(fileName string, verNum int) *QLibrary { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - ret := C.QLibrary_new3((*C.struct_miqt_string)(fileName_ms), (C.int)(verNum)) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + ret := C.QLibrary_new3(fileName_ms, (C.int)(verNum)) return newQLibrary(ret) } // NewQLibrary4 constructs a new QLibrary object. func NewQLibrary4(fileName string, version string) *QLibrary { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - version_ms := libmiqt.Strdupg(version) - defer C.free(version_ms) - ret := C.QLibrary_new4((*C.struct_miqt_string)(fileName_ms), (*C.struct_miqt_string)(version_ms)) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + version_ms := C.struct_miqt_string{} + version_ms.data = C.CString(version) + version_ms.len = C.size_t(len(version)) + defer C.free(unsafe.Pointer(version_ms.data)) + ret := C.QLibrary_new4(fileName_ms, version_ms) return newQLibrary(ret) } @@ -94,27 +101,35 @@ func NewQLibrary5(parent *QObject) *QLibrary { // NewQLibrary6 constructs a new QLibrary object. func NewQLibrary6(fileName string, parent *QObject) *QLibrary { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - ret := C.QLibrary_new6((*C.struct_miqt_string)(fileName_ms), parent.cPointer()) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + ret := C.QLibrary_new6(fileName_ms, parent.cPointer()) return newQLibrary(ret) } // NewQLibrary7 constructs a new QLibrary object. func NewQLibrary7(fileName string, verNum int, parent *QObject) *QLibrary { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - ret := C.QLibrary_new7((*C.struct_miqt_string)(fileName_ms), (C.int)(verNum), parent.cPointer()) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + ret := C.QLibrary_new7(fileName_ms, (C.int)(verNum), parent.cPointer()) return newQLibrary(ret) } // NewQLibrary8 constructs a new QLibrary object. func NewQLibrary8(fileName string, version string, parent *QObject) *QLibrary { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - version_ms := libmiqt.Strdupg(version) - defer C.free(version_ms) - ret := C.QLibrary_new8((*C.struct_miqt_string)(fileName_ms), (*C.struct_miqt_string)(version_ms), parent.cPointer()) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + version_ms := C.struct_miqt_string{} + version_ms.data = C.CString(version) + version_ms.len = C.size_t(len(version)) + defer C.free(unsafe.Pointer(version_ms.data)) + ret := C.QLibrary_new8(fileName_ms, version_ms, parent.cPointer()) return newQLibrary(ret) } @@ -125,24 +140,24 @@ func (this *QLibrary) MetaObject() *QMetaObject { func (this *QLibrary) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QLibrary_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QLibrary_Metacast(this.h, param1_Cstring)) } func QLibrary_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QLibrary_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLibrary_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QLibrary_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QLibrary_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLibrary_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -159,42 +174,52 @@ func (this *QLibrary) IsLoaded() bool { } func QLibrary_IsLibrary(fileName string) bool { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - return (bool)(C.QLibrary_IsLibrary((*C.struct_miqt_string)(fileName_ms))) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + return (bool)(C.QLibrary_IsLibrary(fileName_ms)) } func (this *QLibrary) SetFileName(fileName string) { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - C.QLibrary_SetFileName(this.h, (*C.struct_miqt_string)(fileName_ms)) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + C.QLibrary_SetFileName(this.h, fileName_ms) } func (this *QLibrary) FileName() string { - var _ms *C.struct_miqt_string = C.QLibrary_FileName(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLibrary_FileName(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLibrary) SetFileNameAndVersion(fileName string, verNum int) { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - C.QLibrary_SetFileNameAndVersion(this.h, (*C.struct_miqt_string)(fileName_ms), (C.int)(verNum)) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + C.QLibrary_SetFileNameAndVersion(this.h, fileName_ms, (C.int)(verNum)) } func (this *QLibrary) SetFileNameAndVersion2(fileName string, version string) { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - version_ms := libmiqt.Strdupg(version) - defer C.free(version_ms) - C.QLibrary_SetFileNameAndVersion2(this.h, (*C.struct_miqt_string)(fileName_ms), (*C.struct_miqt_string)(version_ms)) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + version_ms := C.struct_miqt_string{} + version_ms.data = C.CString(version) + version_ms.len = C.size_t(len(version)) + defer C.free(unsafe.Pointer(version_ms.data)) + C.QLibrary_SetFileNameAndVersion2(this.h, fileName_ms, version_ms) } func (this *QLibrary) ErrorString() string { - var _ms *C.struct_miqt_string = C.QLibrary_ErrorString(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLibrary_ErrorString(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -211,9 +236,9 @@ func QLibrary_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QLibrary_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLibrary_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -222,9 +247,9 @@ func QLibrary_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QLibrary_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLibrary_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -233,9 +258,9 @@ func QLibrary_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QLibrary_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLibrary_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -244,9 +269,9 @@ func QLibrary_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QLibrary_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLibrary_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qlibrary.h b/qt/gen_qlibrary.h index 6d6eab5a..94c0a312 100644 --- a/qt/gen_qlibrary.h +++ b/qt/gen_qlibrary.h @@ -24,32 +24,32 @@ typedef struct QObject QObject; #endif QLibrary* QLibrary_new(); -QLibrary* QLibrary_new2(struct miqt_string* fileName); -QLibrary* QLibrary_new3(struct miqt_string* fileName, int verNum); -QLibrary* QLibrary_new4(struct miqt_string* fileName, struct miqt_string* version); +QLibrary* QLibrary_new2(struct miqt_string fileName); +QLibrary* QLibrary_new3(struct miqt_string fileName, int verNum); +QLibrary* QLibrary_new4(struct miqt_string fileName, struct miqt_string version); QLibrary* QLibrary_new5(QObject* parent); -QLibrary* QLibrary_new6(struct miqt_string* fileName, QObject* parent); -QLibrary* QLibrary_new7(struct miqt_string* fileName, int verNum, QObject* parent); -QLibrary* QLibrary_new8(struct miqt_string* fileName, struct miqt_string* version, QObject* parent); +QLibrary* QLibrary_new6(struct miqt_string fileName, QObject* parent); +QLibrary* QLibrary_new7(struct miqt_string fileName, int verNum, QObject* parent); +QLibrary* QLibrary_new8(struct miqt_string fileName, struct miqt_string version, QObject* parent); QMetaObject* QLibrary_MetaObject(const QLibrary* self); void* QLibrary_Metacast(QLibrary* self, const char* param1); -struct miqt_string* QLibrary_Tr(const char* s); -struct miqt_string* QLibrary_TrUtf8(const char* s); +struct miqt_string QLibrary_Tr(const char* s); +struct miqt_string QLibrary_TrUtf8(const char* s); bool QLibrary_Load(QLibrary* self); bool QLibrary_Unload(QLibrary* self); bool QLibrary_IsLoaded(const QLibrary* self); -bool QLibrary_IsLibrary(struct miqt_string* fileName); -void QLibrary_SetFileName(QLibrary* self, struct miqt_string* fileName); -struct miqt_string* QLibrary_FileName(const QLibrary* self); -void QLibrary_SetFileNameAndVersion(QLibrary* self, struct miqt_string* fileName, int verNum); -void QLibrary_SetFileNameAndVersion2(QLibrary* self, struct miqt_string* fileName, struct miqt_string* version); -struct miqt_string* QLibrary_ErrorString(const QLibrary* self); +bool QLibrary_IsLibrary(struct miqt_string fileName); +void QLibrary_SetFileName(QLibrary* self, struct miqt_string fileName); +struct miqt_string QLibrary_FileName(const QLibrary* self); +void QLibrary_SetFileNameAndVersion(QLibrary* self, struct miqt_string fileName, int verNum); +void QLibrary_SetFileNameAndVersion2(QLibrary* self, struct miqt_string fileName, struct miqt_string version); +struct miqt_string QLibrary_ErrorString(const QLibrary* self); void QLibrary_SetLoadHints(QLibrary* self, int hints); int QLibrary_LoadHints(const QLibrary* self); -struct miqt_string* QLibrary_Tr2(const char* s, const char* c); -struct miqt_string* QLibrary_Tr3(const char* s, const char* c, int n); -struct miqt_string* QLibrary_TrUtf82(const char* s, const char* c); -struct miqt_string* QLibrary_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QLibrary_Tr2(const char* s, const char* c); +struct miqt_string QLibrary_Tr3(const char* s, const char* c, int n); +struct miqt_string QLibrary_TrUtf82(const char* s, const char* c); +struct miqt_string QLibrary_TrUtf83(const char* s, const char* c, int n); void QLibrary_Delete(QLibrary* self); #ifdef __cplusplus diff --git a/qt/gen_qlibraryinfo.cpp b/qt/gen_qlibraryinfo.cpp index ef8852b5..d1c3cd40 100644 --- a/qt/gen_qlibraryinfo.cpp +++ b/qt/gen_qlibraryinfo.cpp @@ -9,18 +9,26 @@ #include "gen_qlibraryinfo.h" #include "_cgo_export.h" -struct miqt_string* QLibraryInfo_Licensee() { +struct miqt_string QLibraryInfo_Licensee() { QString _ret = QLibraryInfo::licensee(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLibraryInfo_LicensedProducts() { +struct miqt_string QLibraryInfo_LicensedProducts() { QString _ret = QLibraryInfo::licensedProducts(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QDate* QLibraryInfo_BuildDate() { @@ -39,23 +47,31 @@ QVersionNumber* QLibraryInfo_Version() { return new QVersionNumber(QLibraryInfo::version()); } -struct miqt_string* QLibraryInfo_Location(int param1) { +struct miqt_string QLibraryInfo_Location(int param1) { QString _ret = QLibraryInfo::location(static_cast(param1)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_array* QLibraryInfo_PlatformPluginArguments(struct miqt_string* platformName) { - QString platformName_QString = QString::fromUtf8(&platformName->data, platformName->len); +struct miqt_array* QLibraryInfo_PlatformPluginArguments(struct miqt_string platformName) { + QString platformName_QString = QString::fromUtf8(platformName.data, platformName.len); QStringList _ret = QLibraryInfo::platformPluginArguments(platformName_QString); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); diff --git a/qt/gen_qlibraryinfo.go b/qt/gen_qlibraryinfo.go index 53d42594..67f460e5 100644 --- a/qt/gen_qlibraryinfo.go +++ b/qt/gen_qlibraryinfo.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -64,16 +63,16 @@ func UnsafeNewQLibraryInfo(h unsafe.Pointer) *QLibraryInfo { } func QLibraryInfo_Licensee() string { - var _ms *C.struct_miqt_string = C.QLibraryInfo_Licensee() - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLibraryInfo_Licensee() + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QLibraryInfo_LicensedProducts() string { - var _ms *C.struct_miqt_string = C.QLibraryInfo_LicensedProducts() - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLibraryInfo_LicensedProducts() + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -84,9 +83,9 @@ func QLibraryInfo_BuildDate() *QDate { return _goptr } -func QLibraryInfo_Build() unsafe.Pointer { +func QLibraryInfo_Build() string { _ret := C.QLibraryInfo_Build() - return (unsafe.Pointer)(_ret) + return C.GoString(_ret) } func QLibraryInfo_IsDebugBuild() bool { @@ -101,22 +100,24 @@ func QLibraryInfo_Version() *QVersionNumber { } func QLibraryInfo_Location(param1 QLibraryInfo__LibraryLocation) string { - var _ms *C.struct_miqt_string = C.QLibraryInfo_Location((C.int)(param1)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLibraryInfo_Location((C.int)(param1)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QLibraryInfo_PlatformPluginArguments(platformName string) []string { - platformName_ms := libmiqt.Strdupg(platformName) - defer C.free(platformName_ms) - var _ma *C.struct_miqt_array = C.QLibraryInfo_PlatformPluginArguments((*C.struct_miqt_string)(platformName_ms)) + platformName_ms := C.struct_miqt_string{} + platformName_ms.data = C.CString(platformName) + platformName_ms.len = C.size_t(len(platformName)) + defer C.free(unsafe.Pointer(platformName_ms.data)) + var _ma *C.struct_miqt_array = C.QLibraryInfo_PlatformPluginArguments(platformName_ms) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) diff --git a/qt/gen_qlibraryinfo.h b/qt/gen_qlibraryinfo.h index 34596c8a..f2d75b1d 100644 --- a/qt/gen_qlibraryinfo.h +++ b/qt/gen_qlibraryinfo.h @@ -23,14 +23,14 @@ typedef struct QLibraryInfo QLibraryInfo; typedef struct QVersionNumber QVersionNumber; #endif -struct miqt_string* QLibraryInfo_Licensee(); -struct miqt_string* QLibraryInfo_LicensedProducts(); +struct miqt_string QLibraryInfo_Licensee(); +struct miqt_string QLibraryInfo_LicensedProducts(); QDate* QLibraryInfo_BuildDate(); const char* QLibraryInfo_Build(); bool QLibraryInfo_IsDebugBuild(); QVersionNumber* QLibraryInfo_Version(); -struct miqt_string* QLibraryInfo_Location(int param1); -struct miqt_array* QLibraryInfo_PlatformPluginArguments(struct miqt_string* platformName); +struct miqt_string QLibraryInfo_Location(int param1); +struct miqt_array* QLibraryInfo_PlatformPluginArguments(struct miqt_string platformName); void QLibraryInfo_Delete(QLibraryInfo* self); #ifdef __cplusplus diff --git a/qt/gen_qlineedit.cpp b/qt/gen_qlineedit.cpp index bcfd8910..d716ceaf 100644 --- a/qt/gen_qlineedit.cpp +++ b/qt/gen_qlineedit.cpp @@ -22,8 +22,8 @@ QLineEdit* QLineEdit_new() { return new QLineEdit(); } -QLineEdit* QLineEdit_new2(struct miqt_string* param1) { - QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); +QLineEdit* QLineEdit_new2(struct miqt_string param1) { + QString param1_QString = QString::fromUtf8(param1.data, param1.len); return new QLineEdit(param1_QString); } @@ -31,8 +31,8 @@ QLineEdit* QLineEdit_new3(QWidget* parent) { return new QLineEdit(parent); } -QLineEdit* QLineEdit_new4(struct miqt_string* param1, QWidget* parent) { - QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); +QLineEdit* QLineEdit_new4(struct miqt_string param1, QWidget* parent) { + QString param1_QString = QString::fromUtf8(param1.data, param1.len); return new QLineEdit(param1_QString, parent); } @@ -44,43 +44,63 @@ void* QLineEdit_Metacast(QLineEdit* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QLineEdit_Tr(const char* s) { +struct miqt_string QLineEdit_Tr(const char* s) { QString _ret = QLineEdit::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLineEdit_TrUtf8(const char* s) { +struct miqt_string QLineEdit_TrUtf8(const char* s) { QString _ret = QLineEdit::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLineEdit_Text(const QLineEdit* self) { +struct miqt_string QLineEdit_Text(const QLineEdit* self) { QString _ret = self->text(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLineEdit_DisplayText(const QLineEdit* self) { +struct miqt_string QLineEdit_DisplayText(const QLineEdit* self) { QString _ret = self->displayText(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLineEdit_PlaceholderText(const QLineEdit* self) { +struct miqt_string QLineEdit_PlaceholderText(const QLineEdit* self) { QString _ret = self->placeholderText(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QLineEdit_SetPlaceholderText(QLineEdit* self, struct miqt_string* placeholderText) { - QString placeholderText_QString = QString::fromUtf8(&placeholderText->data, placeholderText->len); +void QLineEdit_SetPlaceholderText(QLineEdit* self, struct miqt_string placeholderText) { + QString placeholderText_QString = QString::fromUtf8(placeholderText.data, placeholderText.len); self->setPlaceholderText(placeholderText_QString); } @@ -218,11 +238,15 @@ bool QLineEdit_HasSelectedText(const QLineEdit* self) { return self->hasSelectedText(); } -struct miqt_string* QLineEdit_SelectedText(const QLineEdit* self) { +struct miqt_string QLineEdit_SelectedText(const QLineEdit* self) { QString _ret = self->selectedText(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QLineEdit_SelectionStart(const QLineEdit* self) { @@ -262,15 +286,19 @@ int QLineEdit_CursorMoveStyle(const QLineEdit* self) { return static_cast(_ret); } -struct miqt_string* QLineEdit_InputMask(const QLineEdit* self) { +struct miqt_string QLineEdit_InputMask(const QLineEdit* self) { QString _ret = self->inputMask(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QLineEdit_SetInputMask(QLineEdit* self, struct miqt_string* inputMask) { - QString inputMask_QString = QString::fromUtf8(&inputMask->data, inputMask->len); +void QLineEdit_SetInputMask(QLineEdit* self, struct miqt_string inputMask) { + QString inputMask_QString = QString::fromUtf8(inputMask.data, inputMask.len); self->setInputMask(inputMask_QString); } @@ -302,8 +330,8 @@ QAction* QLineEdit_AddAction2(QLineEdit* self, QIcon* icon, int position) { return self->addAction(*icon, static_cast(position)); } -void QLineEdit_SetText(QLineEdit* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QLineEdit_SetText(QLineEdit* self, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->setText(text_QString); } @@ -339,8 +367,8 @@ void QLineEdit_Deselect(QLineEdit* self) { self->deselect(); } -void QLineEdit_Insert(QLineEdit* self, struct miqt_string* param1) { - QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); +void QLineEdit_Insert(QLineEdit* self, struct miqt_string param1) { + QString param1_QString = QString::fromUtf8(param1.data, param1.len); self->insert(param1_QString); } @@ -348,8 +376,8 @@ QMenu* QLineEdit_CreateStandardContextMenu(QLineEdit* self) { return self->createStandardContextMenu(); } -void QLineEdit_TextChanged(QLineEdit* self, struct miqt_string* param1) { - QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); +void QLineEdit_TextChanged(QLineEdit* self, struct miqt_string param1) { + QString param1_QString = QString::fromUtf8(param1.data, param1.len); self->textChanged(param1_QString); } @@ -358,13 +386,17 @@ void QLineEdit_connect_TextChanged(QLineEdit* self, intptr_t slot) { const QString param1_ret = param1; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray param1_b = param1_ret.toUtf8(); - struct miqt_string* sigval1 = miqt_strdup(param1_b.data(), param1_b.length()); + struct miqt_string param1_ms; + param1_ms.len = param1_b.length(); + param1_ms.data = static_cast(malloc(param1_ms.len)); + memcpy(param1_ms.data, param1_b.data(), param1_ms.len); + struct miqt_string sigval1 = param1_ms; miqt_exec_callback_QLineEdit_TextChanged(slot, sigval1); }); } -void QLineEdit_TextEdited(QLineEdit* self, struct miqt_string* param1) { - QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); +void QLineEdit_TextEdited(QLineEdit* self, struct miqt_string param1) { + QString param1_QString = QString::fromUtf8(param1.data, param1.len); self->textEdited(param1_QString); } @@ -373,7 +405,11 @@ void QLineEdit_connect_TextEdited(QLineEdit* self, intptr_t slot) { const QString param1_ret = param1; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray param1_b = param1_ret.toUtf8(); - struct miqt_string* sigval1 = miqt_strdup(param1_b.data(), param1_b.length()); + struct miqt_string param1_ms; + param1_ms.len = param1_b.length(); + param1_ms.data = static_cast(malloc(param1_ms.len)); + memcpy(param1_ms.data, param1_b.data(), param1_ms.len); + struct miqt_string sigval1 = param1_ms; miqt_exec_callback_QLineEdit_TextEdited(slot, sigval1); }); } @@ -442,32 +478,48 @@ bool QLineEdit_Event(QLineEdit* self, QEvent* param1) { return self->event(param1); } -struct miqt_string* QLineEdit_Tr2(const char* s, const char* c) { +struct miqt_string QLineEdit_Tr2(const char* s, const char* c) { QString _ret = QLineEdit::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLineEdit_Tr3(const char* s, const char* c, int n) { +struct miqt_string QLineEdit_Tr3(const char* s, const char* c, int n) { QString _ret = QLineEdit::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLineEdit_TrUtf82(const char* s, const char* c) { +struct miqt_string QLineEdit_TrUtf82(const char* s, const char* c) { QString _ret = QLineEdit::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLineEdit_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QLineEdit_TrUtf83(const char* s, const char* c, int n) { QString _ret = QLineEdit::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QLineEdit_CursorForward2(QLineEdit* self, bool mark, int steps) { diff --git a/qt/gen_qlineedit.go b/qt/gen_qlineedit.go index 157eaa6a..39b03c08 100644 --- a/qt/gen_qlineedit.go +++ b/qt/gen_qlineedit.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "runtime/cgo" "unsafe" @@ -69,9 +68,11 @@ func NewQLineEdit() *QLineEdit { // NewQLineEdit2 constructs a new QLineEdit object. func NewQLineEdit2(param1 string) *QLineEdit { - param1_ms := libmiqt.Strdupg(param1) - defer C.free(param1_ms) - ret := C.QLineEdit_new2((*C.struct_miqt_string)(param1_ms)) + param1_ms := C.struct_miqt_string{} + param1_ms.data = C.CString(param1) + param1_ms.len = C.size_t(len(param1)) + defer C.free(unsafe.Pointer(param1_ms.data)) + ret := C.QLineEdit_new2(param1_ms) return newQLineEdit(ret) } @@ -83,9 +84,11 @@ func NewQLineEdit3(parent *QWidget) *QLineEdit { // NewQLineEdit4 constructs a new QLineEdit object. func NewQLineEdit4(param1 string, parent *QWidget) *QLineEdit { - param1_ms := libmiqt.Strdupg(param1) - defer C.free(param1_ms) - ret := C.QLineEdit_new4((*C.struct_miqt_string)(param1_ms), parent.cPointer()) + param1_ms := C.struct_miqt_string{} + param1_ms.data = C.CString(param1) + param1_ms.len = C.size_t(len(param1)) + defer C.free(unsafe.Pointer(param1_ms.data)) + ret := C.QLineEdit_new4(param1_ms, parent.cPointer()) return newQLineEdit(ret) } @@ -96,52 +99,54 @@ func (this *QLineEdit) MetaObject() *QMetaObject { func (this *QLineEdit) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QLineEdit_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QLineEdit_Metacast(this.h, param1_Cstring)) } func QLineEdit_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QLineEdit_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLineEdit_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QLineEdit_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QLineEdit_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLineEdit_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLineEdit) Text() string { - var _ms *C.struct_miqt_string = C.QLineEdit_Text(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLineEdit_Text(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLineEdit) DisplayText() string { - var _ms *C.struct_miqt_string = C.QLineEdit_DisplayText(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLineEdit_DisplayText(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLineEdit) PlaceholderText() string { - var _ms *C.struct_miqt_string = C.QLineEdit_PlaceholderText(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLineEdit_PlaceholderText(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLineEdit) SetPlaceholderText(placeholderText string) { - placeholderText_ms := libmiqt.Strdupg(placeholderText) - defer C.free(placeholderText_ms) - C.QLineEdit_SetPlaceholderText(this.h, (*C.struct_miqt_string)(placeholderText_ms)) + placeholderText_ms := C.struct_miqt_string{} + placeholderText_ms.data = C.CString(placeholderText) + placeholderText_ms.len = C.size_t(len(placeholderText)) + defer C.free(unsafe.Pointer(placeholderText_ms.data)) + C.QLineEdit_SetPlaceholderText(this.h, placeholderText_ms) } func (this *QLineEdit) MaxLength() int { @@ -283,9 +288,9 @@ func (this *QLineEdit) HasSelectedText() bool { } func (this *QLineEdit) SelectedText() string { - var _ms *C.struct_miqt_string = C.QLineEdit_SelectedText(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLineEdit_SelectedText(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -326,16 +331,18 @@ func (this *QLineEdit) CursorMoveStyle() CursorMoveStyle { } func (this *QLineEdit) InputMask() string { - var _ms *C.struct_miqt_string = C.QLineEdit_InputMask(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLineEdit_InputMask(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLineEdit) SetInputMask(inputMask string) { - inputMask_ms := libmiqt.Strdupg(inputMask) - defer C.free(inputMask_ms) - C.QLineEdit_SetInputMask(this.h, (*C.struct_miqt_string)(inputMask_ms)) + inputMask_ms := C.struct_miqt_string{} + inputMask_ms.data = C.CString(inputMask) + inputMask_ms.len = C.size_t(len(inputMask)) + defer C.free(unsafe.Pointer(inputMask_ms.data)) + C.QLineEdit_SetInputMask(this.h, inputMask_ms) } func (this *QLineEdit) HasAcceptableInput() bool { @@ -370,9 +377,11 @@ func (this *QLineEdit) AddAction2(icon *QIcon, position QLineEdit__ActionPositio } func (this *QLineEdit) SetText(text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QLineEdit_SetText(this.h, (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QLineEdit_SetText(this.h, text_ms) } func (this *QLineEdit) Clear() { @@ -408,9 +417,11 @@ func (this *QLineEdit) Deselect() { } func (this *QLineEdit) Insert(param1 string) { - param1_ms := libmiqt.Strdupg(param1) - defer C.free(param1_ms) - C.QLineEdit_Insert(this.h, (*C.struct_miqt_string)(param1_ms)) + param1_ms := C.struct_miqt_string{} + param1_ms.data = C.CString(param1) + param1_ms.len = C.size_t(len(param1)) + defer C.free(unsafe.Pointer(param1_ms.data)) + C.QLineEdit_Insert(this.h, param1_ms) } func (this *QLineEdit) CreateStandardContextMenu() *QMenu { @@ -418,50 +429,54 @@ func (this *QLineEdit) CreateStandardContextMenu() *QMenu { } func (this *QLineEdit) TextChanged(param1 string) { - param1_ms := libmiqt.Strdupg(param1) - defer C.free(param1_ms) - C.QLineEdit_TextChanged(this.h, (*C.struct_miqt_string)(param1_ms)) + param1_ms := C.struct_miqt_string{} + param1_ms.data = C.CString(param1) + param1_ms.len = C.size_t(len(param1)) + defer C.free(unsafe.Pointer(param1_ms.data)) + C.QLineEdit_TextChanged(this.h, param1_ms) } func (this *QLineEdit) OnTextChanged(slot func(param1 string)) { C.QLineEdit_connect_TextChanged(this.h, C.intptr_t(cgo.NewHandle(slot))) } //export miqt_exec_callback_QLineEdit_TextChanged -func miqt_exec_callback_QLineEdit_TextChanged(cb C.intptr_t, param1 *C.struct_miqt_string) { +func miqt_exec_callback_QLineEdit_TextChanged(cb C.intptr_t, param1 C.struct_miqt_string) { gofunc, ok := cgo.Handle(cb).Value().(func(param1 string)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") } // Convert all CABI parameters to Go parameters - var param1_ms *C.struct_miqt_string = param1 - param1_ret := C.GoStringN(¶m1_ms.data, C.int(int64(param1_ms.len))) - C.free(unsafe.Pointer(param1_ms)) + var param1_ms C.struct_miqt_string = param1 + param1_ret := C.GoStringN(param1_ms.data, C.int(int64(param1_ms.len))) + C.free(unsafe.Pointer(param1_ms.data)) slotval1 := param1_ret gofunc(slotval1) } func (this *QLineEdit) TextEdited(param1 string) { - param1_ms := libmiqt.Strdupg(param1) - defer C.free(param1_ms) - C.QLineEdit_TextEdited(this.h, (*C.struct_miqt_string)(param1_ms)) + param1_ms := C.struct_miqt_string{} + param1_ms.data = C.CString(param1) + param1_ms.len = C.size_t(len(param1)) + defer C.free(unsafe.Pointer(param1_ms.data)) + C.QLineEdit_TextEdited(this.h, param1_ms) } func (this *QLineEdit) OnTextEdited(slot func(param1 string)) { C.QLineEdit_connect_TextEdited(this.h, C.intptr_t(cgo.NewHandle(slot))) } //export miqt_exec_callback_QLineEdit_TextEdited -func miqt_exec_callback_QLineEdit_TextEdited(cb C.intptr_t, param1 *C.struct_miqt_string) { +func miqt_exec_callback_QLineEdit_TextEdited(cb C.intptr_t, param1 C.struct_miqt_string) { gofunc, ok := cgo.Handle(cb).Value().(func(param1 string)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") } // Convert all CABI parameters to Go parameters - var param1_ms *C.struct_miqt_string = param1 - param1_ret := C.GoStringN(¶m1_ms.data, C.int(int64(param1_ms.len))) - C.free(unsafe.Pointer(param1_ms)) + var param1_ms C.struct_miqt_string = param1 + param1_ret := C.GoStringN(param1_ms.data, C.int(int64(param1_ms.len))) + C.free(unsafe.Pointer(param1_ms.data)) slotval1 := param1_ret gofunc(slotval1) @@ -580,9 +595,9 @@ func QLineEdit_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QLineEdit_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLineEdit_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -591,9 +606,9 @@ func QLineEdit_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QLineEdit_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLineEdit_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -602,9 +617,9 @@ func QLineEdit_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QLineEdit_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLineEdit_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -613,9 +628,9 @@ func QLineEdit_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QLineEdit_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLineEdit_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qlineedit.h b/qt/gen_qlineedit.h index e8914b5e..c5eb7455 100644 --- a/qt/gen_qlineedit.h +++ b/qt/gen_qlineedit.h @@ -44,17 +44,17 @@ typedef struct QWidget QWidget; #endif QLineEdit* QLineEdit_new(); -QLineEdit* QLineEdit_new2(struct miqt_string* param1); +QLineEdit* QLineEdit_new2(struct miqt_string param1); QLineEdit* QLineEdit_new3(QWidget* parent); -QLineEdit* QLineEdit_new4(struct miqt_string* param1, QWidget* parent); +QLineEdit* QLineEdit_new4(struct miqt_string param1, QWidget* parent); QMetaObject* QLineEdit_MetaObject(const QLineEdit* self); void* QLineEdit_Metacast(QLineEdit* self, const char* param1); -struct miqt_string* QLineEdit_Tr(const char* s); -struct miqt_string* QLineEdit_TrUtf8(const char* s); -struct miqt_string* QLineEdit_Text(const QLineEdit* self); -struct miqt_string* QLineEdit_DisplayText(const QLineEdit* self); -struct miqt_string* QLineEdit_PlaceholderText(const QLineEdit* self); -void QLineEdit_SetPlaceholderText(QLineEdit* self, struct miqt_string* placeholderText); +struct miqt_string QLineEdit_Tr(const char* s); +struct miqt_string QLineEdit_TrUtf8(const char* s); +struct miqt_string QLineEdit_Text(const QLineEdit* self); +struct miqt_string QLineEdit_DisplayText(const QLineEdit* self); +struct miqt_string QLineEdit_PlaceholderText(const QLineEdit* self); +void QLineEdit_SetPlaceholderText(QLineEdit* self, struct miqt_string placeholderText); int QLineEdit_MaxLength(const QLineEdit* self); void QLineEdit_SetMaxLength(QLineEdit* self, int maxLength); void QLineEdit_SetFrame(QLineEdit* self, bool frame); @@ -88,7 +88,7 @@ bool QLineEdit_IsModified(const QLineEdit* self); void QLineEdit_SetModified(QLineEdit* self, bool modified); void QLineEdit_SetSelection(QLineEdit* self, int param1, int param2); bool QLineEdit_HasSelectedText(const QLineEdit* self); -struct miqt_string* QLineEdit_SelectedText(const QLineEdit* self); +struct miqt_string QLineEdit_SelectedText(const QLineEdit* self); int QLineEdit_SelectionStart(const QLineEdit* self); int QLineEdit_SelectionEnd(const QLineEdit* self); int QLineEdit_SelectionLength(const QLineEdit* self); @@ -98,8 +98,8 @@ void QLineEdit_SetDragEnabled(QLineEdit* self, bool b); bool QLineEdit_DragEnabled(const QLineEdit* self); void QLineEdit_SetCursorMoveStyle(QLineEdit* self, int style); int QLineEdit_CursorMoveStyle(const QLineEdit* self); -struct miqt_string* QLineEdit_InputMask(const QLineEdit* self); -void QLineEdit_SetInputMask(QLineEdit* self, struct miqt_string* inputMask); +struct miqt_string QLineEdit_InputMask(const QLineEdit* self); +void QLineEdit_SetInputMask(QLineEdit* self, struct miqt_string inputMask); bool QLineEdit_HasAcceptableInput(const QLineEdit* self); void QLineEdit_SetTextMargins(QLineEdit* self, int left, int top, int right, int bottom); void QLineEdit_SetTextMarginsWithMargins(QLineEdit* self, QMargins* margins); @@ -107,7 +107,7 @@ void QLineEdit_GetTextMargins(const QLineEdit* self, int* left, int* top, int* r QMargins* QLineEdit_TextMargins(const QLineEdit* self); void QLineEdit_AddAction(QLineEdit* self, QAction* action, int position); QAction* QLineEdit_AddAction2(QLineEdit* self, QIcon* icon, int position); -void QLineEdit_SetText(QLineEdit* self, struct miqt_string* text); +void QLineEdit_SetText(QLineEdit* self, struct miqt_string text); void QLineEdit_Clear(QLineEdit* self); void QLineEdit_SelectAll(QLineEdit* self); void QLineEdit_Undo(QLineEdit* self); @@ -116,11 +116,11 @@ void QLineEdit_Cut(QLineEdit* self); void QLineEdit_Copy(const QLineEdit* self); void QLineEdit_Paste(QLineEdit* self); void QLineEdit_Deselect(QLineEdit* self); -void QLineEdit_Insert(QLineEdit* self, struct miqt_string* param1); +void QLineEdit_Insert(QLineEdit* self, struct miqt_string param1); QMenu* QLineEdit_CreateStandardContextMenu(QLineEdit* self); -void QLineEdit_TextChanged(QLineEdit* self, struct miqt_string* param1); +void QLineEdit_TextChanged(QLineEdit* self, struct miqt_string param1); void QLineEdit_connect_TextChanged(QLineEdit* self, intptr_t slot); -void QLineEdit_TextEdited(QLineEdit* self, struct miqt_string* param1); +void QLineEdit_TextEdited(QLineEdit* self, struct miqt_string param1); void QLineEdit_connect_TextEdited(QLineEdit* self, intptr_t slot); void QLineEdit_CursorPositionChanged(QLineEdit* self, int param1, int param2); void QLineEdit_connect_CursorPositionChanged(QLineEdit* self, intptr_t slot); @@ -135,10 +135,10 @@ void QLineEdit_connect_InputRejected(QLineEdit* self, intptr_t slot); QVariant* QLineEdit_InputMethodQuery(const QLineEdit* self, int param1); QVariant* QLineEdit_InputMethodQuery2(const QLineEdit* self, int property, QVariant* argument); bool QLineEdit_Event(QLineEdit* self, QEvent* param1); -struct miqt_string* QLineEdit_Tr2(const char* s, const char* c); -struct miqt_string* QLineEdit_Tr3(const char* s, const char* c, int n); -struct miqt_string* QLineEdit_TrUtf82(const char* s, const char* c); -struct miqt_string* QLineEdit_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QLineEdit_Tr2(const char* s, const char* c); +struct miqt_string QLineEdit_Tr3(const char* s, const char* c, int n); +struct miqt_string QLineEdit_TrUtf82(const char* s, const char* c); +struct miqt_string QLineEdit_TrUtf83(const char* s, const char* c, int n); void QLineEdit_CursorForward2(QLineEdit* self, bool mark, int steps); void QLineEdit_CursorBackward2(QLineEdit* self, bool mark, int steps); void QLineEdit_Delete(QLineEdit* self); diff --git a/qt/gen_qlistview.cpp b/qt/gen_qlistview.cpp index 67ed91c2..d6a15f10 100644 --- a/qt/gen_qlistview.cpp +++ b/qt/gen_qlistview.cpp @@ -29,18 +29,26 @@ void* QListView_Metacast(QListView* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QListView_Tr(const char* s) { +struct miqt_string QListView_Tr(const char* s) { QString _ret = QListView::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QListView_TrUtf8(const char* s) { +struct miqt_string QListView_TrUtf8(const char* s) { QString _ret = QListView::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QListView_SetMovement(QListView* self, int movement) { @@ -223,32 +231,48 @@ void QListView_connect_IndexesMoved(QListView* self, intptr_t slot) { }); } -struct miqt_string* QListView_Tr2(const char* s, const char* c) { +struct miqt_string QListView_Tr2(const char* s, const char* c) { QString _ret = QListView::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QListView_Tr3(const char* s, const char* c, int n) { +struct miqt_string QListView_Tr3(const char* s, const char* c, int n) { QString _ret = QListView::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QListView_TrUtf82(const char* s, const char* c) { +struct miqt_string QListView_TrUtf82(const char* s, const char* c) { QString _ret = QListView::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QListView_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QListView_TrUtf83(const char* s, const char* c, int n) { QString _ret = QListView::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QListView_ScrollTo2(QListView* self, QModelIndex* index, int hint) { diff --git a/qt/gen_qlistview.go b/qt/gen_qlistview.go index 11f9350f..6f271d8b 100644 --- a/qt/gen_qlistview.go +++ b/qt/gen_qlistview.go @@ -99,24 +99,24 @@ func (this *QListView) MetaObject() *QMetaObject { func (this *QListView) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QListView_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QListView_Metacast(this.h, param1_Cstring)) } func QListView_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QListView_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QListView_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QListView_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QListView_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QListView_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -320,9 +320,9 @@ func QListView_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QListView_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QListView_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -331,9 +331,9 @@ func QListView_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QListView_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QListView_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -342,9 +342,9 @@ func QListView_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QListView_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QListView_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -353,9 +353,9 @@ func QListView_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QListView_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QListView_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qlistview.h b/qt/gen_qlistview.h index 188097be..31dff7d6 100644 --- a/qt/gen_qlistview.h +++ b/qt/gen_qlistview.h @@ -35,8 +35,8 @@ QListView* QListView_new(); QListView* QListView_new2(QWidget* parent); QMetaObject* QListView_MetaObject(const QListView* self); void* QListView_Metacast(QListView* self, const char* param1); -struct miqt_string* QListView_Tr(const char* s); -struct miqt_string* QListView_TrUtf8(const char* s); +struct miqt_string QListView_Tr(const char* s); +struct miqt_string QListView_TrUtf8(const char* s); void QListView_SetMovement(QListView* self, int movement); int QListView_Movement(const QListView* self); void QListView_SetFlow(QListView* self, int flow); @@ -76,10 +76,10 @@ void QListView_Reset(QListView* self); void QListView_SetRootIndex(QListView* self, QModelIndex* index); void QListView_IndexesMoved(QListView* self, struct miqt_array* /* of QModelIndex* */ indexes); void QListView_connect_IndexesMoved(QListView* self, intptr_t slot); -struct miqt_string* QListView_Tr2(const char* s, const char* c); -struct miqt_string* QListView_Tr3(const char* s, const char* c, int n); -struct miqt_string* QListView_TrUtf82(const char* s, const char* c); -struct miqt_string* QListView_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QListView_Tr2(const char* s, const char* c); +struct miqt_string QListView_Tr3(const char* s, const char* c, int n); +struct miqt_string QListView_TrUtf82(const char* s, const char* c); +struct miqt_string QListView_TrUtf83(const char* s, const char* c, int n); void QListView_ScrollTo2(QListView* self, QModelIndex* index, int hint); void QListView_Delete(QListView* self); diff --git a/qt/gen_qlistwidget.cpp b/qt/gen_qlistwidget.cpp index aea0809d..ff1697b7 100644 --- a/qt/gen_qlistwidget.cpp +++ b/qt/gen_qlistwidget.cpp @@ -25,13 +25,13 @@ QListWidgetItem* QListWidgetItem_new() { return new QListWidgetItem(); } -QListWidgetItem* QListWidgetItem_new2(struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QListWidgetItem* QListWidgetItem_new2(struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QListWidgetItem(text_QString); } -QListWidgetItem* QListWidgetItem_new3(QIcon* icon, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QListWidgetItem* QListWidgetItem_new3(QIcon* icon, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QListWidgetItem(*icon, text_QString); } @@ -47,23 +47,23 @@ QListWidgetItem* QListWidgetItem_new6(QListWidget* listview, int typeVal) { return new QListWidgetItem(listview, static_cast(typeVal)); } -QListWidgetItem* QListWidgetItem_new7(struct miqt_string* text, QListWidget* listview) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QListWidgetItem* QListWidgetItem_new7(struct miqt_string text, QListWidget* listview) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QListWidgetItem(text_QString, listview); } -QListWidgetItem* QListWidgetItem_new8(struct miqt_string* text, QListWidget* listview, int typeVal) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QListWidgetItem* QListWidgetItem_new8(struct miqt_string text, QListWidget* listview, int typeVal) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QListWidgetItem(text_QString, listview, static_cast(typeVal)); } -QListWidgetItem* QListWidgetItem_new9(QIcon* icon, struct miqt_string* text, QListWidget* listview) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QListWidgetItem* QListWidgetItem_new9(QIcon* icon, struct miqt_string text, QListWidget* listview) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QListWidgetItem(*icon, text_QString, listview); } -QListWidgetItem* QListWidgetItem_new10(QIcon* icon, struct miqt_string* text, QListWidget* listview, int typeVal) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QListWidgetItem* QListWidgetItem_new10(QIcon* icon, struct miqt_string text, QListWidget* listview, int typeVal) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QListWidgetItem(*icon, text_QString, listview, static_cast(typeVal)); } @@ -100,15 +100,19 @@ void QListWidgetItem_SetFlags(QListWidgetItem* self, int flags) { self->setFlags(static_cast(flags)); } -struct miqt_string* QListWidgetItem_Text(const QListWidgetItem* self) { +struct miqt_string QListWidgetItem_Text(const QListWidgetItem* self) { QString _ret = self->text(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QListWidgetItem_SetText(QListWidgetItem* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QListWidgetItem_SetText(QListWidgetItem* self, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->setText(text_QString); } @@ -120,39 +124,51 @@ void QListWidgetItem_SetIcon(QListWidgetItem* self, QIcon* icon) { self->setIcon(*icon); } -struct miqt_string* QListWidgetItem_StatusTip(const QListWidgetItem* self) { +struct miqt_string QListWidgetItem_StatusTip(const QListWidgetItem* self) { QString _ret = self->statusTip(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QListWidgetItem_SetStatusTip(QListWidgetItem* self, struct miqt_string* statusTip) { - QString statusTip_QString = QString::fromUtf8(&statusTip->data, statusTip->len); +void QListWidgetItem_SetStatusTip(QListWidgetItem* self, struct miqt_string statusTip) { + QString statusTip_QString = QString::fromUtf8(statusTip.data, statusTip.len); self->setStatusTip(statusTip_QString); } -struct miqt_string* QListWidgetItem_ToolTip(const QListWidgetItem* self) { +struct miqt_string QListWidgetItem_ToolTip(const QListWidgetItem* self) { QString _ret = self->toolTip(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QListWidgetItem_SetToolTip(QListWidgetItem* self, struct miqt_string* toolTip) { - QString toolTip_QString = QString::fromUtf8(&toolTip->data, toolTip->len); +void QListWidgetItem_SetToolTip(QListWidgetItem* self, struct miqt_string toolTip) { + QString toolTip_QString = QString::fromUtf8(toolTip.data, toolTip.len); self->setToolTip(toolTip_QString); } -struct miqt_string* QListWidgetItem_WhatsThis(const QListWidgetItem* self) { +struct miqt_string QListWidgetItem_WhatsThis(const QListWidgetItem* self) { QString _ret = self->whatsThis(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QListWidgetItem_SetWhatsThis(QListWidgetItem* self, struct miqt_string* whatsThis) { - QString whatsThis_QString = QString::fromUtf8(&whatsThis->data, whatsThis->len); +void QListWidgetItem_SetWhatsThis(QListWidgetItem* self, struct miqt_string whatsThis) { + QString whatsThis_QString = QString::fromUtf8(whatsThis.data, whatsThis.len); self->setWhatsThis(whatsThis_QString); } @@ -269,18 +285,26 @@ void* QListWidget_Metacast(QListWidget* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QListWidget_Tr(const char* s) { +struct miqt_string QListWidget_Tr(const char* s) { QString _ret = QListWidget::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QListWidget_TrUtf8(const char* s) { +struct miqt_string QListWidget_TrUtf8(const char* s) { QString _ret = QListWidget::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QListWidget_SetSelectionModel(QListWidget* self, QItemSelectionModel* selectionModel) { @@ -299,24 +323,24 @@ void QListWidget_InsertItem(QListWidget* self, int row, QListWidgetItem* item) { self->insertItem(static_cast(row), item); } -void QListWidget_InsertItem2(QListWidget* self, int row, struct miqt_string* label) { - QString label_QString = QString::fromUtf8(&label->data, label->len); +void QListWidget_InsertItem2(QListWidget* self, int row, struct miqt_string label) { + QString label_QString = QString::fromUtf8(label.data, label.len); self->insertItem(static_cast(row), label_QString); } -void QListWidget_InsertItems(QListWidget* self, int row, struct miqt_array* /* of struct miqt_string* */ labels) { +void QListWidget_InsertItems(QListWidget* self, int row, struct miqt_array* /* of struct miqt_string */ labels) { QStringList labels_QList; labels_QList.reserve(labels->len); - struct miqt_string** labels_arr = static_cast(labels->data); + struct miqt_string* labels_arr = static_cast(labels->data); for(size_t i = 0; i < labels->len; ++i) { - QString labels_arr_i_QString = QString::fromUtf8(&labels_arr[i]->data, labels_arr[i]->len); + QString labels_arr_i_QString = QString::fromUtf8(labels_arr[i].data, labels_arr[i].len); labels_QList.push_back(labels_arr_i_QString); } self->insertItems(static_cast(row), labels_QList); } -void QListWidget_AddItem(QListWidget* self, struct miqt_string* label) { - QString label_QString = QString::fromUtf8(&label->data, label->len); +void QListWidget_AddItem(QListWidget* self, struct miqt_string label) { + QString label_QString = QString::fromUtf8(label.data, label.len); self->addItem(label_QString); } @@ -324,12 +348,12 @@ void QListWidget_AddItemWithItem(QListWidget* self, QListWidgetItem* item) { self->addItem(item); } -void QListWidget_AddItems(QListWidget* self, struct miqt_array* /* of struct miqt_string* */ labels) { +void QListWidget_AddItems(QListWidget* self, struct miqt_array* /* of struct miqt_string */ labels) { QStringList labels_QList; labels_QList.reserve(labels->len); - struct miqt_string** labels_arr = static_cast(labels->data); + struct miqt_string* labels_arr = static_cast(labels->data); for(size_t i = 0; i < labels->len; ++i) { - QString labels_arr_i_QString = QString::fromUtf8(&labels_arr[i]->data, labels_arr[i]->len); + QString labels_arr_i_QString = QString::fromUtf8(labels_arr[i].data, labels_arr[i].len); labels_QList.push_back(labels_arr_i_QString); } self->addItems(labels_QList); @@ -440,8 +464,8 @@ struct miqt_array* QListWidget_SelectedItems(const QListWidget* self) { return _out; } -struct miqt_array* QListWidget_FindItems(const QListWidget* self, struct miqt_string* text, int flags) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +struct miqt_array* QListWidget_FindItems(const QListWidget* self, struct miqt_string text, int flags) { + QString text_QString = QString::fromUtf8(text.data, text.len); QList _ret = self->findItems(text_QString, static_cast(flags)); // Convert QList<> from C++ memory to manually-managed C memory QListWidgetItem** _arr = static_cast(malloc(sizeof(QListWidgetItem*) * _ret.length())); @@ -552,8 +576,8 @@ void QListWidget_connect_CurrentItemChanged(QListWidget* self, intptr_t slot) { }); } -void QListWidget_CurrentTextChanged(QListWidget* self, struct miqt_string* currentText) { - QString currentText_QString = QString::fromUtf8(¤tText->data, currentText->len); +void QListWidget_CurrentTextChanged(QListWidget* self, struct miqt_string currentText) { + QString currentText_QString = QString::fromUtf8(currentText.data, currentText.len); self->currentTextChanged(currentText_QString); } @@ -562,7 +586,11 @@ void QListWidget_connect_CurrentTextChanged(QListWidget* self, intptr_t slot) { const QString currentText_ret = currentText; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray currentText_b = currentText_ret.toUtf8(); - struct miqt_string* sigval1 = miqt_strdup(currentText_b.data(), currentText_b.length()); + struct miqt_string currentText_ms; + currentText_ms.len = currentText_b.length(); + currentText_ms.data = static_cast(malloc(currentText_ms.len)); + memcpy(currentText_ms.data, currentText_b.data(), currentText_ms.len); + struct miqt_string sigval1 = currentText_ms; miqt_exec_callback_QListWidget_CurrentTextChanged(slot, sigval1); }); } @@ -588,32 +616,48 @@ void QListWidget_connect_ItemSelectionChanged(QListWidget* self, intptr_t slot) }); } -struct miqt_string* QListWidget_Tr2(const char* s, const char* c) { +struct miqt_string QListWidget_Tr2(const char* s, const char* c) { QString _ret = QListWidget::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QListWidget_Tr3(const char* s, const char* c, int n) { +struct miqt_string QListWidget_Tr3(const char* s, const char* c, int n) { QString _ret = QListWidget::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QListWidget_TrUtf82(const char* s, const char* c) { +struct miqt_string QListWidget_TrUtf82(const char* s, const char* c) { QString _ret = QListWidget::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QListWidget_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QListWidget_TrUtf83(const char* s, const char* c, int n) { QString _ret = QListWidget::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QListWidget_SortItems1(QListWidget* self, int order) { diff --git a/qt/gen_qlistwidget.go b/qt/gen_qlistwidget.go index aef3c463..dbb6c714 100644 --- a/qt/gen_qlistwidget.go +++ b/qt/gen_qlistwidget.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "runtime/cgo" "unsafe" @@ -59,17 +58,21 @@ func NewQListWidgetItem() *QListWidgetItem { // NewQListWidgetItem2 constructs a new QListWidgetItem object. func NewQListWidgetItem2(text string) *QListWidgetItem { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - ret := C.QListWidgetItem_new2((*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + ret := C.QListWidgetItem_new2(text_ms) return newQListWidgetItem(ret) } // NewQListWidgetItem3 constructs a new QListWidgetItem object. func NewQListWidgetItem3(icon *QIcon, text string) *QListWidgetItem { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - ret := C.QListWidgetItem_new3(icon.cPointer(), (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + ret := C.QListWidgetItem_new3(icon.cPointer(), text_ms) return newQListWidgetItem(ret) } @@ -93,33 +96,41 @@ func NewQListWidgetItem6(listview *QListWidget, typeVal int) *QListWidgetItem { // NewQListWidgetItem7 constructs a new QListWidgetItem object. func NewQListWidgetItem7(text string, listview *QListWidget) *QListWidgetItem { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - ret := C.QListWidgetItem_new7((*C.struct_miqt_string)(text_ms), listview.cPointer()) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + ret := C.QListWidgetItem_new7(text_ms, listview.cPointer()) return newQListWidgetItem(ret) } // NewQListWidgetItem8 constructs a new QListWidgetItem object. func NewQListWidgetItem8(text string, listview *QListWidget, typeVal int) *QListWidgetItem { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - ret := C.QListWidgetItem_new8((*C.struct_miqt_string)(text_ms), listview.cPointer(), (C.int)(typeVal)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + ret := C.QListWidgetItem_new8(text_ms, listview.cPointer(), (C.int)(typeVal)) return newQListWidgetItem(ret) } // NewQListWidgetItem9 constructs a new QListWidgetItem object. func NewQListWidgetItem9(icon *QIcon, text string, listview *QListWidget) *QListWidgetItem { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - ret := C.QListWidgetItem_new9(icon.cPointer(), (*C.struct_miqt_string)(text_ms), listview.cPointer()) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + ret := C.QListWidgetItem_new9(icon.cPointer(), text_ms, listview.cPointer()) return newQListWidgetItem(ret) } // NewQListWidgetItem10 constructs a new QListWidgetItem object. func NewQListWidgetItem10(icon *QIcon, text string, listview *QListWidget, typeVal int) *QListWidgetItem { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - ret := C.QListWidgetItem_new10(icon.cPointer(), (*C.struct_miqt_string)(text_ms), listview.cPointer(), (C.int)(typeVal)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + ret := C.QListWidgetItem_new10(icon.cPointer(), text_ms, listview.cPointer(), (C.int)(typeVal)) return newQListWidgetItem(ret) } @@ -156,16 +167,18 @@ func (this *QListWidgetItem) SetFlags(flags ItemFlag) { } func (this *QListWidgetItem) Text() string { - var _ms *C.struct_miqt_string = C.QListWidgetItem_Text(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QListWidgetItem_Text(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QListWidgetItem) SetText(text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QListWidgetItem_SetText(this.h, (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QListWidgetItem_SetText(this.h, text_ms) } func (this *QListWidgetItem) Icon() *QIcon { @@ -180,42 +193,48 @@ func (this *QListWidgetItem) SetIcon(icon *QIcon) { } func (this *QListWidgetItem) StatusTip() string { - var _ms *C.struct_miqt_string = C.QListWidgetItem_StatusTip(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QListWidgetItem_StatusTip(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QListWidgetItem) SetStatusTip(statusTip string) { - statusTip_ms := libmiqt.Strdupg(statusTip) - defer C.free(statusTip_ms) - C.QListWidgetItem_SetStatusTip(this.h, (*C.struct_miqt_string)(statusTip_ms)) + statusTip_ms := C.struct_miqt_string{} + statusTip_ms.data = C.CString(statusTip) + statusTip_ms.len = C.size_t(len(statusTip)) + defer C.free(unsafe.Pointer(statusTip_ms.data)) + C.QListWidgetItem_SetStatusTip(this.h, statusTip_ms) } func (this *QListWidgetItem) ToolTip() string { - var _ms *C.struct_miqt_string = C.QListWidgetItem_ToolTip(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QListWidgetItem_ToolTip(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QListWidgetItem) SetToolTip(toolTip string) { - toolTip_ms := libmiqt.Strdupg(toolTip) - defer C.free(toolTip_ms) - C.QListWidgetItem_SetToolTip(this.h, (*C.struct_miqt_string)(toolTip_ms)) + toolTip_ms := C.struct_miqt_string{} + toolTip_ms.data = C.CString(toolTip) + toolTip_ms.len = C.size_t(len(toolTip)) + defer C.free(unsafe.Pointer(toolTip_ms.data)) + C.QListWidgetItem_SetToolTip(this.h, toolTip_ms) } func (this *QListWidgetItem) WhatsThis() string { - var _ms *C.struct_miqt_string = C.QListWidgetItem_WhatsThis(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QListWidgetItem_WhatsThis(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QListWidgetItem) SetWhatsThis(whatsThis string) { - whatsThis_ms := libmiqt.Strdupg(whatsThis) - defer C.free(whatsThis_ms) - C.QListWidgetItem_SetWhatsThis(this.h, (*C.struct_miqt_string)(whatsThis_ms)) + whatsThis_ms := C.struct_miqt_string{} + whatsThis_ms.data = C.CString(whatsThis) + whatsThis_ms.len = C.size_t(len(whatsThis)) + defer C.free(unsafe.Pointer(whatsThis_ms.data)) + C.QListWidgetItem_SetWhatsThis(this.h, whatsThis_ms) } func (this *QListWidgetItem) Font() *QFont { @@ -394,24 +413,24 @@ func (this *QListWidget) MetaObject() *QMetaObject { func (this *QListWidget) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QListWidget_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QListWidget_Metacast(this.h, param1_Cstring)) } func QListWidget_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QListWidget_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QListWidget_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QListWidget_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QListWidget_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QListWidget_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -432,19 +451,23 @@ func (this *QListWidget) InsertItem(row int, item *QListWidgetItem) { } func (this *QListWidget) InsertItem2(row int, label string) { - label_ms := libmiqt.Strdupg(label) - defer C.free(label_ms) - C.QListWidget_InsertItem2(this.h, (C.int)(row), (*C.struct_miqt_string)(label_ms)) + label_ms := C.struct_miqt_string{} + label_ms.data = C.CString(label) + label_ms.len = C.size_t(len(label)) + defer C.free(unsafe.Pointer(label_ms.data)) + C.QListWidget_InsertItem2(this.h, (C.int)(row), label_ms) } func (this *QListWidget) InsertItems(row int, labels []string) { // For the C ABI, malloc a C array of raw pointers - labels_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(labels)))) + labels_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(labels)))) defer C.free(unsafe.Pointer(labels_CArray)) for i := range labels { - labels_i_ms := libmiqt.Strdupg(labels[i]) - defer C.free(labels_i_ms) - labels_CArray[i] = (*C.struct_miqt_string)(labels_i_ms) + labels_i_ms := C.struct_miqt_string{} + labels_i_ms.data = C.CString(labels[i]) + labels_i_ms.len = C.size_t(len(labels[i])) + defer C.free(unsafe.Pointer(labels_i_ms.data)) + labels_CArray[i] = labels_i_ms } labels_ma := &C.struct_miqt_array{len: C.size_t(len(labels)), data: unsafe.Pointer(labels_CArray)} defer runtime.KeepAlive(unsafe.Pointer(labels_ma)) @@ -452,9 +475,11 @@ func (this *QListWidget) InsertItems(row int, labels []string) { } func (this *QListWidget) AddItem(label string) { - label_ms := libmiqt.Strdupg(label) - defer C.free(label_ms) - C.QListWidget_AddItem(this.h, (*C.struct_miqt_string)(label_ms)) + label_ms := C.struct_miqt_string{} + label_ms.data = C.CString(label) + label_ms.len = C.size_t(len(label)) + defer C.free(unsafe.Pointer(label_ms.data)) + C.QListWidget_AddItem(this.h, label_ms) } func (this *QListWidget) AddItemWithItem(item *QListWidgetItem) { @@ -463,12 +488,14 @@ func (this *QListWidget) AddItemWithItem(item *QListWidgetItem) { func (this *QListWidget) AddItems(labels []string) { // For the C ABI, malloc a C array of raw pointers - labels_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(labels)))) + labels_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(labels)))) defer C.free(unsafe.Pointer(labels_CArray)) for i := range labels { - labels_i_ms := libmiqt.Strdupg(labels[i]) - defer C.free(labels_i_ms) - labels_CArray[i] = (*C.struct_miqt_string)(labels_i_ms) + labels_i_ms := C.struct_miqt_string{} + labels_i_ms.data = C.CString(labels[i]) + labels_i_ms.len = C.size_t(len(labels[i])) + defer C.free(unsafe.Pointer(labels_i_ms.data)) + labels_CArray[i] = labels_i_ms } labels_ma := &C.struct_miqt_array{len: C.size_t(len(labels)), data: unsafe.Pointer(labels_CArray)} defer runtime.KeepAlive(unsafe.Pointer(labels_ma)) @@ -582,9 +609,11 @@ func (this *QListWidget) SelectedItems() []*QListWidgetItem { } func (this *QListWidget) FindItems(text string, flags MatchFlag) []*QListWidgetItem { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - var _ma *C.struct_miqt_array = C.QListWidget_FindItems(this.h, (*C.struct_miqt_string)(text_ms), (C.int)(flags)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + var _ma *C.struct_miqt_array = C.QListWidget_FindItems(this.h, text_ms, (C.int)(flags)) _ret := make([]*QListWidgetItem, int(_ma.len)) _outCast := (*[0xffff]*C.QListWidgetItem)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -756,25 +785,27 @@ func miqt_exec_callback_QListWidget_CurrentItemChanged(cb C.intptr_t, current *C } func (this *QListWidget) CurrentTextChanged(currentText string) { - currentText_ms := libmiqt.Strdupg(currentText) - defer C.free(currentText_ms) - C.QListWidget_CurrentTextChanged(this.h, (*C.struct_miqt_string)(currentText_ms)) + currentText_ms := C.struct_miqt_string{} + currentText_ms.data = C.CString(currentText) + currentText_ms.len = C.size_t(len(currentText)) + defer C.free(unsafe.Pointer(currentText_ms.data)) + C.QListWidget_CurrentTextChanged(this.h, currentText_ms) } func (this *QListWidget) OnCurrentTextChanged(slot func(currentText string)) { C.QListWidget_connect_CurrentTextChanged(this.h, C.intptr_t(cgo.NewHandle(slot))) } //export miqt_exec_callback_QListWidget_CurrentTextChanged -func miqt_exec_callback_QListWidget_CurrentTextChanged(cb C.intptr_t, currentText *C.struct_miqt_string) { +func miqt_exec_callback_QListWidget_CurrentTextChanged(cb C.intptr_t, currentText C.struct_miqt_string) { gofunc, ok := cgo.Handle(cb).Value().(func(currentText string)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") } // Convert all CABI parameters to Go parameters - var currentText_ms *C.struct_miqt_string = currentText - currentText_ret := C.GoStringN(¤tText_ms.data, C.int(int64(currentText_ms.len))) - C.free(unsafe.Pointer(currentText_ms)) + var currentText_ms C.struct_miqt_string = currentText + currentText_ret := C.GoStringN(currentText_ms.data, C.int(int64(currentText_ms.len))) + C.free(unsafe.Pointer(currentText_ms.data)) slotval1 := currentText_ret gofunc(slotval1) @@ -822,9 +853,9 @@ func QListWidget_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QListWidget_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QListWidget_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -833,9 +864,9 @@ func QListWidget_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QListWidget_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QListWidget_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -844,9 +875,9 @@ func QListWidget_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QListWidget_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QListWidget_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -855,9 +886,9 @@ func QListWidget_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QListWidget_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QListWidget_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qlistwidget.h b/qt/gen_qlistwidget.h index 147a8204..00e1b771 100644 --- a/qt/gen_qlistwidget.h +++ b/qt/gen_qlistwidget.h @@ -48,15 +48,15 @@ typedef struct QWidget QWidget; #endif QListWidgetItem* QListWidgetItem_new(); -QListWidgetItem* QListWidgetItem_new2(struct miqt_string* text); -QListWidgetItem* QListWidgetItem_new3(QIcon* icon, struct miqt_string* text); +QListWidgetItem* QListWidgetItem_new2(struct miqt_string text); +QListWidgetItem* QListWidgetItem_new3(QIcon* icon, struct miqt_string text); QListWidgetItem* QListWidgetItem_new4(QListWidgetItem* other); QListWidgetItem* QListWidgetItem_new5(QListWidget* listview); QListWidgetItem* QListWidgetItem_new6(QListWidget* listview, int typeVal); -QListWidgetItem* QListWidgetItem_new7(struct miqt_string* text, QListWidget* listview); -QListWidgetItem* QListWidgetItem_new8(struct miqt_string* text, QListWidget* listview, int typeVal); -QListWidgetItem* QListWidgetItem_new9(QIcon* icon, struct miqt_string* text, QListWidget* listview); -QListWidgetItem* QListWidgetItem_new10(QIcon* icon, struct miqt_string* text, QListWidget* listview, int typeVal); +QListWidgetItem* QListWidgetItem_new7(struct miqt_string text, QListWidget* listview); +QListWidgetItem* QListWidgetItem_new8(struct miqt_string text, QListWidget* listview, int typeVal); +QListWidgetItem* QListWidgetItem_new9(QIcon* icon, struct miqt_string text, QListWidget* listview); +QListWidgetItem* QListWidgetItem_new10(QIcon* icon, struct miqt_string text, QListWidget* listview, int typeVal); QListWidgetItem* QListWidgetItem_Clone(const QListWidgetItem* self); QListWidget* QListWidgetItem_ListWidget(const QListWidgetItem* self); void QListWidgetItem_SetSelected(QListWidgetItem* self, bool selectVal); @@ -65,16 +65,16 @@ void QListWidgetItem_SetHidden(QListWidgetItem* self, bool hide); bool QListWidgetItem_IsHidden(const QListWidgetItem* self); int QListWidgetItem_Flags(const QListWidgetItem* self); void QListWidgetItem_SetFlags(QListWidgetItem* self, int flags); -struct miqt_string* QListWidgetItem_Text(const QListWidgetItem* self); -void QListWidgetItem_SetText(QListWidgetItem* self, struct miqt_string* text); +struct miqt_string QListWidgetItem_Text(const QListWidgetItem* self); +void QListWidgetItem_SetText(QListWidgetItem* self, struct miqt_string text); QIcon* QListWidgetItem_Icon(const QListWidgetItem* self); void QListWidgetItem_SetIcon(QListWidgetItem* self, QIcon* icon); -struct miqt_string* QListWidgetItem_StatusTip(const QListWidgetItem* self); -void QListWidgetItem_SetStatusTip(QListWidgetItem* self, struct miqt_string* statusTip); -struct miqt_string* QListWidgetItem_ToolTip(const QListWidgetItem* self); -void QListWidgetItem_SetToolTip(QListWidgetItem* self, struct miqt_string* toolTip); -struct miqt_string* QListWidgetItem_WhatsThis(const QListWidgetItem* self); -void QListWidgetItem_SetWhatsThis(QListWidgetItem* self, struct miqt_string* whatsThis); +struct miqt_string QListWidgetItem_StatusTip(const QListWidgetItem* self); +void QListWidgetItem_SetStatusTip(QListWidgetItem* self, struct miqt_string statusTip); +struct miqt_string QListWidgetItem_ToolTip(const QListWidgetItem* self); +void QListWidgetItem_SetToolTip(QListWidgetItem* self, struct miqt_string toolTip); +struct miqt_string QListWidgetItem_WhatsThis(const QListWidgetItem* self); +void QListWidgetItem_SetWhatsThis(QListWidgetItem* self, struct miqt_string whatsThis); QFont* QListWidgetItem_Font(const QListWidgetItem* self); void QListWidgetItem_SetFont(QListWidgetItem* self, QFont* font); int QListWidgetItem_TextAlignment(const QListWidgetItem* self); @@ -104,17 +104,17 @@ QListWidget* QListWidget_new(); QListWidget* QListWidget_new2(QWidget* parent); QMetaObject* QListWidget_MetaObject(const QListWidget* self); void* QListWidget_Metacast(QListWidget* self, const char* param1); -struct miqt_string* QListWidget_Tr(const char* s); -struct miqt_string* QListWidget_TrUtf8(const char* s); +struct miqt_string QListWidget_Tr(const char* s); +struct miqt_string QListWidget_TrUtf8(const char* s); void QListWidget_SetSelectionModel(QListWidget* self, QItemSelectionModel* selectionModel); QListWidgetItem* QListWidget_Item(const QListWidget* self, int row); int QListWidget_Row(const QListWidget* self, QListWidgetItem* item); void QListWidget_InsertItem(QListWidget* self, int row, QListWidgetItem* item); -void QListWidget_InsertItem2(QListWidget* self, int row, struct miqt_string* label); -void QListWidget_InsertItems(QListWidget* self, int row, struct miqt_array* /* of struct miqt_string* */ labels); -void QListWidget_AddItem(QListWidget* self, struct miqt_string* label); +void QListWidget_InsertItem2(QListWidget* self, int row, struct miqt_string label); +void QListWidget_InsertItems(QListWidget* self, int row, struct miqt_array* /* of struct miqt_string */ labels); +void QListWidget_AddItem(QListWidget* self, struct miqt_string label); void QListWidget_AddItemWithItem(QListWidget* self, QListWidgetItem* item); -void QListWidget_AddItems(QListWidget* self, struct miqt_array* /* of struct miqt_string* */ labels); +void QListWidget_AddItems(QListWidget* self, struct miqt_array* /* of struct miqt_string */ labels); QListWidgetItem* QListWidget_TakeItem(QListWidget* self, int row); int QListWidget_Count(const QListWidget* self); QListWidgetItem* QListWidget_CurrentItem(const QListWidget* self); @@ -139,7 +139,7 @@ void QListWidget_RemoveItemWidget(QListWidget* self, QListWidgetItem* item); bool QListWidget_IsItemSelected(const QListWidget* self, QListWidgetItem* item); void QListWidget_SetItemSelected(QListWidget* self, QListWidgetItem* item, bool selectVal); struct miqt_array* QListWidget_SelectedItems(const QListWidget* self); -struct miqt_array* QListWidget_FindItems(const QListWidget* self, struct miqt_string* text, int flags); +struct miqt_array* QListWidget_FindItems(const QListWidget* self, struct miqt_string text, int flags); bool QListWidget_IsItemHidden(const QListWidget* self, QListWidgetItem* item); void QListWidget_SetItemHidden(QListWidget* self, QListWidgetItem* item, bool hide); void QListWidget_DropEvent(QListWidget* self, QDropEvent* event); @@ -159,16 +159,16 @@ void QListWidget_ItemChanged(QListWidget* self, QListWidgetItem* item); void QListWidget_connect_ItemChanged(QListWidget* self, intptr_t slot); void QListWidget_CurrentItemChanged(QListWidget* self, QListWidgetItem* current, QListWidgetItem* previous); void QListWidget_connect_CurrentItemChanged(QListWidget* self, intptr_t slot); -void QListWidget_CurrentTextChanged(QListWidget* self, struct miqt_string* currentText); +void QListWidget_CurrentTextChanged(QListWidget* self, struct miqt_string currentText); void QListWidget_connect_CurrentTextChanged(QListWidget* self, intptr_t slot); void QListWidget_CurrentRowChanged(QListWidget* self, int currentRow); void QListWidget_connect_CurrentRowChanged(QListWidget* self, intptr_t slot); void QListWidget_ItemSelectionChanged(QListWidget* self); void QListWidget_connect_ItemSelectionChanged(QListWidget* self, intptr_t slot); -struct miqt_string* QListWidget_Tr2(const char* s, const char* c); -struct miqt_string* QListWidget_Tr3(const char* s, const char* c, int n); -struct miqt_string* QListWidget_TrUtf82(const char* s, const char* c); -struct miqt_string* QListWidget_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QListWidget_Tr2(const char* s, const char* c); +struct miqt_string QListWidget_Tr3(const char* s, const char* c, int n); +struct miqt_string QListWidget_TrUtf82(const char* s, const char* c); +struct miqt_string QListWidget_TrUtf83(const char* s, const char* c, int n); void QListWidget_SortItems1(QListWidget* self, int order); void QListWidget_ScrollToItem2(QListWidget* self, QListWidgetItem* item, int hint); void QListWidget_Delete(QListWidget* self); diff --git a/qt/gen_qlocale.cpp b/qt/gen_qlocale.cpp index e8d820a7..62a60a58 100644 --- a/qt/gen_qlocale.cpp +++ b/qt/gen_qlocale.cpp @@ -16,8 +16,8 @@ QLocale* QLocale_new() { return new QLocale(); } -QLocale* QLocale_new2(struct miqt_string* name) { - QString name_QString = QString::fromUtf8(&name->data, name->len); +QLocale* QLocale_new2(struct miqt_string name) { + QString name_QString = QString::fromUtf8(name.data, name.len); return new QLocale(name_QString); } @@ -60,302 +60,402 @@ int QLocale_Country(const QLocale* self) { return static_cast(_ret); } -struct miqt_string* QLocale_Name(const QLocale* self) { +struct miqt_string QLocale_Name(const QLocale* self) { QString _ret = self->name(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_Bcp47Name(const QLocale* self) { +struct miqt_string QLocale_Bcp47Name(const QLocale* self) { QString _ret = self->bcp47Name(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_NativeLanguageName(const QLocale* self) { +struct miqt_string QLocale_NativeLanguageName(const QLocale* self) { QString _ret = self->nativeLanguageName(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_NativeCountryName(const QLocale* self) { +struct miqt_string QLocale_NativeCountryName(const QLocale* self) { QString _ret = self->nativeCountryName(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -int16_t QLocale_ToShort(const QLocale* self, struct miqt_string* s) { - QString s_QString = QString::fromUtf8(&s->data, s->len); +int16_t QLocale_ToShort(const QLocale* self, struct miqt_string s) { + QString s_QString = QString::fromUtf8(s.data, s.len); return self->toShort(s_QString); } -uint16_t QLocale_ToUShort(const QLocale* self, struct miqt_string* s) { - QString s_QString = QString::fromUtf8(&s->data, s->len); +uint16_t QLocale_ToUShort(const QLocale* self, struct miqt_string s) { + QString s_QString = QString::fromUtf8(s.data, s.len); ushort _ret = self->toUShort(s_QString); return static_cast(_ret); } -int QLocale_ToInt(const QLocale* self, struct miqt_string* s) { - QString s_QString = QString::fromUtf8(&s->data, s->len); +int QLocale_ToInt(const QLocale* self, struct miqt_string s) { + QString s_QString = QString::fromUtf8(s.data, s.len); return self->toInt(s_QString); } -unsigned int QLocale_ToUInt(const QLocale* self, struct miqt_string* s) { - QString s_QString = QString::fromUtf8(&s->data, s->len); +unsigned int QLocale_ToUInt(const QLocale* self, struct miqt_string s) { + QString s_QString = QString::fromUtf8(s.data, s.len); uint _ret = self->toUInt(s_QString); return static_cast(_ret); } -long QLocale_ToLong(const QLocale* self, struct miqt_string* s) { - QString s_QString = QString::fromUtf8(&s->data, s->len); +long QLocale_ToLong(const QLocale* self, struct miqt_string s) { + QString s_QString = QString::fromUtf8(s.data, s.len); return self->toLong(s_QString); } -unsigned long QLocale_ToULong(const QLocale* self, struct miqt_string* s) { - QString s_QString = QString::fromUtf8(&s->data, s->len); +unsigned long QLocale_ToULong(const QLocale* self, struct miqt_string s) { + QString s_QString = QString::fromUtf8(s.data, s.len); ulong _ret = self->toULong(s_QString); return static_cast(_ret); } -long long QLocale_ToLongLong(const QLocale* self, struct miqt_string* s) { - QString s_QString = QString::fromUtf8(&s->data, s->len); +long long QLocale_ToLongLong(const QLocale* self, struct miqt_string s) { + QString s_QString = QString::fromUtf8(s.data, s.len); qlonglong _ret = self->toLongLong(s_QString); return static_cast(_ret); } -unsigned long long QLocale_ToULongLong(const QLocale* self, struct miqt_string* s) { - QString s_QString = QString::fromUtf8(&s->data, s->len); +unsigned long long QLocale_ToULongLong(const QLocale* self, struct miqt_string s) { + QString s_QString = QString::fromUtf8(s.data, s.len); qulonglong _ret = self->toULongLong(s_QString); return static_cast(_ret); } -float QLocale_ToFloat(const QLocale* self, struct miqt_string* s) { - QString s_QString = QString::fromUtf8(&s->data, s->len); +float QLocale_ToFloat(const QLocale* self, struct miqt_string s) { + QString s_QString = QString::fromUtf8(s.data, s.len); return self->toFloat(s_QString); } -double QLocale_ToDouble(const QLocale* self, struct miqt_string* s) { - QString s_QString = QString::fromUtf8(&s->data, s->len); +double QLocale_ToDouble(const QLocale* self, struct miqt_string s) { + QString s_QString = QString::fromUtf8(s.data, s.len); return self->toDouble(s_QString); } -struct miqt_string* QLocale_ToString(const QLocale* self, long long i) { +struct miqt_string QLocale_ToString(const QLocale* self, long long i) { QString _ret = self->toString(static_cast(i)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_ToStringWithQulonglong(const QLocale* self, unsigned long long i) { +struct miqt_string QLocale_ToStringWithQulonglong(const QLocale* self, unsigned long long i) { QString _ret = self->toString(static_cast(i)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_ToStringWithLong(const QLocale* self, long i) { +struct miqt_string QLocale_ToStringWithLong(const QLocale* self, long i) { QString _ret = self->toString(static_cast(i)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_ToStringWithUlong(const QLocale* self, unsigned long i) { +struct miqt_string QLocale_ToStringWithUlong(const QLocale* self, unsigned long i) { QString _ret = self->toString(static_cast(i)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_ToStringWithShort(const QLocale* self, int16_t i) { +struct miqt_string QLocale_ToStringWithShort(const QLocale* self, int16_t i) { QString _ret = self->toString(static_cast(i)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_ToStringWithUshort(const QLocale* self, uint16_t i) { +struct miqt_string QLocale_ToStringWithUshort(const QLocale* self, uint16_t i) { QString _ret = self->toString(static_cast(i)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_ToStringWithInt(const QLocale* self, int i) { +struct miqt_string QLocale_ToStringWithInt(const QLocale* self, int i) { QString _ret = self->toString(static_cast(i)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_ToStringWithUint(const QLocale* self, unsigned int i) { +struct miqt_string QLocale_ToStringWithUint(const QLocale* self, unsigned int i) { QString _ret = self->toString(static_cast(i)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_ToStringWithDouble(const QLocale* self, double i) { +struct miqt_string QLocale_ToStringWithDouble(const QLocale* self, double i) { QString _ret = self->toString(static_cast(i)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_ToStringWithFloat(const QLocale* self, float i) { +struct miqt_string QLocale_ToStringWithFloat(const QLocale* self, float i) { QString _ret = self->toString(static_cast(i)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_ToString2(const QLocale* self, QDate* date, struct miqt_string* formatStr) { - QString formatStr_QString = QString::fromUtf8(&formatStr->data, formatStr->len); +struct miqt_string QLocale_ToString2(const QLocale* self, QDate* date, struct miqt_string formatStr) { + QString formatStr_QString = QString::fromUtf8(formatStr.data, formatStr.len); QString _ret = self->toString(*date, formatStr_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_ToString3(const QLocale* self, QTime* time, struct miqt_string* formatStr) { - QString formatStr_QString = QString::fromUtf8(&formatStr->data, formatStr->len); +struct miqt_string QLocale_ToString3(const QLocale* self, QTime* time, struct miqt_string formatStr) { + QString formatStr_QString = QString::fromUtf8(formatStr.data, formatStr.len); QString _ret = self->toString(*time, formatStr_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_ToString4(const QLocale* self, QDateTime* dateTime, struct miqt_string* format) { - QString format_QString = QString::fromUtf8(&format->data, format->len); +struct miqt_string QLocale_ToString4(const QLocale* self, QDateTime* dateTime, struct miqt_string format) { + QString format_QString = QString::fromUtf8(format.data, format.len); QString _ret = self->toString(*dateTime, format_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_ToStringWithDate(const QLocale* self, QDate* date) { +struct miqt_string QLocale_ToStringWithDate(const QLocale* self, QDate* date) { QString _ret = self->toString(*date); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_ToStringWithTime(const QLocale* self, QTime* time) { +struct miqt_string QLocale_ToStringWithTime(const QLocale* self, QTime* time) { QString _ret = self->toString(*time); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_ToStringWithDateTime(const QLocale* self, QDateTime* dateTime) { +struct miqt_string QLocale_ToStringWithDateTime(const QLocale* self, QDateTime* dateTime) { QString _ret = self->toString(*dateTime); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_ToString9(const QLocale* self, QDate* date, int format, QCalendar* cal) { +struct miqt_string QLocale_ToString9(const QLocale* self, QDate* date, int format, QCalendar* cal) { QString _ret = self->toString(*date, static_cast(format), *cal); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_ToString10(const QLocale* self, QDateTime* dateTime, int format, QCalendar* cal) { +struct miqt_string QLocale_ToString10(const QLocale* self, QDateTime* dateTime, int format, QCalendar* cal) { QString _ret = self->toString(*dateTime, static_cast(format), *cal); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_DateFormat(const QLocale* self) { +struct miqt_string QLocale_DateFormat(const QLocale* self) { QString _ret = self->dateFormat(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_TimeFormat(const QLocale* self) { +struct miqt_string QLocale_TimeFormat(const QLocale* self) { QString _ret = self->timeFormat(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_DateTimeFormat(const QLocale* self) { +struct miqt_string QLocale_DateTimeFormat(const QLocale* self) { QString _ret = self->dateTimeFormat(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -QDate* QLocale_ToDate(const QLocale* self, struct miqt_string* stringVal) { - QString stringVal_QString = QString::fromUtf8(&stringVal->data, stringVal->len); +QDate* QLocale_ToDate(const QLocale* self, struct miqt_string stringVal) { + QString stringVal_QString = QString::fromUtf8(stringVal.data, stringVal.len); return new QDate(self->toDate(stringVal_QString)); } -QTime* QLocale_ToTime(const QLocale* self, struct miqt_string* stringVal) { - QString stringVal_QString = QString::fromUtf8(&stringVal->data, stringVal->len); +QTime* QLocale_ToTime(const QLocale* self, struct miqt_string stringVal) { + QString stringVal_QString = QString::fromUtf8(stringVal.data, stringVal.len); return new QTime(self->toTime(stringVal_QString)); } -QDateTime* QLocale_ToDateTime(const QLocale* self, struct miqt_string* stringVal) { - QString stringVal_QString = QString::fromUtf8(&stringVal->data, stringVal->len); +QDateTime* QLocale_ToDateTime(const QLocale* self, struct miqt_string stringVal) { + QString stringVal_QString = QString::fromUtf8(stringVal.data, stringVal.len); return new QDateTime(self->toDateTime(stringVal_QString)); } -QDate* QLocale_ToDate2(const QLocale* self, struct miqt_string* stringVal, struct miqt_string* format) { - QString stringVal_QString = QString::fromUtf8(&stringVal->data, stringVal->len); - QString format_QString = QString::fromUtf8(&format->data, format->len); +QDate* QLocale_ToDate2(const QLocale* self, struct miqt_string stringVal, struct miqt_string format) { + QString stringVal_QString = QString::fromUtf8(stringVal.data, stringVal.len); + QString format_QString = QString::fromUtf8(format.data, format.len); return new QDate(self->toDate(stringVal_QString, format_QString)); } -QTime* QLocale_ToTime2(const QLocale* self, struct miqt_string* stringVal, struct miqt_string* format) { - QString stringVal_QString = QString::fromUtf8(&stringVal->data, stringVal->len); - QString format_QString = QString::fromUtf8(&format->data, format->len); +QTime* QLocale_ToTime2(const QLocale* self, struct miqt_string stringVal, struct miqt_string format) { + QString stringVal_QString = QString::fromUtf8(stringVal.data, stringVal.len); + QString format_QString = QString::fromUtf8(format.data, format.len); return new QTime(self->toTime(stringVal_QString, format_QString)); } -QDateTime* QLocale_ToDateTime2(const QLocale* self, struct miqt_string* stringVal, struct miqt_string* format) { - QString stringVal_QString = QString::fromUtf8(&stringVal->data, stringVal->len); - QString format_QString = QString::fromUtf8(&format->data, format->len); +QDateTime* QLocale_ToDateTime2(const QLocale* self, struct miqt_string stringVal, struct miqt_string format) { + QString stringVal_QString = QString::fromUtf8(stringVal.data, stringVal.len); + QString format_QString = QString::fromUtf8(format.data, format.len); return new QDateTime(self->toDateTime(stringVal_QString, format_QString)); } -QDate* QLocale_ToDate3(const QLocale* self, struct miqt_string* stringVal, int format, QCalendar* cal) { - QString stringVal_QString = QString::fromUtf8(&stringVal->data, stringVal->len); +QDate* QLocale_ToDate3(const QLocale* self, struct miqt_string stringVal, int format, QCalendar* cal) { + QString stringVal_QString = QString::fromUtf8(stringVal.data, stringVal.len); return new QDate(self->toDate(stringVal_QString, static_cast(format), *cal)); } -QDateTime* QLocale_ToDateTime3(const QLocale* self, struct miqt_string* stringVal, int format, QCalendar* cal) { - QString stringVal_QString = QString::fromUtf8(&stringVal->data, stringVal->len); +QDateTime* QLocale_ToDateTime3(const QLocale* self, struct miqt_string stringVal, int format, QCalendar* cal) { + QString stringVal_QString = QString::fromUtf8(stringVal.data, stringVal.len); return new QDateTime(self->toDateTime(stringVal_QString, static_cast(format), *cal)); } -QDate* QLocale_ToDate4(const QLocale* self, struct miqt_string* stringVal, struct miqt_string* format, QCalendar* cal) { - QString stringVal_QString = QString::fromUtf8(&stringVal->data, stringVal->len); - QString format_QString = QString::fromUtf8(&format->data, format->len); +QDate* QLocale_ToDate4(const QLocale* self, struct miqt_string stringVal, struct miqt_string format, QCalendar* cal) { + QString stringVal_QString = QString::fromUtf8(stringVal.data, stringVal.len); + QString format_QString = QString::fromUtf8(format.data, format.len); return new QDate(self->toDate(stringVal_QString, format_QString, *cal)); } -QDateTime* QLocale_ToDateTime4(const QLocale* self, struct miqt_string* stringVal, struct miqt_string* format, QCalendar* cal) { - QString stringVal_QString = QString::fromUtf8(&stringVal->data, stringVal->len); - QString format_QString = QString::fromUtf8(&format->data, format->len); +QDateTime* QLocale_ToDateTime4(const QLocale* self, struct miqt_string stringVal, struct miqt_string format, QCalendar* cal) { + QString stringVal_QString = QString::fromUtf8(stringVal.data, stringVal.len); + QString format_QString = QString::fromUtf8(format.data, format.len); return new QDateTime(self->toDateTime(stringVal_QString, format_QString, *cal)); } -QTime* QLocale_ToTime3(const QLocale* self, struct miqt_string* stringVal, int format, QCalendar* cal) { - QString stringVal_QString = QString::fromUtf8(&stringVal->data, stringVal->len); +QTime* QLocale_ToTime3(const QLocale* self, struct miqt_string stringVal, int format, QCalendar* cal) { + QString stringVal_QString = QString::fromUtf8(stringVal.data, stringVal.len); return new QTime(self->toTime(stringVal_QString, static_cast(format), *cal)); } -QTime* QLocale_ToTime4(const QLocale* self, struct miqt_string* stringVal, struct miqt_string* format, QCalendar* cal) { - QString stringVal_QString = QString::fromUtf8(&stringVal->data, stringVal->len); - QString format_QString = QString::fromUtf8(&format->data, format->len); +QTime* QLocale_ToTime4(const QLocale* self, struct miqt_string stringVal, struct miqt_string format, QCalendar* cal) { + QString stringVal_QString = QString::fromUtf8(stringVal.data, stringVal.len); + QString format_QString = QString::fromUtf8(format.data, format.len); return new QTime(self->toTime(stringVal_QString, format_QString, *cal)); } @@ -387,32 +487,48 @@ QChar* QLocale_Exponential(const QLocale* self) { return new QChar(self->exponential()); } -struct miqt_string* QLocale_MonthName(const QLocale* self, int param1) { +struct miqt_string QLocale_MonthName(const QLocale* self, int param1) { QString _ret = self->monthName(static_cast(param1)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_StandaloneMonthName(const QLocale* self, int param1) { +struct miqt_string QLocale_StandaloneMonthName(const QLocale* self, int param1) { QString _ret = self->standaloneMonthName(static_cast(param1)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_DayName(const QLocale* self, int param1) { +struct miqt_string QLocale_DayName(const QLocale* self, int param1) { QString _ret = self->dayName(static_cast(param1)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_StandaloneDayName(const QLocale* self, int param1) { +struct miqt_string QLocale_StandaloneDayName(const QLocale* self, int param1) { QString _ret = self->standaloneDayName(static_cast(param1)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QLocale_FirstDayOfWeek(const QLocale* self) { @@ -434,18 +550,26 @@ struct miqt_array* QLocale_Weekdays(const QLocale* self) { return _out; } -struct miqt_string* QLocale_AmText(const QLocale* self) { +struct miqt_string QLocale_AmText(const QLocale* self) { QString _ret = self->amText(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_PmText(const QLocale* self) { +struct miqt_string QLocale_PmText(const QLocale* self) { QString _ret = self->pmText(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QLocale_MeasurementSystem(const QLocale* self) { @@ -462,124 +586,188 @@ int QLocale_TextDirection(const QLocale* self) { return static_cast(_ret); } -struct miqt_string* QLocale_ToUpper(const QLocale* self, struct miqt_string* str) { - QString str_QString = QString::fromUtf8(&str->data, str->len); +struct miqt_string QLocale_ToUpper(const QLocale* self, struct miqt_string str) { + QString str_QString = QString::fromUtf8(str.data, str.len); QString _ret = self->toUpper(str_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_ToLower(const QLocale* self, struct miqt_string* str) { - QString str_QString = QString::fromUtf8(&str->data, str->len); +struct miqt_string QLocale_ToLower(const QLocale* self, struct miqt_string str) { + QString str_QString = QString::fromUtf8(str.data, str.len); QString _ret = self->toLower(str_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_CurrencySymbol(const QLocale* self) { +struct miqt_string QLocale_CurrencySymbol(const QLocale* self) { QString _ret = self->currencySymbol(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_ToCurrencyString(const QLocale* self, long long param1) { +struct miqt_string QLocale_ToCurrencyString(const QLocale* self, long long param1) { QString _ret = self->toCurrencyString(static_cast(param1)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_ToCurrencyStringWithQulonglong(const QLocale* self, unsigned long long param1) { +struct miqt_string QLocale_ToCurrencyStringWithQulonglong(const QLocale* self, unsigned long long param1) { QString _ret = self->toCurrencyString(static_cast(param1)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_ToCurrencyStringWithShort(const QLocale* self, int16_t param1) { +struct miqt_string QLocale_ToCurrencyStringWithShort(const QLocale* self, int16_t param1) { QString _ret = self->toCurrencyString(static_cast(param1)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_ToCurrencyStringWithUshort(const QLocale* self, uint16_t param1) { +struct miqt_string QLocale_ToCurrencyStringWithUshort(const QLocale* self, uint16_t param1) { QString _ret = self->toCurrencyString(static_cast(param1)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_ToCurrencyStringWithInt(const QLocale* self, int param1) { +struct miqt_string QLocale_ToCurrencyStringWithInt(const QLocale* self, int param1) { QString _ret = self->toCurrencyString(static_cast(param1)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_ToCurrencyStringWithUint(const QLocale* self, unsigned int param1) { +struct miqt_string QLocale_ToCurrencyStringWithUint(const QLocale* self, unsigned int param1) { QString _ret = self->toCurrencyString(static_cast(param1)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_ToCurrencyStringWithDouble(const QLocale* self, double param1) { +struct miqt_string QLocale_ToCurrencyStringWithDouble(const QLocale* self, double param1) { QString _ret = self->toCurrencyString(static_cast(param1)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_ToCurrencyString2(const QLocale* self, double param1, struct miqt_string* symbol, int precision) { - QString symbol_QString = QString::fromUtf8(&symbol->data, symbol->len); +struct miqt_string QLocale_ToCurrencyString2(const QLocale* self, double param1, struct miqt_string symbol, int precision) { + QString symbol_QString = QString::fromUtf8(symbol.data, symbol.len); QString _ret = self->toCurrencyString(static_cast(param1), symbol_QString, static_cast(precision)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_ToCurrencyStringWithFloat(const QLocale* self, float i) { +struct miqt_string QLocale_ToCurrencyStringWithFloat(const QLocale* self, float i) { QString _ret = self->toCurrencyString(static_cast(i)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_ToCurrencyString3(const QLocale* self, float i, struct miqt_string* symbol, int precision) { - QString symbol_QString = QString::fromUtf8(&symbol->data, symbol->len); +struct miqt_string QLocale_ToCurrencyString3(const QLocale* self, float i, struct miqt_string symbol, int precision) { + QString symbol_QString = QString::fromUtf8(symbol.data, symbol.len); QString _ret = self->toCurrencyString(static_cast(i), symbol_QString, static_cast(precision)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_FormattedDataSize(QLocale* self, long long bytes) { +struct miqt_string QLocale_FormattedDataSize(QLocale* self, long long bytes) { QString _ret = self->formattedDataSize(static_cast(bytes)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_FormattedDataSizeWithBytes(const QLocale* self, long long bytes) { +struct miqt_string QLocale_FormattedDataSizeWithBytes(const QLocale* self, long long bytes) { QString _ret = self->formattedDataSize(static_cast(bytes)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } struct miqt_array* QLocale_UiLanguages(const QLocale* self) { QStringList _ret = self->uiLanguages(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -595,25 +783,37 @@ bool QLocale_OperatorNotEqual(const QLocale* self, QLocale* other) { return self->operator!=(*other); } -struct miqt_string* QLocale_LanguageToString(int language) { +struct miqt_string QLocale_LanguageToString(int language) { QString _ret = QLocale::languageToString(static_cast(language)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_CountryToString(int country) { +struct miqt_string QLocale_CountryToString(int country) { QString _ret = QLocale::countryToString(static_cast(country)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_ScriptToString(int script) { +struct miqt_string QLocale_ScriptToString(int script) { QString _ret = QLocale::scriptToString(static_cast(script)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QLocale_SetDefault(QLocale* locale) { @@ -664,301 +864,421 @@ int QLocale_NumberOptions(const QLocale* self) { return static_cast(_ret); } -struct miqt_string* QLocale_QuoteString(const QLocale* self, struct miqt_string* str) { - QString str_QString = QString::fromUtf8(&str->data, str->len); +struct miqt_string QLocale_QuoteString(const QLocale* self, struct miqt_string str) { + QString str_QString = QString::fromUtf8(str.data, str.len); QString _ret = self->quoteString(str_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_CreateSeparatedList(const QLocale* self, struct miqt_array* /* of struct miqt_string* */ strl) { +struct miqt_string QLocale_CreateSeparatedList(const QLocale* self, struct miqt_array* /* of struct miqt_string */ strl) { QStringList strl_QList; strl_QList.reserve(strl->len); - struct miqt_string** strl_arr = static_cast(strl->data); + struct miqt_string* strl_arr = static_cast(strl->data); for(size_t i = 0; i < strl->len; ++i) { - QString strl_arr_i_QString = QString::fromUtf8(&strl_arr[i]->data, strl_arr[i]->len); + QString strl_arr_i_QString = QString::fromUtf8(strl_arr[i].data, strl_arr[i].len); strl_QList.push_back(strl_arr_i_QString); } QString _ret = self->createSeparatedList(strl_QList); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -int16_t QLocale_ToShort2(const QLocale* self, struct miqt_string* s, bool* ok) { - QString s_QString = QString::fromUtf8(&s->data, s->len); +int16_t QLocale_ToShort2(const QLocale* self, struct miqt_string s, bool* ok) { + QString s_QString = QString::fromUtf8(s.data, s.len); return self->toShort(s_QString, ok); } -uint16_t QLocale_ToUShort2(const QLocale* self, struct miqt_string* s, bool* ok) { - QString s_QString = QString::fromUtf8(&s->data, s->len); +uint16_t QLocale_ToUShort2(const QLocale* self, struct miqt_string s, bool* ok) { + QString s_QString = QString::fromUtf8(s.data, s.len); ushort _ret = self->toUShort(s_QString, ok); return static_cast(_ret); } -int QLocale_ToInt2(const QLocale* self, struct miqt_string* s, bool* ok) { - QString s_QString = QString::fromUtf8(&s->data, s->len); +int QLocale_ToInt2(const QLocale* self, struct miqt_string s, bool* ok) { + QString s_QString = QString::fromUtf8(s.data, s.len); return self->toInt(s_QString, ok); } -unsigned int QLocale_ToUInt2(const QLocale* self, struct miqt_string* s, bool* ok) { - QString s_QString = QString::fromUtf8(&s->data, s->len); +unsigned int QLocale_ToUInt2(const QLocale* self, struct miqt_string s, bool* ok) { + QString s_QString = QString::fromUtf8(s.data, s.len); uint _ret = self->toUInt(s_QString, ok); return static_cast(_ret); } -long QLocale_ToLong2(const QLocale* self, struct miqt_string* s, bool* ok) { - QString s_QString = QString::fromUtf8(&s->data, s->len); +long QLocale_ToLong2(const QLocale* self, struct miqt_string s, bool* ok) { + QString s_QString = QString::fromUtf8(s.data, s.len); return self->toLong(s_QString, ok); } -unsigned long QLocale_ToULong2(const QLocale* self, struct miqt_string* s, bool* ok) { - QString s_QString = QString::fromUtf8(&s->data, s->len); +unsigned long QLocale_ToULong2(const QLocale* self, struct miqt_string s, bool* ok) { + QString s_QString = QString::fromUtf8(s.data, s.len); ulong _ret = self->toULong(s_QString, ok); return static_cast(_ret); } -long long QLocale_ToLongLong2(const QLocale* self, struct miqt_string* s, bool* ok) { - QString s_QString = QString::fromUtf8(&s->data, s->len); +long long QLocale_ToLongLong2(const QLocale* self, struct miqt_string s, bool* ok) { + QString s_QString = QString::fromUtf8(s.data, s.len); qlonglong _ret = self->toLongLong(s_QString, ok); return static_cast(_ret); } -unsigned long long QLocale_ToULongLong2(const QLocale* self, struct miqt_string* s, bool* ok) { - QString s_QString = QString::fromUtf8(&s->data, s->len); +unsigned long long QLocale_ToULongLong2(const QLocale* self, struct miqt_string s, bool* ok) { + QString s_QString = QString::fromUtf8(s.data, s.len); qulonglong _ret = self->toULongLong(s_QString, ok); return static_cast(_ret); } -float QLocale_ToFloat2(const QLocale* self, struct miqt_string* s, bool* ok) { - QString s_QString = QString::fromUtf8(&s->data, s->len); +float QLocale_ToFloat2(const QLocale* self, struct miqt_string s, bool* ok) { + QString s_QString = QString::fromUtf8(s.data, s.len); return self->toFloat(s_QString, ok); } -double QLocale_ToDouble2(const QLocale* self, struct miqt_string* s, bool* ok) { - QString s_QString = QString::fromUtf8(&s->data, s->len); +double QLocale_ToDouble2(const QLocale* self, struct miqt_string s, bool* ok) { + QString s_QString = QString::fromUtf8(s.data, s.len); return self->toDouble(s_QString, ok); } -struct miqt_string* QLocale_ToString22(const QLocale* self, double i, char f) { +struct miqt_string QLocale_ToString22(const QLocale* self, double i, char f) { QString _ret = self->toString(static_cast(i), static_cast(f)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_ToString32(const QLocale* self, double i, char f, int prec) { +struct miqt_string QLocale_ToString32(const QLocale* self, double i, char f, int prec) { QString _ret = self->toString(static_cast(i), static_cast(f), static_cast(prec)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_ToString23(const QLocale* self, float i, char f) { +struct miqt_string QLocale_ToString23(const QLocale* self, float i, char f) { QString _ret = self->toString(static_cast(i), static_cast(f)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_ToString33(const QLocale* self, float i, char f, int prec) { +struct miqt_string QLocale_ToString33(const QLocale* self, float i, char f, int prec) { QString _ret = self->toString(static_cast(i), static_cast(f), static_cast(prec)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_ToString24(const QLocale* self, QDate* date, int format) { +struct miqt_string QLocale_ToString24(const QLocale* self, QDate* date, int format) { QString _ret = self->toString(*date, static_cast(format)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_ToString25(const QLocale* self, QTime* time, int format) { +struct miqt_string QLocale_ToString25(const QLocale* self, QTime* time, int format) { QString _ret = self->toString(*time, static_cast(format)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_ToString26(const QLocale* self, QDateTime* dateTime, int format) { +struct miqt_string QLocale_ToString26(const QLocale* self, QDateTime* dateTime, int format) { QString _ret = self->toString(*dateTime, static_cast(format)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_DateFormat1(const QLocale* self, int format) { +struct miqt_string QLocale_DateFormat1(const QLocale* self, int format) { QString _ret = self->dateFormat(static_cast(format)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_TimeFormat1(const QLocale* self, int format) { +struct miqt_string QLocale_TimeFormat1(const QLocale* self, int format) { QString _ret = self->timeFormat(static_cast(format)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_DateTimeFormat1(const QLocale* self, int format) { +struct miqt_string QLocale_DateTimeFormat1(const QLocale* self, int format) { QString _ret = self->dateTimeFormat(static_cast(format)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -QDate* QLocale_ToDate22(const QLocale* self, struct miqt_string* stringVal, int param2) { - QString stringVal_QString = QString::fromUtf8(&stringVal->data, stringVal->len); +QDate* QLocale_ToDate22(const QLocale* self, struct miqt_string stringVal, int param2) { + QString stringVal_QString = QString::fromUtf8(stringVal.data, stringVal.len); return new QDate(self->toDate(stringVal_QString, static_cast(param2))); } -QTime* QLocale_ToTime22(const QLocale* self, struct miqt_string* stringVal, int param2) { - QString stringVal_QString = QString::fromUtf8(&stringVal->data, stringVal->len); +QTime* QLocale_ToTime22(const QLocale* self, struct miqt_string stringVal, int param2) { + QString stringVal_QString = QString::fromUtf8(stringVal.data, stringVal.len); return new QTime(self->toTime(stringVal_QString, static_cast(param2))); } -QDateTime* QLocale_ToDateTime22(const QLocale* self, struct miqt_string* stringVal, int format) { - QString stringVal_QString = QString::fromUtf8(&stringVal->data, stringVal->len); +QDateTime* QLocale_ToDateTime22(const QLocale* self, struct miqt_string stringVal, int format) { + QString stringVal_QString = QString::fromUtf8(stringVal.data, stringVal.len); return new QDateTime(self->toDateTime(stringVal_QString, static_cast(format))); } -struct miqt_string* QLocale_MonthName2(const QLocale* self, int param1, int format) { +struct miqt_string QLocale_MonthName2(const QLocale* self, int param1, int format) { QString _ret = self->monthName(static_cast(param1), static_cast(format)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_StandaloneMonthName2(const QLocale* self, int param1, int format) { +struct miqt_string QLocale_StandaloneMonthName2(const QLocale* self, int param1, int format) { QString _ret = self->standaloneMonthName(static_cast(param1), static_cast(format)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_DayName2(const QLocale* self, int param1, int format) { +struct miqt_string QLocale_DayName2(const QLocale* self, int param1, int format) { QString _ret = self->dayName(static_cast(param1), static_cast(format)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_StandaloneDayName2(const QLocale* self, int param1, int format) { +struct miqt_string QLocale_StandaloneDayName2(const QLocale* self, int param1, int format) { QString _ret = self->standaloneDayName(static_cast(param1), static_cast(format)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_CurrencySymbol1(const QLocale* self, int param1) { +struct miqt_string QLocale_CurrencySymbol1(const QLocale* self, int param1) { QString _ret = self->currencySymbol(static_cast(param1)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_ToCurrencyString22(const QLocale* self, long long param1, struct miqt_string* symbol) { - QString symbol_QString = QString::fromUtf8(&symbol->data, symbol->len); +struct miqt_string QLocale_ToCurrencyString22(const QLocale* self, long long param1, struct miqt_string symbol) { + QString symbol_QString = QString::fromUtf8(symbol.data, symbol.len); QString _ret = self->toCurrencyString(static_cast(param1), symbol_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_ToCurrencyString23(const QLocale* self, unsigned long long param1, struct miqt_string* symbol) { - QString symbol_QString = QString::fromUtf8(&symbol->data, symbol->len); +struct miqt_string QLocale_ToCurrencyString23(const QLocale* self, unsigned long long param1, struct miqt_string symbol) { + QString symbol_QString = QString::fromUtf8(symbol.data, symbol.len); QString _ret = self->toCurrencyString(static_cast(param1), symbol_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_ToCurrencyString24(const QLocale* self, int16_t param1, struct miqt_string* symbol) { - QString symbol_QString = QString::fromUtf8(&symbol->data, symbol->len); +struct miqt_string QLocale_ToCurrencyString24(const QLocale* self, int16_t param1, struct miqt_string symbol) { + QString symbol_QString = QString::fromUtf8(symbol.data, symbol.len); QString _ret = self->toCurrencyString(static_cast(param1), symbol_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_ToCurrencyString25(const QLocale* self, uint16_t param1, struct miqt_string* symbol) { - QString symbol_QString = QString::fromUtf8(&symbol->data, symbol->len); +struct miqt_string QLocale_ToCurrencyString25(const QLocale* self, uint16_t param1, struct miqt_string symbol) { + QString symbol_QString = QString::fromUtf8(symbol.data, symbol.len); QString _ret = self->toCurrencyString(static_cast(param1), symbol_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_ToCurrencyString26(const QLocale* self, int param1, struct miqt_string* symbol) { - QString symbol_QString = QString::fromUtf8(&symbol->data, symbol->len); +struct miqt_string QLocale_ToCurrencyString26(const QLocale* self, int param1, struct miqt_string symbol) { + QString symbol_QString = QString::fromUtf8(symbol.data, symbol.len); QString _ret = self->toCurrencyString(static_cast(param1), symbol_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_ToCurrencyString27(const QLocale* self, unsigned int param1, struct miqt_string* symbol) { - QString symbol_QString = QString::fromUtf8(&symbol->data, symbol->len); +struct miqt_string QLocale_ToCurrencyString27(const QLocale* self, unsigned int param1, struct miqt_string symbol) { + QString symbol_QString = QString::fromUtf8(symbol.data, symbol.len); QString _ret = self->toCurrencyString(static_cast(param1), symbol_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_ToCurrencyString28(const QLocale* self, double param1, struct miqt_string* symbol) { - QString symbol_QString = QString::fromUtf8(&symbol->data, symbol->len); +struct miqt_string QLocale_ToCurrencyString28(const QLocale* self, double param1, struct miqt_string symbol) { + QString symbol_QString = QString::fromUtf8(symbol.data, symbol.len); QString _ret = self->toCurrencyString(static_cast(param1), symbol_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_ToCurrencyString29(const QLocale* self, float i, struct miqt_string* symbol) { - QString symbol_QString = QString::fromUtf8(&symbol->data, symbol->len); +struct miqt_string QLocale_ToCurrencyString29(const QLocale* self, float i, struct miqt_string symbol) { + QString symbol_QString = QString::fromUtf8(symbol.data, symbol.len); QString _ret = self->toCurrencyString(static_cast(i), symbol_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_FormattedDataSize2(QLocale* self, long long bytes, int precision) { +struct miqt_string QLocale_FormattedDataSize2(QLocale* self, long long bytes, int precision) { QString _ret = self->formattedDataSize(static_cast(bytes), static_cast(precision)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_FormattedDataSize3(QLocale* self, long long bytes, int precision, int format) { +struct miqt_string QLocale_FormattedDataSize3(QLocale* self, long long bytes, int precision, int format) { QString _ret = self->formattedDataSize(static_cast(bytes), static_cast(precision), static_cast(format)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_FormattedDataSize22(const QLocale* self, long long bytes, int precision) { +struct miqt_string QLocale_FormattedDataSize22(const QLocale* self, long long bytes, int precision) { QString _ret = self->formattedDataSize(static_cast(bytes), static_cast(precision)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_FormattedDataSize32(const QLocale* self, long long bytes, int precision, int format) { +struct miqt_string QLocale_FormattedDataSize32(const QLocale* self, long long bytes, int precision, int format) { QString _ret = self->formattedDataSize(static_cast(bytes), static_cast(precision), static_cast(format)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QLocale_QuoteString2(const QLocale* self, struct miqt_string* str, int style) { - QString str_QString = QString::fromUtf8(&str->data, str->len); +struct miqt_string QLocale_QuoteString2(const QLocale* self, struct miqt_string str, int style) { + QString str_QString = QString::fromUtf8(str.data, str.len); QString _ret = self->quoteString(str_QString, static_cast(style)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QLocale_Delete(QLocale* self) { diff --git a/qt/gen_qlocale.go b/qt/gen_qlocale.go index aa837f3c..4ada7a7b 100644 --- a/qt/gen_qlocale.go +++ b/qt/gen_qlocale.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -929,9 +928,11 @@ func NewQLocale() *QLocale { // NewQLocale2 constructs a new QLocale object. func NewQLocale2(name string) *QLocale { - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - ret := C.QLocale_new2((*C.struct_miqt_string)(name_ms)) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + ret := C.QLocale_new2(name_ms) return newQLocale(ret) } @@ -980,361 +981,423 @@ func (this *QLocale) Country() QLocale__Country { } func (this *QLocale) Name() string { - var _ms *C.struct_miqt_string = C.QLocale_Name(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLocale_Name(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) Bcp47Name() string { - var _ms *C.struct_miqt_string = C.QLocale_Bcp47Name(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLocale_Bcp47Name(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) NativeLanguageName() string { - var _ms *C.struct_miqt_string = C.QLocale_NativeLanguageName(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLocale_NativeLanguageName(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) NativeCountryName() string { - var _ms *C.struct_miqt_string = C.QLocale_NativeCountryName(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLocale_NativeCountryName(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) ToShort(s string) int16 { - s_ms := libmiqt.Strdupg(s) - defer C.free(s_ms) - return (int16)(C.QLocale_ToShort(this.h, (*C.struct_miqt_string)(s_ms))) + s_ms := C.struct_miqt_string{} + s_ms.data = C.CString(s) + s_ms.len = C.size_t(len(s)) + defer C.free(unsafe.Pointer(s_ms.data)) + return (int16)(C.QLocale_ToShort(this.h, s_ms)) } func (this *QLocale) ToUShort(s string) uint16 { - s_ms := libmiqt.Strdupg(s) - defer C.free(s_ms) - return (uint16)(C.QLocale_ToUShort(this.h, (*C.struct_miqt_string)(s_ms))) + s_ms := C.struct_miqt_string{} + s_ms.data = C.CString(s) + s_ms.len = C.size_t(len(s)) + defer C.free(unsafe.Pointer(s_ms.data)) + return (uint16)(C.QLocale_ToUShort(this.h, s_ms)) } func (this *QLocale) ToInt(s string) int { - s_ms := libmiqt.Strdupg(s) - defer C.free(s_ms) - return (int)(C.QLocale_ToInt(this.h, (*C.struct_miqt_string)(s_ms))) + s_ms := C.struct_miqt_string{} + s_ms.data = C.CString(s) + s_ms.len = C.size_t(len(s)) + defer C.free(unsafe.Pointer(s_ms.data)) + return (int)(C.QLocale_ToInt(this.h, s_ms)) } func (this *QLocale) ToUInt(s string) uint { - s_ms := libmiqt.Strdupg(s) - defer C.free(s_ms) - return (uint)(C.QLocale_ToUInt(this.h, (*C.struct_miqt_string)(s_ms))) + s_ms := C.struct_miqt_string{} + s_ms.data = C.CString(s) + s_ms.len = C.size_t(len(s)) + defer C.free(unsafe.Pointer(s_ms.data)) + return (uint)(C.QLocale_ToUInt(this.h, s_ms)) } func (this *QLocale) ToLong(s string) int64 { - s_ms := libmiqt.Strdupg(s) - defer C.free(s_ms) - return (int64)(C.QLocale_ToLong(this.h, (*C.struct_miqt_string)(s_ms))) + s_ms := C.struct_miqt_string{} + s_ms.data = C.CString(s) + s_ms.len = C.size_t(len(s)) + defer C.free(unsafe.Pointer(s_ms.data)) + return (int64)(C.QLocale_ToLong(this.h, s_ms)) } func (this *QLocale) ToULong(s string) uint64 { - s_ms := libmiqt.Strdupg(s) - defer C.free(s_ms) - return (uint64)(C.QLocale_ToULong(this.h, (*C.struct_miqt_string)(s_ms))) + s_ms := C.struct_miqt_string{} + s_ms.data = C.CString(s) + s_ms.len = C.size_t(len(s)) + defer C.free(unsafe.Pointer(s_ms.data)) + return (uint64)(C.QLocale_ToULong(this.h, s_ms)) } func (this *QLocale) ToLongLong(s string) int64 { - s_ms := libmiqt.Strdupg(s) - defer C.free(s_ms) - return (int64)(C.QLocale_ToLongLong(this.h, (*C.struct_miqt_string)(s_ms))) + s_ms := C.struct_miqt_string{} + s_ms.data = C.CString(s) + s_ms.len = C.size_t(len(s)) + defer C.free(unsafe.Pointer(s_ms.data)) + return (int64)(C.QLocale_ToLongLong(this.h, s_ms)) } func (this *QLocale) ToULongLong(s string) uint64 { - s_ms := libmiqt.Strdupg(s) - defer C.free(s_ms) - return (uint64)(C.QLocale_ToULongLong(this.h, (*C.struct_miqt_string)(s_ms))) + s_ms := C.struct_miqt_string{} + s_ms.data = C.CString(s) + s_ms.len = C.size_t(len(s)) + defer C.free(unsafe.Pointer(s_ms.data)) + return (uint64)(C.QLocale_ToULongLong(this.h, s_ms)) } func (this *QLocale) ToFloat(s string) float32 { - s_ms := libmiqt.Strdupg(s) - defer C.free(s_ms) - return (float32)(C.QLocale_ToFloat(this.h, (*C.struct_miqt_string)(s_ms))) + s_ms := C.struct_miqt_string{} + s_ms.data = C.CString(s) + s_ms.len = C.size_t(len(s)) + defer C.free(unsafe.Pointer(s_ms.data)) + return (float32)(C.QLocale_ToFloat(this.h, s_ms)) } func (this *QLocale) ToDouble(s string) float64 { - s_ms := libmiqt.Strdupg(s) - defer C.free(s_ms) - return (float64)(C.QLocale_ToDouble(this.h, (*C.struct_miqt_string)(s_ms))) + s_ms := C.struct_miqt_string{} + s_ms.data = C.CString(s) + s_ms.len = C.size_t(len(s)) + defer C.free(unsafe.Pointer(s_ms.data)) + return (float64)(C.QLocale_ToDouble(this.h, s_ms)) } func (this *QLocale) ToString(i int64) string { - var _ms *C.struct_miqt_string = C.QLocale_ToString(this.h, (C.longlong)(i)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLocale_ToString(this.h, (C.longlong)(i)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) ToStringWithQulonglong(i uint64) string { - var _ms *C.struct_miqt_string = C.QLocale_ToStringWithQulonglong(this.h, (C.ulonglong)(i)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLocale_ToStringWithQulonglong(this.h, (C.ulonglong)(i)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) ToStringWithLong(i int64) string { - var _ms *C.struct_miqt_string = C.QLocale_ToStringWithLong(this.h, (C.long)(i)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLocale_ToStringWithLong(this.h, (C.long)(i)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) ToStringWithUlong(i uint64) string { - var _ms *C.struct_miqt_string = C.QLocale_ToStringWithUlong(this.h, (C.ulong)(i)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLocale_ToStringWithUlong(this.h, (C.ulong)(i)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) ToStringWithShort(i int16) string { - var _ms *C.struct_miqt_string = C.QLocale_ToStringWithShort(this.h, (C.int16_t)(i)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLocale_ToStringWithShort(this.h, (C.int16_t)(i)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) ToStringWithUshort(i uint16) string { - var _ms *C.struct_miqt_string = C.QLocale_ToStringWithUshort(this.h, (C.uint16_t)(i)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLocale_ToStringWithUshort(this.h, (C.uint16_t)(i)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) ToStringWithInt(i int) string { - var _ms *C.struct_miqt_string = C.QLocale_ToStringWithInt(this.h, (C.int)(i)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLocale_ToStringWithInt(this.h, (C.int)(i)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) ToStringWithUint(i uint) string { - var _ms *C.struct_miqt_string = C.QLocale_ToStringWithUint(this.h, (C.uint)(i)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLocale_ToStringWithUint(this.h, (C.uint)(i)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) ToStringWithDouble(i float64) string { - var _ms *C.struct_miqt_string = C.QLocale_ToStringWithDouble(this.h, (C.double)(i)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLocale_ToStringWithDouble(this.h, (C.double)(i)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) ToStringWithFloat(i float32) string { - var _ms *C.struct_miqt_string = C.QLocale_ToStringWithFloat(this.h, (C.float)(i)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLocale_ToStringWithFloat(this.h, (C.float)(i)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) ToString2(date *QDate, formatStr string) string { - formatStr_ms := libmiqt.Strdupg(formatStr) - defer C.free(formatStr_ms) - var _ms *C.struct_miqt_string = C.QLocale_ToString2(this.h, date.cPointer(), (*C.struct_miqt_string)(formatStr_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + formatStr_ms := C.struct_miqt_string{} + formatStr_ms.data = C.CString(formatStr) + formatStr_ms.len = C.size_t(len(formatStr)) + defer C.free(unsafe.Pointer(formatStr_ms.data)) + var _ms C.struct_miqt_string = C.QLocale_ToString2(this.h, date.cPointer(), formatStr_ms) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) ToString3(time *QTime, formatStr string) string { - formatStr_ms := libmiqt.Strdupg(formatStr) - defer C.free(formatStr_ms) - var _ms *C.struct_miqt_string = C.QLocale_ToString3(this.h, time.cPointer(), (*C.struct_miqt_string)(formatStr_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + formatStr_ms := C.struct_miqt_string{} + formatStr_ms.data = C.CString(formatStr) + formatStr_ms.len = C.size_t(len(formatStr)) + defer C.free(unsafe.Pointer(formatStr_ms.data)) + var _ms C.struct_miqt_string = C.QLocale_ToString3(this.h, time.cPointer(), formatStr_ms) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) ToString4(dateTime *QDateTime, format string) string { - format_ms := libmiqt.Strdupg(format) - defer C.free(format_ms) - var _ms *C.struct_miqt_string = C.QLocale_ToString4(this.h, dateTime.cPointer(), (*C.struct_miqt_string)(format_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + format_ms := C.struct_miqt_string{} + format_ms.data = C.CString(format) + format_ms.len = C.size_t(len(format)) + defer C.free(unsafe.Pointer(format_ms.data)) + var _ms C.struct_miqt_string = C.QLocale_ToString4(this.h, dateTime.cPointer(), format_ms) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) ToStringWithDate(date *QDate) string { - var _ms *C.struct_miqt_string = C.QLocale_ToStringWithDate(this.h, date.cPointer()) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLocale_ToStringWithDate(this.h, date.cPointer()) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) ToStringWithTime(time *QTime) string { - var _ms *C.struct_miqt_string = C.QLocale_ToStringWithTime(this.h, time.cPointer()) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLocale_ToStringWithTime(this.h, time.cPointer()) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) ToStringWithDateTime(dateTime *QDateTime) string { - var _ms *C.struct_miqt_string = C.QLocale_ToStringWithDateTime(this.h, dateTime.cPointer()) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLocale_ToStringWithDateTime(this.h, dateTime.cPointer()) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) ToString9(date *QDate, format QLocale__FormatType, cal QCalendar) string { - var _ms *C.struct_miqt_string = C.QLocale_ToString9(this.h, date.cPointer(), (C.int)(format), cal.cPointer()) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLocale_ToString9(this.h, date.cPointer(), (C.int)(format), cal.cPointer()) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) ToString10(dateTime *QDateTime, format QLocale__FormatType, cal QCalendar) string { - var _ms *C.struct_miqt_string = C.QLocale_ToString10(this.h, dateTime.cPointer(), (C.int)(format), cal.cPointer()) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLocale_ToString10(this.h, dateTime.cPointer(), (C.int)(format), cal.cPointer()) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) DateFormat() string { - var _ms *C.struct_miqt_string = C.QLocale_DateFormat(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLocale_DateFormat(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) TimeFormat() string { - var _ms *C.struct_miqt_string = C.QLocale_TimeFormat(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLocale_TimeFormat(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) DateTimeFormat() string { - var _ms *C.struct_miqt_string = C.QLocale_DateTimeFormat(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLocale_DateTimeFormat(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) ToDate(stringVal string) *QDate { - stringVal_ms := libmiqt.Strdupg(stringVal) - defer C.free(stringVal_ms) - _ret := C.QLocale_ToDate(this.h, (*C.struct_miqt_string)(stringVal_ms)) + stringVal_ms := C.struct_miqt_string{} + stringVal_ms.data = C.CString(stringVal) + stringVal_ms.len = C.size_t(len(stringVal)) + defer C.free(unsafe.Pointer(stringVal_ms.data)) + _ret := C.QLocale_ToDate(this.h, stringVal_ms) _goptr := newQDate(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QLocale) ToTime(stringVal string) *QTime { - stringVal_ms := libmiqt.Strdupg(stringVal) - defer C.free(stringVal_ms) - _ret := C.QLocale_ToTime(this.h, (*C.struct_miqt_string)(stringVal_ms)) + stringVal_ms := C.struct_miqt_string{} + stringVal_ms.data = C.CString(stringVal) + stringVal_ms.len = C.size_t(len(stringVal)) + defer C.free(unsafe.Pointer(stringVal_ms.data)) + _ret := C.QLocale_ToTime(this.h, stringVal_ms) _goptr := newQTime(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QLocale) ToDateTime(stringVal string) *QDateTime { - stringVal_ms := libmiqt.Strdupg(stringVal) - defer C.free(stringVal_ms) - _ret := C.QLocale_ToDateTime(this.h, (*C.struct_miqt_string)(stringVal_ms)) + stringVal_ms := C.struct_miqt_string{} + stringVal_ms.data = C.CString(stringVal) + stringVal_ms.len = C.size_t(len(stringVal)) + defer C.free(unsafe.Pointer(stringVal_ms.data)) + _ret := C.QLocale_ToDateTime(this.h, stringVal_ms) _goptr := newQDateTime(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QLocale) ToDate2(stringVal string, format string) *QDate { - stringVal_ms := libmiqt.Strdupg(stringVal) - defer C.free(stringVal_ms) - format_ms := libmiqt.Strdupg(format) - defer C.free(format_ms) - _ret := C.QLocale_ToDate2(this.h, (*C.struct_miqt_string)(stringVal_ms), (*C.struct_miqt_string)(format_ms)) + stringVal_ms := C.struct_miqt_string{} + stringVal_ms.data = C.CString(stringVal) + stringVal_ms.len = C.size_t(len(stringVal)) + defer C.free(unsafe.Pointer(stringVal_ms.data)) + format_ms := C.struct_miqt_string{} + format_ms.data = C.CString(format) + format_ms.len = C.size_t(len(format)) + defer C.free(unsafe.Pointer(format_ms.data)) + _ret := C.QLocale_ToDate2(this.h, stringVal_ms, format_ms) _goptr := newQDate(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QLocale) ToTime2(stringVal string, format string) *QTime { - stringVal_ms := libmiqt.Strdupg(stringVal) - defer C.free(stringVal_ms) - format_ms := libmiqt.Strdupg(format) - defer C.free(format_ms) - _ret := C.QLocale_ToTime2(this.h, (*C.struct_miqt_string)(stringVal_ms), (*C.struct_miqt_string)(format_ms)) + stringVal_ms := C.struct_miqt_string{} + stringVal_ms.data = C.CString(stringVal) + stringVal_ms.len = C.size_t(len(stringVal)) + defer C.free(unsafe.Pointer(stringVal_ms.data)) + format_ms := C.struct_miqt_string{} + format_ms.data = C.CString(format) + format_ms.len = C.size_t(len(format)) + defer C.free(unsafe.Pointer(format_ms.data)) + _ret := C.QLocale_ToTime2(this.h, stringVal_ms, format_ms) _goptr := newQTime(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QLocale) ToDateTime2(stringVal string, format string) *QDateTime { - stringVal_ms := libmiqt.Strdupg(stringVal) - defer C.free(stringVal_ms) - format_ms := libmiqt.Strdupg(format) - defer C.free(format_ms) - _ret := C.QLocale_ToDateTime2(this.h, (*C.struct_miqt_string)(stringVal_ms), (*C.struct_miqt_string)(format_ms)) + stringVal_ms := C.struct_miqt_string{} + stringVal_ms.data = C.CString(stringVal) + stringVal_ms.len = C.size_t(len(stringVal)) + defer C.free(unsafe.Pointer(stringVal_ms.data)) + format_ms := C.struct_miqt_string{} + format_ms.data = C.CString(format) + format_ms.len = C.size_t(len(format)) + defer C.free(unsafe.Pointer(format_ms.data)) + _ret := C.QLocale_ToDateTime2(this.h, stringVal_ms, format_ms) _goptr := newQDateTime(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QLocale) ToDate3(stringVal string, format QLocale__FormatType, cal QCalendar) *QDate { - stringVal_ms := libmiqt.Strdupg(stringVal) - defer C.free(stringVal_ms) - _ret := C.QLocale_ToDate3(this.h, (*C.struct_miqt_string)(stringVal_ms), (C.int)(format), cal.cPointer()) + stringVal_ms := C.struct_miqt_string{} + stringVal_ms.data = C.CString(stringVal) + stringVal_ms.len = C.size_t(len(stringVal)) + defer C.free(unsafe.Pointer(stringVal_ms.data)) + _ret := C.QLocale_ToDate3(this.h, stringVal_ms, (C.int)(format), cal.cPointer()) _goptr := newQDate(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QLocale) ToDateTime3(stringVal string, format QLocale__FormatType, cal QCalendar) *QDateTime { - stringVal_ms := libmiqt.Strdupg(stringVal) - defer C.free(stringVal_ms) - _ret := C.QLocale_ToDateTime3(this.h, (*C.struct_miqt_string)(stringVal_ms), (C.int)(format), cal.cPointer()) + stringVal_ms := C.struct_miqt_string{} + stringVal_ms.data = C.CString(stringVal) + stringVal_ms.len = C.size_t(len(stringVal)) + defer C.free(unsafe.Pointer(stringVal_ms.data)) + _ret := C.QLocale_ToDateTime3(this.h, stringVal_ms, (C.int)(format), cal.cPointer()) _goptr := newQDateTime(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QLocale) ToDate4(stringVal string, format string, cal QCalendar) *QDate { - stringVal_ms := libmiqt.Strdupg(stringVal) - defer C.free(stringVal_ms) - format_ms := libmiqt.Strdupg(format) - defer C.free(format_ms) - _ret := C.QLocale_ToDate4(this.h, (*C.struct_miqt_string)(stringVal_ms), (*C.struct_miqt_string)(format_ms), cal.cPointer()) + stringVal_ms := C.struct_miqt_string{} + stringVal_ms.data = C.CString(stringVal) + stringVal_ms.len = C.size_t(len(stringVal)) + defer C.free(unsafe.Pointer(stringVal_ms.data)) + format_ms := C.struct_miqt_string{} + format_ms.data = C.CString(format) + format_ms.len = C.size_t(len(format)) + defer C.free(unsafe.Pointer(format_ms.data)) + _ret := C.QLocale_ToDate4(this.h, stringVal_ms, format_ms, cal.cPointer()) _goptr := newQDate(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QLocale) ToDateTime4(stringVal string, format string, cal QCalendar) *QDateTime { - stringVal_ms := libmiqt.Strdupg(stringVal) - defer C.free(stringVal_ms) - format_ms := libmiqt.Strdupg(format) - defer C.free(format_ms) - _ret := C.QLocale_ToDateTime4(this.h, (*C.struct_miqt_string)(stringVal_ms), (*C.struct_miqt_string)(format_ms), cal.cPointer()) + stringVal_ms := C.struct_miqt_string{} + stringVal_ms.data = C.CString(stringVal) + stringVal_ms.len = C.size_t(len(stringVal)) + defer C.free(unsafe.Pointer(stringVal_ms.data)) + format_ms := C.struct_miqt_string{} + format_ms.data = C.CString(format) + format_ms.len = C.size_t(len(format)) + defer C.free(unsafe.Pointer(format_ms.data)) + _ret := C.QLocale_ToDateTime4(this.h, stringVal_ms, format_ms, cal.cPointer()) _goptr := newQDateTime(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QLocale) ToTime3(stringVal string, format QLocale__FormatType, cal QCalendar) *QTime { - stringVal_ms := libmiqt.Strdupg(stringVal) - defer C.free(stringVal_ms) - _ret := C.QLocale_ToTime3(this.h, (*C.struct_miqt_string)(stringVal_ms), (C.int)(format), cal.cPointer()) + stringVal_ms := C.struct_miqt_string{} + stringVal_ms.data = C.CString(stringVal) + stringVal_ms.len = C.size_t(len(stringVal)) + defer C.free(unsafe.Pointer(stringVal_ms.data)) + _ret := C.QLocale_ToTime3(this.h, stringVal_ms, (C.int)(format), cal.cPointer()) _goptr := newQTime(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QLocale) ToTime4(stringVal string, format string, cal QCalendar) *QTime { - stringVal_ms := libmiqt.Strdupg(stringVal) - defer C.free(stringVal_ms) - format_ms := libmiqt.Strdupg(format) - defer C.free(format_ms) - _ret := C.QLocale_ToTime4(this.h, (*C.struct_miqt_string)(stringVal_ms), (*C.struct_miqt_string)(format_ms), cal.cPointer()) + stringVal_ms := C.struct_miqt_string{} + stringVal_ms.data = C.CString(stringVal) + stringVal_ms.len = C.size_t(len(stringVal)) + defer C.free(unsafe.Pointer(stringVal_ms.data)) + format_ms := C.struct_miqt_string{} + format_ms.data = C.CString(format) + format_ms.len = C.size_t(len(format)) + defer C.free(unsafe.Pointer(format_ms.data)) + _ret := C.QLocale_ToTime4(this.h, stringVal_ms, format_ms, cal.cPointer()) _goptr := newQTime(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -1390,30 +1453,30 @@ func (this *QLocale) Exponential() *QChar { } func (this *QLocale) MonthName(param1 int) string { - var _ms *C.struct_miqt_string = C.QLocale_MonthName(this.h, (C.int)(param1)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLocale_MonthName(this.h, (C.int)(param1)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) StandaloneMonthName(param1 int) string { - var _ms *C.struct_miqt_string = C.QLocale_StandaloneMonthName(this.h, (C.int)(param1)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLocale_StandaloneMonthName(this.h, (C.int)(param1)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) DayName(param1 int) string { - var _ms *C.struct_miqt_string = C.QLocale_DayName(this.h, (C.int)(param1)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLocale_DayName(this.h, (C.int)(param1)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) StandaloneDayName(param1 int) string { - var _ms *C.struct_miqt_string = C.QLocale_StandaloneDayName(this.h, (C.int)(param1)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLocale_StandaloneDayName(this.h, (C.int)(param1)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -1433,16 +1496,16 @@ func (this *QLocale) Weekdays() []DayOfWeek { } func (this *QLocale) AmText() string { - var _ms *C.struct_miqt_string = C.QLocale_AmText(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLocale_AmText(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) PmText() string { - var _ms *C.struct_miqt_string = C.QLocale_PmText(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLocale_PmText(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -1462,126 +1525,134 @@ func (this *QLocale) TextDirection() LayoutDirection { } func (this *QLocale) ToUpper(str string) string { - str_ms := libmiqt.Strdupg(str) - defer C.free(str_ms) - var _ms *C.struct_miqt_string = C.QLocale_ToUpper(this.h, (*C.struct_miqt_string)(str_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + str_ms := C.struct_miqt_string{} + str_ms.data = C.CString(str) + str_ms.len = C.size_t(len(str)) + defer C.free(unsafe.Pointer(str_ms.data)) + var _ms C.struct_miqt_string = C.QLocale_ToUpper(this.h, str_ms) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) ToLower(str string) string { - str_ms := libmiqt.Strdupg(str) - defer C.free(str_ms) - var _ms *C.struct_miqt_string = C.QLocale_ToLower(this.h, (*C.struct_miqt_string)(str_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + str_ms := C.struct_miqt_string{} + str_ms.data = C.CString(str) + str_ms.len = C.size_t(len(str)) + defer C.free(unsafe.Pointer(str_ms.data)) + var _ms C.struct_miqt_string = C.QLocale_ToLower(this.h, str_ms) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) CurrencySymbol() string { - var _ms *C.struct_miqt_string = C.QLocale_CurrencySymbol(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLocale_CurrencySymbol(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) ToCurrencyString(param1 int64) string { - var _ms *C.struct_miqt_string = C.QLocale_ToCurrencyString(this.h, (C.longlong)(param1)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLocale_ToCurrencyString(this.h, (C.longlong)(param1)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) ToCurrencyStringWithQulonglong(param1 uint64) string { - var _ms *C.struct_miqt_string = C.QLocale_ToCurrencyStringWithQulonglong(this.h, (C.ulonglong)(param1)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLocale_ToCurrencyStringWithQulonglong(this.h, (C.ulonglong)(param1)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) ToCurrencyStringWithShort(param1 int16) string { - var _ms *C.struct_miqt_string = C.QLocale_ToCurrencyStringWithShort(this.h, (C.int16_t)(param1)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLocale_ToCurrencyStringWithShort(this.h, (C.int16_t)(param1)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) ToCurrencyStringWithUshort(param1 uint16) string { - var _ms *C.struct_miqt_string = C.QLocale_ToCurrencyStringWithUshort(this.h, (C.uint16_t)(param1)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLocale_ToCurrencyStringWithUshort(this.h, (C.uint16_t)(param1)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) ToCurrencyStringWithInt(param1 int) string { - var _ms *C.struct_miqt_string = C.QLocale_ToCurrencyStringWithInt(this.h, (C.int)(param1)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLocale_ToCurrencyStringWithInt(this.h, (C.int)(param1)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) ToCurrencyStringWithUint(param1 uint) string { - var _ms *C.struct_miqt_string = C.QLocale_ToCurrencyStringWithUint(this.h, (C.uint)(param1)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLocale_ToCurrencyStringWithUint(this.h, (C.uint)(param1)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) ToCurrencyStringWithDouble(param1 float64) string { - var _ms *C.struct_miqt_string = C.QLocale_ToCurrencyStringWithDouble(this.h, (C.double)(param1)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLocale_ToCurrencyStringWithDouble(this.h, (C.double)(param1)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) ToCurrencyString2(param1 float64, symbol string, precision int) string { - symbol_ms := libmiqt.Strdupg(symbol) - defer C.free(symbol_ms) - var _ms *C.struct_miqt_string = C.QLocale_ToCurrencyString2(this.h, (C.double)(param1), (*C.struct_miqt_string)(symbol_ms), (C.int)(precision)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + symbol_ms := C.struct_miqt_string{} + symbol_ms.data = C.CString(symbol) + symbol_ms.len = C.size_t(len(symbol)) + defer C.free(unsafe.Pointer(symbol_ms.data)) + var _ms C.struct_miqt_string = C.QLocale_ToCurrencyString2(this.h, (C.double)(param1), symbol_ms, (C.int)(precision)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) ToCurrencyStringWithFloat(i float32) string { - var _ms *C.struct_miqt_string = C.QLocale_ToCurrencyStringWithFloat(this.h, (C.float)(i)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLocale_ToCurrencyStringWithFloat(this.h, (C.float)(i)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) ToCurrencyString3(i float32, symbol string, precision int) string { - symbol_ms := libmiqt.Strdupg(symbol) - defer C.free(symbol_ms) - var _ms *C.struct_miqt_string = C.QLocale_ToCurrencyString3(this.h, (C.float)(i), (*C.struct_miqt_string)(symbol_ms), (C.int)(precision)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + symbol_ms := C.struct_miqt_string{} + symbol_ms.data = C.CString(symbol) + symbol_ms.len = C.size_t(len(symbol)) + defer C.free(unsafe.Pointer(symbol_ms.data)) + var _ms C.struct_miqt_string = C.QLocale_ToCurrencyString3(this.h, (C.float)(i), symbol_ms, (C.int)(precision)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) FormattedDataSize(bytes int64) string { - var _ms *C.struct_miqt_string = C.QLocale_FormattedDataSize(this.h, (C.longlong)(bytes)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLocale_FormattedDataSize(this.h, (C.longlong)(bytes)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) FormattedDataSizeWithBytes(bytes int64) string { - var _ms *C.struct_miqt_string = C.QLocale_FormattedDataSizeWithBytes(this.h, (C.longlong)(bytes)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLocale_FormattedDataSizeWithBytes(this.h, (C.longlong)(bytes)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) UiLanguages() []string { var _ma *C.struct_miqt_array = C.QLocale_UiLanguages(this.h) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -1597,23 +1668,23 @@ func (this *QLocale) OperatorNotEqual(other *QLocale) bool { } func QLocale_LanguageToString(language QLocale__Language) string { - var _ms *C.struct_miqt_string = C.QLocale_LanguageToString((C.int)(language)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLocale_LanguageToString((C.int)(language)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QLocale_CountryToString(country QLocale__Country) string { - var _ms *C.struct_miqt_string = C.QLocale_CountryToString((C.int)(country)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLocale_CountryToString((C.int)(country)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QLocale_ScriptToString(script QLocale__Script) string { - var _ms *C.struct_miqt_string = C.QLocale_ScriptToString((C.int)(script)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLocale_ScriptToString((C.int)(script)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -1669,329 +1740,377 @@ func (this *QLocale) NumberOptions() QLocale__NumberOption { } func (this *QLocale) QuoteString(str string) string { - str_ms := libmiqt.Strdupg(str) - defer C.free(str_ms) - var _ms *C.struct_miqt_string = C.QLocale_QuoteString(this.h, (*C.struct_miqt_string)(str_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + str_ms := C.struct_miqt_string{} + str_ms.data = C.CString(str) + str_ms.len = C.size_t(len(str)) + defer C.free(unsafe.Pointer(str_ms.data)) + var _ms C.struct_miqt_string = C.QLocale_QuoteString(this.h, str_ms) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) CreateSeparatedList(strl []string) string { // For the C ABI, malloc a C array of raw pointers - strl_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(strl)))) + strl_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(strl)))) defer C.free(unsafe.Pointer(strl_CArray)) for i := range strl { - strl_i_ms := libmiqt.Strdupg(strl[i]) - defer C.free(strl_i_ms) - strl_CArray[i] = (*C.struct_miqt_string)(strl_i_ms) + strl_i_ms := C.struct_miqt_string{} + strl_i_ms.data = C.CString(strl[i]) + strl_i_ms.len = C.size_t(len(strl[i])) + defer C.free(unsafe.Pointer(strl_i_ms.data)) + strl_CArray[i] = strl_i_ms } strl_ma := &C.struct_miqt_array{len: C.size_t(len(strl)), data: unsafe.Pointer(strl_CArray)} defer runtime.KeepAlive(unsafe.Pointer(strl_ma)) - var _ms *C.struct_miqt_string = C.QLocale_CreateSeparatedList(this.h, strl_ma) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLocale_CreateSeparatedList(this.h, strl_ma) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) ToShort2(s string, ok *bool) int16 { - s_ms := libmiqt.Strdupg(s) - defer C.free(s_ms) - return (int16)(C.QLocale_ToShort2(this.h, (*C.struct_miqt_string)(s_ms), (*C.bool)(unsafe.Pointer(ok)))) + s_ms := C.struct_miqt_string{} + s_ms.data = C.CString(s) + s_ms.len = C.size_t(len(s)) + defer C.free(unsafe.Pointer(s_ms.data)) + return (int16)(C.QLocale_ToShort2(this.h, s_ms, (*C.bool)(unsafe.Pointer(ok)))) } func (this *QLocale) ToUShort2(s string, ok *bool) uint16 { - s_ms := libmiqt.Strdupg(s) - defer C.free(s_ms) - return (uint16)(C.QLocale_ToUShort2(this.h, (*C.struct_miqt_string)(s_ms), (*C.bool)(unsafe.Pointer(ok)))) + s_ms := C.struct_miqt_string{} + s_ms.data = C.CString(s) + s_ms.len = C.size_t(len(s)) + defer C.free(unsafe.Pointer(s_ms.data)) + return (uint16)(C.QLocale_ToUShort2(this.h, s_ms, (*C.bool)(unsafe.Pointer(ok)))) } func (this *QLocale) ToInt2(s string, ok *bool) int { - s_ms := libmiqt.Strdupg(s) - defer C.free(s_ms) - return (int)(C.QLocale_ToInt2(this.h, (*C.struct_miqt_string)(s_ms), (*C.bool)(unsafe.Pointer(ok)))) + s_ms := C.struct_miqt_string{} + s_ms.data = C.CString(s) + s_ms.len = C.size_t(len(s)) + defer C.free(unsafe.Pointer(s_ms.data)) + return (int)(C.QLocale_ToInt2(this.h, s_ms, (*C.bool)(unsafe.Pointer(ok)))) } func (this *QLocale) ToUInt2(s string, ok *bool) uint { - s_ms := libmiqt.Strdupg(s) - defer C.free(s_ms) - return (uint)(C.QLocale_ToUInt2(this.h, (*C.struct_miqt_string)(s_ms), (*C.bool)(unsafe.Pointer(ok)))) + s_ms := C.struct_miqt_string{} + s_ms.data = C.CString(s) + s_ms.len = C.size_t(len(s)) + defer C.free(unsafe.Pointer(s_ms.data)) + return (uint)(C.QLocale_ToUInt2(this.h, s_ms, (*C.bool)(unsafe.Pointer(ok)))) } func (this *QLocale) ToLong2(s string, ok *bool) int64 { - s_ms := libmiqt.Strdupg(s) - defer C.free(s_ms) - return (int64)(C.QLocale_ToLong2(this.h, (*C.struct_miqt_string)(s_ms), (*C.bool)(unsafe.Pointer(ok)))) + s_ms := C.struct_miqt_string{} + s_ms.data = C.CString(s) + s_ms.len = C.size_t(len(s)) + defer C.free(unsafe.Pointer(s_ms.data)) + return (int64)(C.QLocale_ToLong2(this.h, s_ms, (*C.bool)(unsafe.Pointer(ok)))) } func (this *QLocale) ToULong2(s string, ok *bool) uint64 { - s_ms := libmiqt.Strdupg(s) - defer C.free(s_ms) - return (uint64)(C.QLocale_ToULong2(this.h, (*C.struct_miqt_string)(s_ms), (*C.bool)(unsafe.Pointer(ok)))) + s_ms := C.struct_miqt_string{} + s_ms.data = C.CString(s) + s_ms.len = C.size_t(len(s)) + defer C.free(unsafe.Pointer(s_ms.data)) + return (uint64)(C.QLocale_ToULong2(this.h, s_ms, (*C.bool)(unsafe.Pointer(ok)))) } func (this *QLocale) ToLongLong2(s string, ok *bool) int64 { - s_ms := libmiqt.Strdupg(s) - defer C.free(s_ms) - return (int64)(C.QLocale_ToLongLong2(this.h, (*C.struct_miqt_string)(s_ms), (*C.bool)(unsafe.Pointer(ok)))) + s_ms := C.struct_miqt_string{} + s_ms.data = C.CString(s) + s_ms.len = C.size_t(len(s)) + defer C.free(unsafe.Pointer(s_ms.data)) + return (int64)(C.QLocale_ToLongLong2(this.h, s_ms, (*C.bool)(unsafe.Pointer(ok)))) } func (this *QLocale) ToULongLong2(s string, ok *bool) uint64 { - s_ms := libmiqt.Strdupg(s) - defer C.free(s_ms) - return (uint64)(C.QLocale_ToULongLong2(this.h, (*C.struct_miqt_string)(s_ms), (*C.bool)(unsafe.Pointer(ok)))) + s_ms := C.struct_miqt_string{} + s_ms.data = C.CString(s) + s_ms.len = C.size_t(len(s)) + defer C.free(unsafe.Pointer(s_ms.data)) + return (uint64)(C.QLocale_ToULongLong2(this.h, s_ms, (*C.bool)(unsafe.Pointer(ok)))) } func (this *QLocale) ToFloat2(s string, ok *bool) float32 { - s_ms := libmiqt.Strdupg(s) - defer C.free(s_ms) - return (float32)(C.QLocale_ToFloat2(this.h, (*C.struct_miqt_string)(s_ms), (*C.bool)(unsafe.Pointer(ok)))) + s_ms := C.struct_miqt_string{} + s_ms.data = C.CString(s) + s_ms.len = C.size_t(len(s)) + defer C.free(unsafe.Pointer(s_ms.data)) + return (float32)(C.QLocale_ToFloat2(this.h, s_ms, (*C.bool)(unsafe.Pointer(ok)))) } func (this *QLocale) ToDouble2(s string, ok *bool) float64 { - s_ms := libmiqt.Strdupg(s) - defer C.free(s_ms) - return (float64)(C.QLocale_ToDouble2(this.h, (*C.struct_miqt_string)(s_ms), (*C.bool)(unsafe.Pointer(ok)))) + s_ms := C.struct_miqt_string{} + s_ms.data = C.CString(s) + s_ms.len = C.size_t(len(s)) + defer C.free(unsafe.Pointer(s_ms.data)) + return (float64)(C.QLocale_ToDouble2(this.h, s_ms, (*C.bool)(unsafe.Pointer(ok)))) } func (this *QLocale) ToString22(i float64, f int8) string { - var _ms *C.struct_miqt_string = C.QLocale_ToString22(this.h, (C.double)(i), (C.char)(f)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLocale_ToString22(this.h, (C.double)(i), (C.char)(f)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) ToString32(i float64, f int8, prec int) string { - var _ms *C.struct_miqt_string = C.QLocale_ToString32(this.h, (C.double)(i), (C.char)(f), (C.int)(prec)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLocale_ToString32(this.h, (C.double)(i), (C.char)(f), (C.int)(prec)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) ToString23(i float32, f int8) string { - var _ms *C.struct_miqt_string = C.QLocale_ToString23(this.h, (C.float)(i), (C.char)(f)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLocale_ToString23(this.h, (C.float)(i), (C.char)(f)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) ToString33(i float32, f int8, prec int) string { - var _ms *C.struct_miqt_string = C.QLocale_ToString33(this.h, (C.float)(i), (C.char)(f), (C.int)(prec)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLocale_ToString33(this.h, (C.float)(i), (C.char)(f), (C.int)(prec)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) ToString24(date *QDate, format QLocale__FormatType) string { - var _ms *C.struct_miqt_string = C.QLocale_ToString24(this.h, date.cPointer(), (C.int)(format)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLocale_ToString24(this.h, date.cPointer(), (C.int)(format)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) ToString25(time *QTime, format QLocale__FormatType) string { - var _ms *C.struct_miqt_string = C.QLocale_ToString25(this.h, time.cPointer(), (C.int)(format)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLocale_ToString25(this.h, time.cPointer(), (C.int)(format)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) ToString26(dateTime *QDateTime, format QLocale__FormatType) string { - var _ms *C.struct_miqt_string = C.QLocale_ToString26(this.h, dateTime.cPointer(), (C.int)(format)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLocale_ToString26(this.h, dateTime.cPointer(), (C.int)(format)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) DateFormat1(format QLocale__FormatType) string { - var _ms *C.struct_miqt_string = C.QLocale_DateFormat1(this.h, (C.int)(format)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLocale_DateFormat1(this.h, (C.int)(format)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) TimeFormat1(format QLocale__FormatType) string { - var _ms *C.struct_miqt_string = C.QLocale_TimeFormat1(this.h, (C.int)(format)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLocale_TimeFormat1(this.h, (C.int)(format)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) DateTimeFormat1(format QLocale__FormatType) string { - var _ms *C.struct_miqt_string = C.QLocale_DateTimeFormat1(this.h, (C.int)(format)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLocale_DateTimeFormat1(this.h, (C.int)(format)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) ToDate22(stringVal string, param2 QLocale__FormatType) *QDate { - stringVal_ms := libmiqt.Strdupg(stringVal) - defer C.free(stringVal_ms) - _ret := C.QLocale_ToDate22(this.h, (*C.struct_miqt_string)(stringVal_ms), (C.int)(param2)) + stringVal_ms := C.struct_miqt_string{} + stringVal_ms.data = C.CString(stringVal) + stringVal_ms.len = C.size_t(len(stringVal)) + defer C.free(unsafe.Pointer(stringVal_ms.data)) + _ret := C.QLocale_ToDate22(this.h, stringVal_ms, (C.int)(param2)) _goptr := newQDate(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QLocale) ToTime22(stringVal string, param2 QLocale__FormatType) *QTime { - stringVal_ms := libmiqt.Strdupg(stringVal) - defer C.free(stringVal_ms) - _ret := C.QLocale_ToTime22(this.h, (*C.struct_miqt_string)(stringVal_ms), (C.int)(param2)) + stringVal_ms := C.struct_miqt_string{} + stringVal_ms.data = C.CString(stringVal) + stringVal_ms.len = C.size_t(len(stringVal)) + defer C.free(unsafe.Pointer(stringVal_ms.data)) + _ret := C.QLocale_ToTime22(this.h, stringVal_ms, (C.int)(param2)) _goptr := newQTime(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QLocale) ToDateTime22(stringVal string, format QLocale__FormatType) *QDateTime { - stringVal_ms := libmiqt.Strdupg(stringVal) - defer C.free(stringVal_ms) - _ret := C.QLocale_ToDateTime22(this.h, (*C.struct_miqt_string)(stringVal_ms), (C.int)(format)) + stringVal_ms := C.struct_miqt_string{} + stringVal_ms.data = C.CString(stringVal) + stringVal_ms.len = C.size_t(len(stringVal)) + defer C.free(unsafe.Pointer(stringVal_ms.data)) + _ret := C.QLocale_ToDateTime22(this.h, stringVal_ms, (C.int)(format)) _goptr := newQDateTime(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QLocale) MonthName2(param1 int, format QLocale__FormatType) string { - var _ms *C.struct_miqt_string = C.QLocale_MonthName2(this.h, (C.int)(param1), (C.int)(format)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLocale_MonthName2(this.h, (C.int)(param1), (C.int)(format)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) StandaloneMonthName2(param1 int, format QLocale__FormatType) string { - var _ms *C.struct_miqt_string = C.QLocale_StandaloneMonthName2(this.h, (C.int)(param1), (C.int)(format)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLocale_StandaloneMonthName2(this.h, (C.int)(param1), (C.int)(format)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) DayName2(param1 int, format QLocale__FormatType) string { - var _ms *C.struct_miqt_string = C.QLocale_DayName2(this.h, (C.int)(param1), (C.int)(format)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLocale_DayName2(this.h, (C.int)(param1), (C.int)(format)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) StandaloneDayName2(param1 int, format QLocale__FormatType) string { - var _ms *C.struct_miqt_string = C.QLocale_StandaloneDayName2(this.h, (C.int)(param1), (C.int)(format)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLocale_StandaloneDayName2(this.h, (C.int)(param1), (C.int)(format)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) CurrencySymbol1(param1 QLocale__CurrencySymbolFormat) string { - var _ms *C.struct_miqt_string = C.QLocale_CurrencySymbol1(this.h, (C.int)(param1)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLocale_CurrencySymbol1(this.h, (C.int)(param1)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) ToCurrencyString22(param1 int64, symbol string) string { - symbol_ms := libmiqt.Strdupg(symbol) - defer C.free(symbol_ms) - var _ms *C.struct_miqt_string = C.QLocale_ToCurrencyString22(this.h, (C.longlong)(param1), (*C.struct_miqt_string)(symbol_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + symbol_ms := C.struct_miqt_string{} + symbol_ms.data = C.CString(symbol) + symbol_ms.len = C.size_t(len(symbol)) + defer C.free(unsafe.Pointer(symbol_ms.data)) + var _ms C.struct_miqt_string = C.QLocale_ToCurrencyString22(this.h, (C.longlong)(param1), symbol_ms) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) ToCurrencyString23(param1 uint64, symbol string) string { - symbol_ms := libmiqt.Strdupg(symbol) - defer C.free(symbol_ms) - var _ms *C.struct_miqt_string = C.QLocale_ToCurrencyString23(this.h, (C.ulonglong)(param1), (*C.struct_miqt_string)(symbol_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + symbol_ms := C.struct_miqt_string{} + symbol_ms.data = C.CString(symbol) + symbol_ms.len = C.size_t(len(symbol)) + defer C.free(unsafe.Pointer(symbol_ms.data)) + var _ms C.struct_miqt_string = C.QLocale_ToCurrencyString23(this.h, (C.ulonglong)(param1), symbol_ms) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) ToCurrencyString24(param1 int16, symbol string) string { - symbol_ms := libmiqt.Strdupg(symbol) - defer C.free(symbol_ms) - var _ms *C.struct_miqt_string = C.QLocale_ToCurrencyString24(this.h, (C.int16_t)(param1), (*C.struct_miqt_string)(symbol_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + symbol_ms := C.struct_miqt_string{} + symbol_ms.data = C.CString(symbol) + symbol_ms.len = C.size_t(len(symbol)) + defer C.free(unsafe.Pointer(symbol_ms.data)) + var _ms C.struct_miqt_string = C.QLocale_ToCurrencyString24(this.h, (C.int16_t)(param1), symbol_ms) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) ToCurrencyString25(param1 uint16, symbol string) string { - symbol_ms := libmiqt.Strdupg(symbol) - defer C.free(symbol_ms) - var _ms *C.struct_miqt_string = C.QLocale_ToCurrencyString25(this.h, (C.uint16_t)(param1), (*C.struct_miqt_string)(symbol_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + symbol_ms := C.struct_miqt_string{} + symbol_ms.data = C.CString(symbol) + symbol_ms.len = C.size_t(len(symbol)) + defer C.free(unsafe.Pointer(symbol_ms.data)) + var _ms C.struct_miqt_string = C.QLocale_ToCurrencyString25(this.h, (C.uint16_t)(param1), symbol_ms) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) ToCurrencyString26(param1 int, symbol string) string { - symbol_ms := libmiqt.Strdupg(symbol) - defer C.free(symbol_ms) - var _ms *C.struct_miqt_string = C.QLocale_ToCurrencyString26(this.h, (C.int)(param1), (*C.struct_miqt_string)(symbol_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + symbol_ms := C.struct_miqt_string{} + symbol_ms.data = C.CString(symbol) + symbol_ms.len = C.size_t(len(symbol)) + defer C.free(unsafe.Pointer(symbol_ms.data)) + var _ms C.struct_miqt_string = C.QLocale_ToCurrencyString26(this.h, (C.int)(param1), symbol_ms) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) ToCurrencyString27(param1 uint, symbol string) string { - symbol_ms := libmiqt.Strdupg(symbol) - defer C.free(symbol_ms) - var _ms *C.struct_miqt_string = C.QLocale_ToCurrencyString27(this.h, (C.uint)(param1), (*C.struct_miqt_string)(symbol_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + symbol_ms := C.struct_miqt_string{} + symbol_ms.data = C.CString(symbol) + symbol_ms.len = C.size_t(len(symbol)) + defer C.free(unsafe.Pointer(symbol_ms.data)) + var _ms C.struct_miqt_string = C.QLocale_ToCurrencyString27(this.h, (C.uint)(param1), symbol_ms) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) ToCurrencyString28(param1 float64, symbol string) string { - symbol_ms := libmiqt.Strdupg(symbol) - defer C.free(symbol_ms) - var _ms *C.struct_miqt_string = C.QLocale_ToCurrencyString28(this.h, (C.double)(param1), (*C.struct_miqt_string)(symbol_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + symbol_ms := C.struct_miqt_string{} + symbol_ms.data = C.CString(symbol) + symbol_ms.len = C.size_t(len(symbol)) + defer C.free(unsafe.Pointer(symbol_ms.data)) + var _ms C.struct_miqt_string = C.QLocale_ToCurrencyString28(this.h, (C.double)(param1), symbol_ms) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) ToCurrencyString29(i float32, symbol string) string { - symbol_ms := libmiqt.Strdupg(symbol) - defer C.free(symbol_ms) - var _ms *C.struct_miqt_string = C.QLocale_ToCurrencyString29(this.h, (C.float)(i), (*C.struct_miqt_string)(symbol_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + symbol_ms := C.struct_miqt_string{} + symbol_ms.data = C.CString(symbol) + symbol_ms.len = C.size_t(len(symbol)) + defer C.free(unsafe.Pointer(symbol_ms.data)) + var _ms C.struct_miqt_string = C.QLocale_ToCurrencyString29(this.h, (C.float)(i), symbol_ms) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) FormattedDataSize2(bytes int64, precision int) string { - var _ms *C.struct_miqt_string = C.QLocale_FormattedDataSize2(this.h, (C.longlong)(bytes), (C.int)(precision)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLocale_FormattedDataSize2(this.h, (C.longlong)(bytes), (C.int)(precision)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) FormattedDataSize3(bytes int64, precision int, format QLocale__DataSizeFormat) string { - var _ms *C.struct_miqt_string = C.QLocale_FormattedDataSize3(this.h, (C.longlong)(bytes), (C.int)(precision), (C.int)(format)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLocale_FormattedDataSize3(this.h, (C.longlong)(bytes), (C.int)(precision), (C.int)(format)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) FormattedDataSize22(bytes int64, precision int) string { - var _ms *C.struct_miqt_string = C.QLocale_FormattedDataSize22(this.h, (C.longlong)(bytes), (C.int)(precision)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLocale_FormattedDataSize22(this.h, (C.longlong)(bytes), (C.int)(precision)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) FormattedDataSize32(bytes int64, precision int, format QLocale__DataSizeFormat) string { - var _ms *C.struct_miqt_string = C.QLocale_FormattedDataSize32(this.h, (C.longlong)(bytes), (C.int)(precision), (C.int)(format)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QLocale_FormattedDataSize32(this.h, (C.longlong)(bytes), (C.int)(precision), (C.int)(format)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) QuoteString2(str string, style QLocale__QuotationStyle) string { - str_ms := libmiqt.Strdupg(str) - defer C.free(str_ms) - var _ms *C.struct_miqt_string = C.QLocale_QuoteString2(this.h, (*C.struct_miqt_string)(str_ms), (C.int)(style)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + str_ms := C.struct_miqt_string{} + str_ms.data = C.CString(str) + str_ms.len = C.size_t(len(str)) + defer C.free(unsafe.Pointer(str_ms.data)) + var _ms C.struct_miqt_string = C.QLocale_QuoteString2(this.h, str_ms, (C.int)(style)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qlocale.h b/qt/gen_qlocale.h index 36ffdd03..21c4d271 100644 --- a/qt/gen_qlocale.h +++ b/qt/gen_qlocale.h @@ -30,7 +30,7 @@ typedef struct QTime QTime; #endif QLocale* QLocale_new(); -QLocale* QLocale_new2(struct miqt_string* name); +QLocale* QLocale_new2(struct miqt_string name); QLocale* QLocale_new3(int language); QLocale* QLocale_new4(int language, int script, int country); QLocale* QLocale_new5(QLocale* other); @@ -40,53 +40,53 @@ void QLocale_Swap(QLocale* self, QLocale* other); int QLocale_Language(const QLocale* self); int QLocale_Script(const QLocale* self); int QLocale_Country(const QLocale* self); -struct miqt_string* QLocale_Name(const QLocale* self); -struct miqt_string* QLocale_Bcp47Name(const QLocale* self); -struct miqt_string* QLocale_NativeLanguageName(const QLocale* self); -struct miqt_string* QLocale_NativeCountryName(const QLocale* self); -int16_t QLocale_ToShort(const QLocale* self, struct miqt_string* s); -uint16_t QLocale_ToUShort(const QLocale* self, struct miqt_string* s); -int QLocale_ToInt(const QLocale* self, struct miqt_string* s); -unsigned int QLocale_ToUInt(const QLocale* self, struct miqt_string* s); -long QLocale_ToLong(const QLocale* self, struct miqt_string* s); -unsigned long QLocale_ToULong(const QLocale* self, struct miqt_string* s); -long long QLocale_ToLongLong(const QLocale* self, struct miqt_string* s); -unsigned long long QLocale_ToULongLong(const QLocale* self, struct miqt_string* s); -float QLocale_ToFloat(const QLocale* self, struct miqt_string* s); -double QLocale_ToDouble(const QLocale* self, struct miqt_string* s); -struct miqt_string* QLocale_ToString(const QLocale* self, long long i); -struct miqt_string* QLocale_ToStringWithQulonglong(const QLocale* self, unsigned long long i); -struct miqt_string* QLocale_ToStringWithLong(const QLocale* self, long i); -struct miqt_string* QLocale_ToStringWithUlong(const QLocale* self, unsigned long i); -struct miqt_string* QLocale_ToStringWithShort(const QLocale* self, int16_t i); -struct miqt_string* QLocale_ToStringWithUshort(const QLocale* self, uint16_t i); -struct miqt_string* QLocale_ToStringWithInt(const QLocale* self, int i); -struct miqt_string* QLocale_ToStringWithUint(const QLocale* self, unsigned int i); -struct miqt_string* QLocale_ToStringWithDouble(const QLocale* self, double i); -struct miqt_string* QLocale_ToStringWithFloat(const QLocale* self, float i); -struct miqt_string* QLocale_ToString2(const QLocale* self, QDate* date, struct miqt_string* formatStr); -struct miqt_string* QLocale_ToString3(const QLocale* self, QTime* time, struct miqt_string* formatStr); -struct miqt_string* QLocale_ToString4(const QLocale* self, QDateTime* dateTime, struct miqt_string* format); -struct miqt_string* QLocale_ToStringWithDate(const QLocale* self, QDate* date); -struct miqt_string* QLocale_ToStringWithTime(const QLocale* self, QTime* time); -struct miqt_string* QLocale_ToStringWithDateTime(const QLocale* self, QDateTime* dateTime); -struct miqt_string* QLocale_ToString9(const QLocale* self, QDate* date, int format, QCalendar* cal); -struct miqt_string* QLocale_ToString10(const QLocale* self, QDateTime* dateTime, int format, QCalendar* cal); -struct miqt_string* QLocale_DateFormat(const QLocale* self); -struct miqt_string* QLocale_TimeFormat(const QLocale* self); -struct miqt_string* QLocale_DateTimeFormat(const QLocale* self); -QDate* QLocale_ToDate(const QLocale* self, struct miqt_string* stringVal); -QTime* QLocale_ToTime(const QLocale* self, struct miqt_string* stringVal); -QDateTime* QLocale_ToDateTime(const QLocale* self, struct miqt_string* stringVal); -QDate* QLocale_ToDate2(const QLocale* self, struct miqt_string* stringVal, struct miqt_string* format); -QTime* QLocale_ToTime2(const QLocale* self, struct miqt_string* stringVal, struct miqt_string* format); -QDateTime* QLocale_ToDateTime2(const QLocale* self, struct miqt_string* stringVal, struct miqt_string* format); -QDate* QLocale_ToDate3(const QLocale* self, struct miqt_string* stringVal, int format, QCalendar* cal); -QDateTime* QLocale_ToDateTime3(const QLocale* self, struct miqt_string* stringVal, int format, QCalendar* cal); -QDate* QLocale_ToDate4(const QLocale* self, struct miqt_string* stringVal, struct miqt_string* format, QCalendar* cal); -QDateTime* QLocale_ToDateTime4(const QLocale* self, struct miqt_string* stringVal, struct miqt_string* format, QCalendar* cal); -QTime* QLocale_ToTime3(const QLocale* self, struct miqt_string* stringVal, int format, QCalendar* cal); -QTime* QLocale_ToTime4(const QLocale* self, struct miqt_string* stringVal, struct miqt_string* format, QCalendar* cal); +struct miqt_string QLocale_Name(const QLocale* self); +struct miqt_string QLocale_Bcp47Name(const QLocale* self); +struct miqt_string QLocale_NativeLanguageName(const QLocale* self); +struct miqt_string QLocale_NativeCountryName(const QLocale* self); +int16_t QLocale_ToShort(const QLocale* self, struct miqt_string s); +uint16_t QLocale_ToUShort(const QLocale* self, struct miqt_string s); +int QLocale_ToInt(const QLocale* self, struct miqt_string s); +unsigned int QLocale_ToUInt(const QLocale* self, struct miqt_string s); +long QLocale_ToLong(const QLocale* self, struct miqt_string s); +unsigned long QLocale_ToULong(const QLocale* self, struct miqt_string s); +long long QLocale_ToLongLong(const QLocale* self, struct miqt_string s); +unsigned long long QLocale_ToULongLong(const QLocale* self, struct miqt_string s); +float QLocale_ToFloat(const QLocale* self, struct miqt_string s); +double QLocale_ToDouble(const QLocale* self, struct miqt_string s); +struct miqt_string QLocale_ToString(const QLocale* self, long long i); +struct miqt_string QLocale_ToStringWithQulonglong(const QLocale* self, unsigned long long i); +struct miqt_string QLocale_ToStringWithLong(const QLocale* self, long i); +struct miqt_string QLocale_ToStringWithUlong(const QLocale* self, unsigned long i); +struct miqt_string QLocale_ToStringWithShort(const QLocale* self, int16_t i); +struct miqt_string QLocale_ToStringWithUshort(const QLocale* self, uint16_t i); +struct miqt_string QLocale_ToStringWithInt(const QLocale* self, int i); +struct miqt_string QLocale_ToStringWithUint(const QLocale* self, unsigned int i); +struct miqt_string QLocale_ToStringWithDouble(const QLocale* self, double i); +struct miqt_string QLocale_ToStringWithFloat(const QLocale* self, float i); +struct miqt_string QLocale_ToString2(const QLocale* self, QDate* date, struct miqt_string formatStr); +struct miqt_string QLocale_ToString3(const QLocale* self, QTime* time, struct miqt_string formatStr); +struct miqt_string QLocale_ToString4(const QLocale* self, QDateTime* dateTime, struct miqt_string format); +struct miqt_string QLocale_ToStringWithDate(const QLocale* self, QDate* date); +struct miqt_string QLocale_ToStringWithTime(const QLocale* self, QTime* time); +struct miqt_string QLocale_ToStringWithDateTime(const QLocale* self, QDateTime* dateTime); +struct miqt_string QLocale_ToString9(const QLocale* self, QDate* date, int format, QCalendar* cal); +struct miqt_string QLocale_ToString10(const QLocale* self, QDateTime* dateTime, int format, QCalendar* cal); +struct miqt_string QLocale_DateFormat(const QLocale* self); +struct miqt_string QLocale_TimeFormat(const QLocale* self); +struct miqt_string QLocale_DateTimeFormat(const QLocale* self); +QDate* QLocale_ToDate(const QLocale* self, struct miqt_string stringVal); +QTime* QLocale_ToTime(const QLocale* self, struct miqt_string stringVal); +QDateTime* QLocale_ToDateTime(const QLocale* self, struct miqt_string stringVal); +QDate* QLocale_ToDate2(const QLocale* self, struct miqt_string stringVal, struct miqt_string format); +QTime* QLocale_ToTime2(const QLocale* self, struct miqt_string stringVal, struct miqt_string format); +QDateTime* QLocale_ToDateTime2(const QLocale* self, struct miqt_string stringVal, struct miqt_string format); +QDate* QLocale_ToDate3(const QLocale* self, struct miqt_string stringVal, int format, QCalendar* cal); +QDateTime* QLocale_ToDateTime3(const QLocale* self, struct miqt_string stringVal, int format, QCalendar* cal); +QDate* QLocale_ToDate4(const QLocale* self, struct miqt_string stringVal, struct miqt_string format, QCalendar* cal); +QDateTime* QLocale_ToDateTime4(const QLocale* self, struct miqt_string stringVal, struct miqt_string format, QCalendar* cal); +QTime* QLocale_ToTime3(const QLocale* self, struct miqt_string stringVal, int format, QCalendar* cal); +QTime* QLocale_ToTime4(const QLocale* self, struct miqt_string stringVal, struct miqt_string format, QCalendar* cal); QChar* QLocale_DecimalPoint(const QLocale* self); QChar* QLocale_GroupSeparator(const QLocale* self); QChar* QLocale_Percent(const QLocale* self); @@ -94,38 +94,38 @@ QChar* QLocale_ZeroDigit(const QLocale* self); QChar* QLocale_NegativeSign(const QLocale* self); QChar* QLocale_PositiveSign(const QLocale* self); QChar* QLocale_Exponential(const QLocale* self); -struct miqt_string* QLocale_MonthName(const QLocale* self, int param1); -struct miqt_string* QLocale_StandaloneMonthName(const QLocale* self, int param1); -struct miqt_string* QLocale_DayName(const QLocale* self, int param1); -struct miqt_string* QLocale_StandaloneDayName(const QLocale* self, int param1); +struct miqt_string QLocale_MonthName(const QLocale* self, int param1); +struct miqt_string QLocale_StandaloneMonthName(const QLocale* self, int param1); +struct miqt_string QLocale_DayName(const QLocale* self, int param1); +struct miqt_string QLocale_StandaloneDayName(const QLocale* self, int param1); int QLocale_FirstDayOfWeek(const QLocale* self); struct miqt_array* QLocale_Weekdays(const QLocale* self); -struct miqt_string* QLocale_AmText(const QLocale* self); -struct miqt_string* QLocale_PmText(const QLocale* self); +struct miqt_string QLocale_AmText(const QLocale* self); +struct miqt_string QLocale_PmText(const QLocale* self); int QLocale_MeasurementSystem(const QLocale* self); QLocale* QLocale_Collation(const QLocale* self); int QLocale_TextDirection(const QLocale* self); -struct miqt_string* QLocale_ToUpper(const QLocale* self, struct miqt_string* str); -struct miqt_string* QLocale_ToLower(const QLocale* self, struct miqt_string* str); -struct miqt_string* QLocale_CurrencySymbol(const QLocale* self); -struct miqt_string* QLocale_ToCurrencyString(const QLocale* self, long long param1); -struct miqt_string* QLocale_ToCurrencyStringWithQulonglong(const QLocale* self, unsigned long long param1); -struct miqt_string* QLocale_ToCurrencyStringWithShort(const QLocale* self, int16_t param1); -struct miqt_string* QLocale_ToCurrencyStringWithUshort(const QLocale* self, uint16_t param1); -struct miqt_string* QLocale_ToCurrencyStringWithInt(const QLocale* self, int param1); -struct miqt_string* QLocale_ToCurrencyStringWithUint(const QLocale* self, unsigned int param1); -struct miqt_string* QLocale_ToCurrencyStringWithDouble(const QLocale* self, double param1); -struct miqt_string* QLocale_ToCurrencyString2(const QLocale* self, double param1, struct miqt_string* symbol, int precision); -struct miqt_string* QLocale_ToCurrencyStringWithFloat(const QLocale* self, float i); -struct miqt_string* QLocale_ToCurrencyString3(const QLocale* self, float i, struct miqt_string* symbol, int precision); -struct miqt_string* QLocale_FormattedDataSize(QLocale* self, long long bytes); -struct miqt_string* QLocale_FormattedDataSizeWithBytes(const QLocale* self, long long bytes); +struct miqt_string QLocale_ToUpper(const QLocale* self, struct miqt_string str); +struct miqt_string QLocale_ToLower(const QLocale* self, struct miqt_string str); +struct miqt_string QLocale_CurrencySymbol(const QLocale* self); +struct miqt_string QLocale_ToCurrencyString(const QLocale* self, long long param1); +struct miqt_string QLocale_ToCurrencyStringWithQulonglong(const QLocale* self, unsigned long long param1); +struct miqt_string QLocale_ToCurrencyStringWithShort(const QLocale* self, int16_t param1); +struct miqt_string QLocale_ToCurrencyStringWithUshort(const QLocale* self, uint16_t param1); +struct miqt_string QLocale_ToCurrencyStringWithInt(const QLocale* self, int param1); +struct miqt_string QLocale_ToCurrencyStringWithUint(const QLocale* self, unsigned int param1); +struct miqt_string QLocale_ToCurrencyStringWithDouble(const QLocale* self, double param1); +struct miqt_string QLocale_ToCurrencyString2(const QLocale* self, double param1, struct miqt_string symbol, int precision); +struct miqt_string QLocale_ToCurrencyStringWithFloat(const QLocale* self, float i); +struct miqt_string QLocale_ToCurrencyString3(const QLocale* self, float i, struct miqt_string symbol, int precision); +struct miqt_string QLocale_FormattedDataSize(QLocale* self, long long bytes); +struct miqt_string QLocale_FormattedDataSizeWithBytes(const QLocale* self, long long bytes); struct miqt_array* QLocale_UiLanguages(const QLocale* self); bool QLocale_OperatorEqual(const QLocale* self, QLocale* other); bool QLocale_OperatorNotEqual(const QLocale* self, QLocale* other); -struct miqt_string* QLocale_LanguageToString(int language); -struct miqt_string* QLocale_CountryToString(int country); -struct miqt_string* QLocale_ScriptToString(int script); +struct miqt_string QLocale_LanguageToString(int language); +struct miqt_string QLocale_CountryToString(int country); +struct miqt_string QLocale_ScriptToString(int script); void QLocale_SetDefault(QLocale* locale); QLocale* QLocale_C(); QLocale* QLocale_System(); @@ -133,49 +133,49 @@ struct miqt_array* QLocale_MatchingLocales(int language, int script, int country struct miqt_array* QLocale_CountriesForLanguage(int lang); void QLocale_SetNumberOptions(QLocale* self, int options); int QLocale_NumberOptions(const QLocale* self); -struct miqt_string* QLocale_QuoteString(const QLocale* self, struct miqt_string* str); -struct miqt_string* QLocale_CreateSeparatedList(const QLocale* self, struct miqt_array* /* of struct miqt_string* */ strl); -int16_t QLocale_ToShort2(const QLocale* self, struct miqt_string* s, bool* ok); -uint16_t QLocale_ToUShort2(const QLocale* self, struct miqt_string* s, bool* ok); -int QLocale_ToInt2(const QLocale* self, struct miqt_string* s, bool* ok); -unsigned int QLocale_ToUInt2(const QLocale* self, struct miqt_string* s, bool* ok); -long QLocale_ToLong2(const QLocale* self, struct miqt_string* s, bool* ok); -unsigned long QLocale_ToULong2(const QLocale* self, struct miqt_string* s, bool* ok); -long long QLocale_ToLongLong2(const QLocale* self, struct miqt_string* s, bool* ok); -unsigned long long QLocale_ToULongLong2(const QLocale* self, struct miqt_string* s, bool* ok); -float QLocale_ToFloat2(const QLocale* self, struct miqt_string* s, bool* ok); -double QLocale_ToDouble2(const QLocale* self, struct miqt_string* s, bool* ok); -struct miqt_string* QLocale_ToString22(const QLocale* self, double i, char f); -struct miqt_string* QLocale_ToString32(const QLocale* self, double i, char f, int prec); -struct miqt_string* QLocale_ToString23(const QLocale* self, float i, char f); -struct miqt_string* QLocale_ToString33(const QLocale* self, float i, char f, int prec); -struct miqt_string* QLocale_ToString24(const QLocale* self, QDate* date, int format); -struct miqt_string* QLocale_ToString25(const QLocale* self, QTime* time, int format); -struct miqt_string* QLocale_ToString26(const QLocale* self, QDateTime* dateTime, int format); -struct miqt_string* QLocale_DateFormat1(const QLocale* self, int format); -struct miqt_string* QLocale_TimeFormat1(const QLocale* self, int format); -struct miqt_string* QLocale_DateTimeFormat1(const QLocale* self, int format); -QDate* QLocale_ToDate22(const QLocale* self, struct miqt_string* stringVal, int param2); -QTime* QLocale_ToTime22(const QLocale* self, struct miqt_string* stringVal, int param2); -QDateTime* QLocale_ToDateTime22(const QLocale* self, struct miqt_string* stringVal, int format); -struct miqt_string* QLocale_MonthName2(const QLocale* self, int param1, int format); -struct miqt_string* QLocale_StandaloneMonthName2(const QLocale* self, int param1, int format); -struct miqt_string* QLocale_DayName2(const QLocale* self, int param1, int format); -struct miqt_string* QLocale_StandaloneDayName2(const QLocale* self, int param1, int format); -struct miqt_string* QLocale_CurrencySymbol1(const QLocale* self, int param1); -struct miqt_string* QLocale_ToCurrencyString22(const QLocale* self, long long param1, struct miqt_string* symbol); -struct miqt_string* QLocale_ToCurrencyString23(const QLocale* self, unsigned long long param1, struct miqt_string* symbol); -struct miqt_string* QLocale_ToCurrencyString24(const QLocale* self, int16_t param1, struct miqt_string* symbol); -struct miqt_string* QLocale_ToCurrencyString25(const QLocale* self, uint16_t param1, struct miqt_string* symbol); -struct miqt_string* QLocale_ToCurrencyString26(const QLocale* self, int param1, struct miqt_string* symbol); -struct miqt_string* QLocale_ToCurrencyString27(const QLocale* self, unsigned int param1, struct miqt_string* symbol); -struct miqt_string* QLocale_ToCurrencyString28(const QLocale* self, double param1, struct miqt_string* symbol); -struct miqt_string* QLocale_ToCurrencyString29(const QLocale* self, float i, struct miqt_string* symbol); -struct miqt_string* QLocale_FormattedDataSize2(QLocale* self, long long bytes, int precision); -struct miqt_string* QLocale_FormattedDataSize3(QLocale* self, long long bytes, int precision, int format); -struct miqt_string* QLocale_FormattedDataSize22(const QLocale* self, long long bytes, int precision); -struct miqt_string* QLocale_FormattedDataSize32(const QLocale* self, long long bytes, int precision, int format); -struct miqt_string* QLocale_QuoteString2(const QLocale* self, struct miqt_string* str, int style); +struct miqt_string QLocale_QuoteString(const QLocale* self, struct miqt_string str); +struct miqt_string QLocale_CreateSeparatedList(const QLocale* self, struct miqt_array* /* of struct miqt_string */ strl); +int16_t QLocale_ToShort2(const QLocale* self, struct miqt_string s, bool* ok); +uint16_t QLocale_ToUShort2(const QLocale* self, struct miqt_string s, bool* ok); +int QLocale_ToInt2(const QLocale* self, struct miqt_string s, bool* ok); +unsigned int QLocale_ToUInt2(const QLocale* self, struct miqt_string s, bool* ok); +long QLocale_ToLong2(const QLocale* self, struct miqt_string s, bool* ok); +unsigned long QLocale_ToULong2(const QLocale* self, struct miqt_string s, bool* ok); +long long QLocale_ToLongLong2(const QLocale* self, struct miqt_string s, bool* ok); +unsigned long long QLocale_ToULongLong2(const QLocale* self, struct miqt_string s, bool* ok); +float QLocale_ToFloat2(const QLocale* self, struct miqt_string s, bool* ok); +double QLocale_ToDouble2(const QLocale* self, struct miqt_string s, bool* ok); +struct miqt_string QLocale_ToString22(const QLocale* self, double i, char f); +struct miqt_string QLocale_ToString32(const QLocale* self, double i, char f, int prec); +struct miqt_string QLocale_ToString23(const QLocale* self, float i, char f); +struct miqt_string QLocale_ToString33(const QLocale* self, float i, char f, int prec); +struct miqt_string QLocale_ToString24(const QLocale* self, QDate* date, int format); +struct miqt_string QLocale_ToString25(const QLocale* self, QTime* time, int format); +struct miqt_string QLocale_ToString26(const QLocale* self, QDateTime* dateTime, int format); +struct miqt_string QLocale_DateFormat1(const QLocale* self, int format); +struct miqt_string QLocale_TimeFormat1(const QLocale* self, int format); +struct miqt_string QLocale_DateTimeFormat1(const QLocale* self, int format); +QDate* QLocale_ToDate22(const QLocale* self, struct miqt_string stringVal, int param2); +QTime* QLocale_ToTime22(const QLocale* self, struct miqt_string stringVal, int param2); +QDateTime* QLocale_ToDateTime22(const QLocale* self, struct miqt_string stringVal, int format); +struct miqt_string QLocale_MonthName2(const QLocale* self, int param1, int format); +struct miqt_string QLocale_StandaloneMonthName2(const QLocale* self, int param1, int format); +struct miqt_string QLocale_DayName2(const QLocale* self, int param1, int format); +struct miqt_string QLocale_StandaloneDayName2(const QLocale* self, int param1, int format); +struct miqt_string QLocale_CurrencySymbol1(const QLocale* self, int param1); +struct miqt_string QLocale_ToCurrencyString22(const QLocale* self, long long param1, struct miqt_string symbol); +struct miqt_string QLocale_ToCurrencyString23(const QLocale* self, unsigned long long param1, struct miqt_string symbol); +struct miqt_string QLocale_ToCurrencyString24(const QLocale* self, int16_t param1, struct miqt_string symbol); +struct miqt_string QLocale_ToCurrencyString25(const QLocale* self, uint16_t param1, struct miqt_string symbol); +struct miqt_string QLocale_ToCurrencyString26(const QLocale* self, int param1, struct miqt_string symbol); +struct miqt_string QLocale_ToCurrencyString27(const QLocale* self, unsigned int param1, struct miqt_string symbol); +struct miqt_string QLocale_ToCurrencyString28(const QLocale* self, double param1, struct miqt_string symbol); +struct miqt_string QLocale_ToCurrencyString29(const QLocale* self, float i, struct miqt_string symbol); +struct miqt_string QLocale_FormattedDataSize2(QLocale* self, long long bytes, int precision); +struct miqt_string QLocale_FormattedDataSize3(QLocale* self, long long bytes, int precision, int format); +struct miqt_string QLocale_FormattedDataSize22(const QLocale* self, long long bytes, int precision); +struct miqt_string QLocale_FormattedDataSize32(const QLocale* self, long long bytes, int precision, int format); +struct miqt_string QLocale_QuoteString2(const QLocale* self, struct miqt_string str, int style); void QLocale_Delete(QLocale* self); #ifdef __cplusplus diff --git a/qt/gen_qlockfile.cpp b/qt/gen_qlockfile.cpp index 98a566a6..95c27183 100644 --- a/qt/gen_qlockfile.cpp +++ b/qt/gen_qlockfile.cpp @@ -6,8 +6,8 @@ #include "gen_qlockfile.h" #include "_cgo_export.h" -QLockFile* QLockFile_new(struct miqt_string* fileName) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +QLockFile* QLockFile_new(struct miqt_string fileName) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); return new QLockFile(fileName_QString); } diff --git a/qt/gen_qlockfile.go b/qt/gen_qlockfile.go index 690b622c..2c174948 100644 --- a/qt/gen_qlockfile.go +++ b/qt/gen_qlockfile.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -54,9 +53,11 @@ func UnsafeNewQLockFile(h unsafe.Pointer) *QLockFile { // NewQLockFile constructs a new QLockFile object. func NewQLockFile(fileName string) *QLockFile { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - ret := C.QLockFile_new((*C.struct_miqt_string)(fileName_ms)) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + ret := C.QLockFile_new(fileName_ms) return newQLockFile(ret) } diff --git a/qt/gen_qlockfile.h b/qt/gen_qlockfile.h index d5fdc12d..8d8a5920 100644 --- a/qt/gen_qlockfile.h +++ b/qt/gen_qlockfile.h @@ -19,7 +19,7 @@ class QLockFile; typedef struct QLockFile QLockFile; #endif -QLockFile* QLockFile_new(struct miqt_string* fileName); +QLockFile* QLockFile_new(struct miqt_string fileName); bool QLockFile_Lock(QLockFile* self); bool QLockFile_TryLock(QLockFile* self); void QLockFile_Unlock(QLockFile* self); diff --git a/qt/gen_qloggingcategory.cpp b/qt/gen_qloggingcategory.cpp index a92f8357..f7e39c04 100644 --- a/qt/gen_qloggingcategory.cpp +++ b/qt/gen_qloggingcategory.cpp @@ -46,8 +46,8 @@ QLoggingCategory* QLoggingCategory_DefaultCategory() { return QLoggingCategory::defaultCategory(); } -void QLoggingCategory_SetFilterRules(struct miqt_string* rules) { - QString rules_QString = QString::fromUtf8(&rules->data, rules->len); +void QLoggingCategory_SetFilterRules(struct miqt_string rules) { + QString rules_QString = QString::fromUtf8(rules.data, rules.len); QLoggingCategory::setFilterRules(rules_QString); } diff --git a/qt/gen_qloggingcategory.go b/qt/gen_qloggingcategory.go index 19fcfaf7..0b994895 100644 --- a/qt/gen_qloggingcategory.go +++ b/qt/gen_qloggingcategory.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -67,9 +66,9 @@ func (this *QLoggingCategory) IsCriticalEnabled() bool { return (bool)(C.QLoggingCategory_IsCriticalEnabled(this.h)) } -func (this *QLoggingCategory) CategoryName() unsafe.Pointer { +func (this *QLoggingCategory) CategoryName() string { _ret := C.QLoggingCategory_CategoryName(this.h) - return (unsafe.Pointer)(_ret) + return C.GoString(_ret) } func (this *QLoggingCategory) OperatorCall() *QLoggingCategory { @@ -85,9 +84,11 @@ func QLoggingCategory_DefaultCategory() *QLoggingCategory { } func QLoggingCategory_SetFilterRules(rules string) { - rules_ms := libmiqt.Strdupg(rules) - defer C.free(rules_ms) - C.QLoggingCategory_SetFilterRules((*C.struct_miqt_string)(rules_ms)) + rules_ms := C.struct_miqt_string{} + rules_ms.data = C.CString(rules) + rules_ms.len = C.size_t(len(rules)) + defer C.free(unsafe.Pointer(rules_ms.data)) + C.QLoggingCategory_SetFilterRules(rules_ms) } // Delete this object from C++ memory. diff --git a/qt/gen_qloggingcategory.h b/qt/gen_qloggingcategory.h index fbb4e2c5..c512c522 100644 --- a/qt/gen_qloggingcategory.h +++ b/qt/gen_qloggingcategory.h @@ -28,7 +28,7 @@ const char* QLoggingCategory_CategoryName(const QLoggingCategory* self); QLoggingCategory* QLoggingCategory_OperatorCall(QLoggingCategory* self); QLoggingCategory* QLoggingCategory_OperatorCall2(const QLoggingCategory* self); QLoggingCategory* QLoggingCategory_DefaultCategory(); -void QLoggingCategory_SetFilterRules(struct miqt_string* rules); +void QLoggingCategory_SetFilterRules(struct miqt_string rules); void QLoggingCategory_Delete(QLoggingCategory* self); #ifdef __cplusplus diff --git a/qt/gen_qmainwindow.cpp b/qt/gen_qmainwindow.cpp index 87298c0d..f7654fdb 100644 --- a/qt/gen_qmainwindow.cpp +++ b/qt/gen_qmainwindow.cpp @@ -37,18 +37,26 @@ void* QMainWindow_Metacast(QMainWindow* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QMainWindow_Tr(const char* s) { +struct miqt_string QMainWindow_Tr(const char* s) { QString _ret = QMainWindow::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QMainWindow_TrUtf8(const char* s) { +struct miqt_string QMainWindow_TrUtf8(const char* s) { QString _ret = QMainWindow::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QSize* QMainWindow_IconSize(const QMainWindow* self) { @@ -176,8 +184,8 @@ void QMainWindow_AddToolBarWithToolbar(QMainWindow* self, QToolBar* toolbar) { self->addToolBar(toolbar); } -QToolBar* QMainWindow_AddToolBarWithTitle(QMainWindow* self, struct miqt_string* title) { - QString title_QString = QString::fromUtf8(&title->data, title->len); +QToolBar* QMainWindow_AddToolBarWithTitle(QMainWindow* self, struct miqt_string title) { + QString title_QString = QString::fromUtf8(title.data, title.len); return self->addToolBar(title_QString); } @@ -264,12 +272,18 @@ void QMainWindow_ResizeDocks(QMainWindow* self, struct miqt_array* /* of QDockWi self->resizeDocks(docks_QList, sizes_QList, static_cast(orientation)); } -QByteArray* QMainWindow_SaveState(const QMainWindow* self) { - return new QByteArray(self->saveState()); +struct miqt_string QMainWindow_SaveState(const QMainWindow* self) { + QByteArray _qb = self->saveState(); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } -bool QMainWindow_RestoreState(QMainWindow* self, QByteArray* state) { - return self->restoreState(*state); +bool QMainWindow_RestoreState(QMainWindow* self, struct miqt_string state) { + QByteArray state_QByteArray(state.data, state.len); + return self->restoreState(state_QByteArray); } QMenu* QMainWindow_CreatePopupMenu(QMainWindow* self) { @@ -324,44 +338,66 @@ void QMainWindow_connect_TabifiedDockWidgetActivated(QMainWindow* self, intptr_t }); } -struct miqt_string* QMainWindow_Tr2(const char* s, const char* c) { +struct miqt_string QMainWindow_Tr2(const char* s, const char* c) { QString _ret = QMainWindow::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QMainWindow_Tr3(const char* s, const char* c, int n) { +struct miqt_string QMainWindow_Tr3(const char* s, const char* c, int n) { QString _ret = QMainWindow::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QMainWindow_TrUtf82(const char* s, const char* c) { +struct miqt_string QMainWindow_TrUtf82(const char* s, const char* c) { QString _ret = QMainWindow::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QMainWindow_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QMainWindow_TrUtf83(const char* s, const char* c, int n) { QString _ret = QMainWindow::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QMainWindow_AddToolBarBreak1(QMainWindow* self, int area) { self->addToolBarBreak(static_cast(area)); } -QByteArray* QMainWindow_SaveState1(const QMainWindow* self, int version) { - return new QByteArray(self->saveState(static_cast(version))); +struct miqt_string QMainWindow_SaveState1(const QMainWindow* self, int version) { + QByteArray _qb = self->saveState(static_cast(version)); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } -bool QMainWindow_RestoreState2(QMainWindow* self, QByteArray* state, int version) { - return self->restoreState(*state, static_cast(version)); +bool QMainWindow_RestoreState2(QMainWindow* self, struct miqt_string state, int version) { + QByteArray state_QByteArray(state.data, state.len); + return self->restoreState(state_QByteArray, static_cast(version)); } void QMainWindow_Delete(QMainWindow* self) { diff --git a/qt/gen_qmainwindow.go b/qt/gen_qmainwindow.go index b56a2037..beab6fea 100644 --- a/qt/gen_qmainwindow.go +++ b/qt/gen_qmainwindow.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "runtime/cgo" "unsafe" @@ -81,24 +80,24 @@ func (this *QMainWindow) MetaObject() *QMetaObject { func (this *QMainWindow) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QMainWindow_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QMainWindow_Metacast(this.h, param1_Cstring)) } func QMainWindow_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QMainWindow_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMainWindow_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QMainWindow_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QMainWindow_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMainWindow_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -226,9 +225,11 @@ func (this *QMainWindow) AddToolBarWithToolbar(toolbar *QToolBar) { } func (this *QMainWindow) AddToolBarWithTitle(title string) *QToolBar { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - return UnsafeNewQToolBar(unsafe.Pointer(C.QMainWindow_AddToolBarWithTitle(this.h, (*C.struct_miqt_string)(title_ms)))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + return UnsafeNewQToolBar(unsafe.Pointer(C.QMainWindow_AddToolBarWithTitle(this.h, title_ms))) } func (this *QMainWindow) InsertToolBar(before *QToolBar, toolbar *QToolBar) { @@ -314,15 +315,18 @@ func (this *QMainWindow) ResizeDocks(docks []*QDockWidget, sizes []int, orientat C.QMainWindow_ResizeDocks(this.h, docks_ma, sizes_ma, (C.int)(orientation)) } -func (this *QMainWindow) SaveState() *QByteArray { - _ret := C.QMainWindow_SaveState(this.h) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QMainWindow) SaveState() []byte { + var _bytearray C.struct_miqt_string = C.QMainWindow_SaveState(this.h) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } -func (this *QMainWindow) RestoreState(state *QByteArray) bool { - return (bool)(C.QMainWindow_RestoreState(this.h, state.cPointer())) +func (this *QMainWindow) RestoreState(state []byte) bool { + state_alias := C.struct_miqt_string{} + state_alias.data = (*C.char)(unsafe.Pointer(&state[0])) + state_alias.len = C.size_t(len(state)) + return (bool)(C.QMainWindow_RestoreState(this.h, state_alias)) } func (this *QMainWindow) CreatePopupMenu() *QMenu { @@ -406,9 +410,9 @@ func QMainWindow_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QMainWindow_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMainWindow_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -417,9 +421,9 @@ func QMainWindow_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QMainWindow_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMainWindow_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -428,9 +432,9 @@ func QMainWindow_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QMainWindow_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMainWindow_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -439,9 +443,9 @@ func QMainWindow_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QMainWindow_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMainWindow_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -449,15 +453,18 @@ func (this *QMainWindow) AddToolBarBreak1(area ToolBarArea) { C.QMainWindow_AddToolBarBreak1(this.h, (C.int)(area)) } -func (this *QMainWindow) SaveState1(version int) *QByteArray { - _ret := C.QMainWindow_SaveState1(this.h, (C.int)(version)) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QMainWindow) SaveState1(version int) []byte { + var _bytearray C.struct_miqt_string = C.QMainWindow_SaveState1(this.h, (C.int)(version)) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } -func (this *QMainWindow) RestoreState2(state *QByteArray, version int) bool { - return (bool)(C.QMainWindow_RestoreState2(this.h, state.cPointer(), (C.int)(version))) +func (this *QMainWindow) RestoreState2(state []byte, version int) bool { + state_alias := C.struct_miqt_string{} + state_alias.data = (*C.char)(unsafe.Pointer(&state[0])) + state_alias.len = C.size_t(len(state)) + return (bool)(C.QMainWindow_RestoreState2(this.h, state_alias, (C.int)(version))) } // Delete this object from C++ memory. diff --git a/qt/gen_qmainwindow.h b/qt/gen_qmainwindow.h index 72c6126a..665b5ea5 100644 --- a/qt/gen_qmainwindow.h +++ b/qt/gen_qmainwindow.h @@ -44,8 +44,8 @@ QMainWindow* QMainWindow_new2(QWidget* parent); QMainWindow* QMainWindow_new3(QWidget* parent, int flags); QMetaObject* QMainWindow_MetaObject(const QMainWindow* self); void* QMainWindow_Metacast(QMainWindow* self, const char* param1); -struct miqt_string* QMainWindow_Tr(const char* s); -struct miqt_string* QMainWindow_TrUtf8(const char* s); +struct miqt_string QMainWindow_Tr(const char* s); +struct miqt_string QMainWindow_TrUtf8(const char* s); QSize* QMainWindow_IconSize(const QMainWindow* self); void QMainWindow_SetIconSize(QMainWindow* self, QSize* iconSize); int QMainWindow_ToolButtonStyle(const QMainWindow* self); @@ -76,7 +76,7 @@ void QMainWindow_AddToolBarBreak(QMainWindow* self); void QMainWindow_InsertToolBarBreak(QMainWindow* self, QToolBar* before); void QMainWindow_AddToolBar(QMainWindow* self, int area, QToolBar* toolbar); void QMainWindow_AddToolBarWithToolbar(QMainWindow* self, QToolBar* toolbar); -QToolBar* QMainWindow_AddToolBarWithTitle(QMainWindow* self, struct miqt_string* title); +QToolBar* QMainWindow_AddToolBarWithTitle(QMainWindow* self, struct miqt_string title); void QMainWindow_InsertToolBar(QMainWindow* self, QToolBar* before, QToolBar* toolbar); void QMainWindow_RemoveToolBar(QMainWindow* self, QToolBar* toolbar); void QMainWindow_RemoveToolBarBreak(QMainWindow* self, QToolBar* before); @@ -92,8 +92,8 @@ void QMainWindow_RemoveDockWidget(QMainWindow* self, QDockWidget* dockwidget); bool QMainWindow_RestoreDockWidget(QMainWindow* self, QDockWidget* dockwidget); int QMainWindow_DockWidgetArea(const QMainWindow* self, QDockWidget* dockwidget); void QMainWindow_ResizeDocks(QMainWindow* self, struct miqt_array* /* of QDockWidget* */ docks, struct miqt_array* /* of int */ sizes, int orientation); -QByteArray* QMainWindow_SaveState(const QMainWindow* self); -bool QMainWindow_RestoreState(QMainWindow* self, QByteArray* state); +struct miqt_string QMainWindow_SaveState(const QMainWindow* self); +bool QMainWindow_RestoreState(QMainWindow* self, struct miqt_string state); QMenu* QMainWindow_CreatePopupMenu(QMainWindow* self); void QMainWindow_SetAnimated(QMainWindow* self, bool enabled); void QMainWindow_SetDockNestingEnabled(QMainWindow* self, bool enabled); @@ -104,13 +104,13 @@ void QMainWindow_ToolButtonStyleChanged(QMainWindow* self, int toolButtonStyle); void QMainWindow_connect_ToolButtonStyleChanged(QMainWindow* self, intptr_t slot); void QMainWindow_TabifiedDockWidgetActivated(QMainWindow* self, QDockWidget* dockWidget); void QMainWindow_connect_TabifiedDockWidgetActivated(QMainWindow* self, intptr_t slot); -struct miqt_string* QMainWindow_Tr2(const char* s, const char* c); -struct miqt_string* QMainWindow_Tr3(const char* s, const char* c, int n); -struct miqt_string* QMainWindow_TrUtf82(const char* s, const char* c); -struct miqt_string* QMainWindow_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QMainWindow_Tr2(const char* s, const char* c); +struct miqt_string QMainWindow_Tr3(const char* s, const char* c, int n); +struct miqt_string QMainWindow_TrUtf82(const char* s, const char* c); +struct miqt_string QMainWindow_TrUtf83(const char* s, const char* c, int n); void QMainWindow_AddToolBarBreak1(QMainWindow* self, int area); -QByteArray* QMainWindow_SaveState1(const QMainWindow* self, int version); -bool QMainWindow_RestoreState2(QMainWindow* self, QByteArray* state, int version); +struct miqt_string QMainWindow_SaveState1(const QMainWindow* self, int version); +bool QMainWindow_RestoreState2(QMainWindow* self, struct miqt_string state, int version); void QMainWindow_Delete(QMainWindow* self); #ifdef __cplusplus diff --git a/qt/gen_qmdiarea.cpp b/qt/gen_qmdiarea.cpp index 36c8a877..f0f211a3 100644 --- a/qt/gen_qmdiarea.cpp +++ b/qt/gen_qmdiarea.cpp @@ -28,18 +28,26 @@ void* QMdiArea_Metacast(QMdiArea* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QMdiArea_Tr(const char* s) { +struct miqt_string QMdiArea_Tr(const char* s) { QString _ret = QMdiArea::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QMdiArea_TrUtf8(const char* s) { +struct miqt_string QMdiArea_TrUtf8(const char* s) { QString _ret = QMdiArea::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QSize* QMdiArea_SizeHint(const QMdiArea* self) { @@ -194,32 +202,48 @@ void QMdiArea_ActivatePreviousSubWindow(QMdiArea* self) { self->activatePreviousSubWindow(); } -struct miqt_string* QMdiArea_Tr2(const char* s, const char* c) { +struct miqt_string QMdiArea_Tr2(const char* s, const char* c) { QString _ret = QMdiArea::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QMdiArea_Tr3(const char* s, const char* c, int n) { +struct miqt_string QMdiArea_Tr3(const char* s, const char* c, int n) { QString _ret = QMdiArea::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QMdiArea_TrUtf82(const char* s, const char* c) { +struct miqt_string QMdiArea_TrUtf82(const char* s, const char* c) { QString _ret = QMdiArea::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QMdiArea_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QMdiArea_TrUtf83(const char* s, const char* c, int n) { QString _ret = QMdiArea::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } struct miqt_array* QMdiArea_SubWindowList1(const QMdiArea* self, int order) { diff --git a/qt/gen_qmdiarea.go b/qt/gen_qmdiarea.go index cea8cf23..a89f7c7d 100644 --- a/qt/gen_qmdiarea.go +++ b/qt/gen_qmdiarea.go @@ -84,24 +84,24 @@ func (this *QMdiArea) MetaObject() *QMetaObject { func (this *QMdiArea) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QMdiArea_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QMdiArea_Metacast(this.h, param1_Cstring)) } func QMdiArea_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QMdiArea_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMdiArea_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QMdiArea_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QMdiArea_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMdiArea_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -274,9 +274,9 @@ func QMdiArea_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QMdiArea_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMdiArea_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -285,9 +285,9 @@ func QMdiArea_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QMdiArea_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMdiArea_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -296,9 +296,9 @@ func QMdiArea_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QMdiArea_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMdiArea_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -307,9 +307,9 @@ func QMdiArea_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QMdiArea_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMdiArea_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qmdiarea.h b/qt/gen_qmdiarea.h index 406da3a1..437cfdaa 100644 --- a/qt/gen_qmdiarea.h +++ b/qt/gen_qmdiarea.h @@ -33,8 +33,8 @@ QMdiArea* QMdiArea_new(); QMdiArea* QMdiArea_new2(QWidget* parent); QMetaObject* QMdiArea_MetaObject(const QMdiArea* self); void* QMdiArea_Metacast(QMdiArea* self, const char* param1); -struct miqt_string* QMdiArea_Tr(const char* s); -struct miqt_string* QMdiArea_TrUtf8(const char* s); +struct miqt_string QMdiArea_Tr(const char* s); +struct miqt_string QMdiArea_TrUtf8(const char* s); QSize* QMdiArea_SizeHint(const QMdiArea* self); QSize* QMdiArea_MinimumSizeHint(const QMdiArea* self); QMdiSubWindow* QMdiArea_CurrentSubWindow(const QMdiArea* self); @@ -69,10 +69,10 @@ void QMdiArea_CloseActiveSubWindow(QMdiArea* self); void QMdiArea_CloseAllSubWindows(QMdiArea* self); void QMdiArea_ActivateNextSubWindow(QMdiArea* self); void QMdiArea_ActivatePreviousSubWindow(QMdiArea* self); -struct miqt_string* QMdiArea_Tr2(const char* s, const char* c); -struct miqt_string* QMdiArea_Tr3(const char* s, const char* c, int n); -struct miqt_string* QMdiArea_TrUtf82(const char* s, const char* c); -struct miqt_string* QMdiArea_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QMdiArea_Tr2(const char* s, const char* c); +struct miqt_string QMdiArea_Tr3(const char* s, const char* c, int n); +struct miqt_string QMdiArea_TrUtf82(const char* s, const char* c); +struct miqt_string QMdiArea_TrUtf83(const char* s, const char* c, int n); struct miqt_array* QMdiArea_SubWindowList1(const QMdiArea* self, int order); QMdiSubWindow* QMdiArea_AddSubWindow2(QMdiArea* self, QWidget* widget, int flags); void QMdiArea_SetOption2(QMdiArea* self, int option, bool on); diff --git a/qt/gen_qmdisubwindow.cpp b/qt/gen_qmdisubwindow.cpp index db3811e3..4dc9e9b2 100644 --- a/qt/gen_qmdisubwindow.cpp +++ b/qt/gen_qmdisubwindow.cpp @@ -31,18 +31,26 @@ void* QMdiSubWindow_Metacast(QMdiSubWindow* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QMdiSubWindow_Tr(const char* s) { +struct miqt_string QMdiSubWindow_Tr(const char* s) { QString _ret = QMdiSubWindow::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QMdiSubWindow_TrUtf8(const char* s) { +struct miqt_string QMdiSubWindow_TrUtf8(const char* s) { QString _ret = QMdiSubWindow::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QSize* QMdiSubWindow_SizeHint(const QMdiSubWindow* self) { @@ -141,32 +149,48 @@ void QMdiSubWindow_ShowShaded(QMdiSubWindow* self) { self->showShaded(); } -struct miqt_string* QMdiSubWindow_Tr2(const char* s, const char* c) { +struct miqt_string QMdiSubWindow_Tr2(const char* s, const char* c) { QString _ret = QMdiSubWindow::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QMdiSubWindow_Tr3(const char* s, const char* c, int n) { +struct miqt_string QMdiSubWindow_Tr3(const char* s, const char* c, int n) { QString _ret = QMdiSubWindow::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QMdiSubWindow_TrUtf82(const char* s, const char* c) { +struct miqt_string QMdiSubWindow_TrUtf82(const char* s, const char* c) { QString _ret = QMdiSubWindow::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QMdiSubWindow_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QMdiSubWindow_TrUtf83(const char* s, const char* c, int n) { QString _ret = QMdiSubWindow::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QMdiSubWindow_SetOption2(QMdiSubWindow* self, int option, bool on) { diff --git a/qt/gen_qmdisubwindow.go b/qt/gen_qmdisubwindow.go index 433be17c..6285ac74 100644 --- a/qt/gen_qmdisubwindow.go +++ b/qt/gen_qmdisubwindow.go @@ -78,24 +78,24 @@ func (this *QMdiSubWindow) MetaObject() *QMetaObject { func (this *QMdiSubWindow) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QMdiSubWindow_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QMdiSubWindow_Metacast(this.h, param1_Cstring)) } func QMdiSubWindow_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QMdiSubWindow_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMdiSubWindow_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QMdiSubWindow_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QMdiSubWindow_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMdiSubWindow_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -221,9 +221,9 @@ func QMdiSubWindow_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QMdiSubWindow_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMdiSubWindow_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -232,9 +232,9 @@ func QMdiSubWindow_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QMdiSubWindow_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMdiSubWindow_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -243,9 +243,9 @@ func QMdiSubWindow_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QMdiSubWindow_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMdiSubWindow_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -254,9 +254,9 @@ func QMdiSubWindow_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QMdiSubWindow_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMdiSubWindow_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qmdisubwindow.h b/qt/gen_qmdisubwindow.h index 77d16490..55e0551e 100644 --- a/qt/gen_qmdisubwindow.h +++ b/qt/gen_qmdisubwindow.h @@ -34,8 +34,8 @@ QMdiSubWindow* QMdiSubWindow_new2(QWidget* parent); QMdiSubWindow* QMdiSubWindow_new3(QWidget* parent, int flags); QMetaObject* QMdiSubWindow_MetaObject(const QMdiSubWindow* self); void* QMdiSubWindow_Metacast(QMdiSubWindow* self, const char* param1); -struct miqt_string* QMdiSubWindow_Tr(const char* s); -struct miqt_string* QMdiSubWindow_TrUtf8(const char* s); +struct miqt_string QMdiSubWindow_Tr(const char* s); +struct miqt_string QMdiSubWindow_TrUtf8(const char* s); QSize* QMdiSubWindow_SizeHint(const QMdiSubWindow* self); QSize* QMdiSubWindow_MinimumSizeHint(const QMdiSubWindow* self); void QMdiSubWindow_SetWidget(QMdiSubWindow* self, QWidget* widget); @@ -58,10 +58,10 @@ void QMdiSubWindow_AboutToActivate(QMdiSubWindow* self); void QMdiSubWindow_connect_AboutToActivate(QMdiSubWindow* self, intptr_t slot); void QMdiSubWindow_ShowSystemMenu(QMdiSubWindow* self); void QMdiSubWindow_ShowShaded(QMdiSubWindow* self); -struct miqt_string* QMdiSubWindow_Tr2(const char* s, const char* c); -struct miqt_string* QMdiSubWindow_Tr3(const char* s, const char* c, int n); -struct miqt_string* QMdiSubWindow_TrUtf82(const char* s, const char* c); -struct miqt_string* QMdiSubWindow_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QMdiSubWindow_Tr2(const char* s, const char* c); +struct miqt_string QMdiSubWindow_Tr3(const char* s, const char* c, int n); +struct miqt_string QMdiSubWindow_TrUtf82(const char* s, const char* c); +struct miqt_string QMdiSubWindow_TrUtf83(const char* s, const char* c, int n); void QMdiSubWindow_SetOption2(QMdiSubWindow* self, int option, bool on); void QMdiSubWindow_Delete(QMdiSubWindow* self); diff --git a/qt/gen_qmenu.cpp b/qt/gen_qmenu.cpp index 02cd85eb..62e46110 100644 --- a/qt/gen_qmenu.cpp +++ b/qt/gen_qmenu.cpp @@ -18,8 +18,8 @@ QMenu* QMenu_new() { return new QMenu(); } -QMenu* QMenu_new2(struct miqt_string* title) { - QString title_QString = QString::fromUtf8(&title->data, title->len); +QMenu* QMenu_new2(struct miqt_string title) { + QString title_QString = QString::fromUtf8(title.data, title.len); return new QMenu(title_QString); } @@ -27,8 +27,8 @@ QMenu* QMenu_new3(QWidget* parent) { return new QMenu(parent); } -QMenu* QMenu_new4(struct miqt_string* title, QWidget* parent) { - QString title_QString = QString::fromUtf8(&title->data, title->len); +QMenu* QMenu_new4(struct miqt_string title, QWidget* parent) { + QString title_QString = QString::fromUtf8(title.data, title.len); return new QMenu(title_QString, parent); } @@ -40,27 +40,35 @@ void* QMenu_Metacast(QMenu* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QMenu_Tr(const char* s) { +struct miqt_string QMenu_Tr(const char* s) { QString _ret = QMenu::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QMenu_TrUtf8(const char* s) { +struct miqt_string QMenu_TrUtf8(const char* s) { QString _ret = QMenu::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -QAction* QMenu_AddAction(QMenu* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QAction* QMenu_AddAction(QMenu* self, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); return self->addAction(text_QString); } -QAction* QMenu_AddAction2(QMenu* self, QIcon* icon, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QAction* QMenu_AddAction2(QMenu* self, QIcon* icon, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); return self->addAction(*icon, text_QString); } @@ -68,13 +76,13 @@ QAction* QMenu_AddMenu(QMenu* self, QMenu* menu) { return self->addMenu(menu); } -QMenu* QMenu_AddMenuWithTitle(QMenu* self, struct miqt_string* title) { - QString title_QString = QString::fromUtf8(&title->data, title->len); +QMenu* QMenu_AddMenuWithTitle(QMenu* self, struct miqt_string title) { + QString title_QString = QString::fromUtf8(title.data, title.len); return self->addMenu(title_QString); } -QMenu* QMenu_AddMenu2(QMenu* self, QIcon* icon, struct miqt_string* title) { - QString title_QString = QString::fromUtf8(&title->data, title->len); +QMenu* QMenu_AddMenu2(QMenu* self, QIcon* icon, struct miqt_string title) { + QString title_QString = QString::fromUtf8(title.data, title.len); return self->addMenu(*icon, title_QString); } @@ -82,13 +90,13 @@ QAction* QMenu_AddSeparator(QMenu* self) { return self->addSeparator(); } -QAction* QMenu_AddSection(QMenu* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QAction* QMenu_AddSection(QMenu* self, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); return self->addSection(text_QString); } -QAction* QMenu_AddSection2(QMenu* self, QIcon* icon, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QAction* QMenu_AddSection2(QMenu* self, QIcon* icon, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); return self->addSection(*icon, text_QString); } @@ -100,13 +108,13 @@ QAction* QMenu_InsertSeparator(QMenu* self, QAction* before) { return self->insertSeparator(before); } -QAction* QMenu_InsertSection(QMenu* self, QAction* before, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QAction* QMenu_InsertSection(QMenu* self, QAction* before, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); return self->insertSection(before, text_QString); } -QAction* QMenu_InsertSection2(QMenu* self, QAction* before, QIcon* icon, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QAction* QMenu_InsertSection2(QMenu* self, QAction* before, QIcon* icon, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); return self->insertSection(before, *icon, text_QString); } @@ -196,15 +204,19 @@ QAction* QMenu_MenuAction(const QMenu* self) { return self->menuAction(); } -struct miqt_string* QMenu_Title(const QMenu* self) { +struct miqt_string QMenu_Title(const QMenu* self) { QString _ret = self->title(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QMenu_SetTitle(QMenu* self, struct miqt_string* title) { - QString title_QString = QString::fromUtf8(&title->data, title->len); +void QMenu_SetTitle(QMenu* self, struct miqt_string title) { + QString title_QString = QString::fromUtf8(title.data, title.len); self->setTitle(title_QString); } @@ -278,32 +290,48 @@ void QMenu_connect_Hovered(QMenu* self, intptr_t slot) { }); } -struct miqt_string* QMenu_Tr2(const char* s, const char* c) { +struct miqt_string QMenu_Tr2(const char* s, const char* c) { QString _ret = QMenu::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QMenu_Tr3(const char* s, const char* c, int n) { +struct miqt_string QMenu_Tr3(const char* s, const char* c, int n) { QString _ret = QMenu::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QMenu_TrUtf82(const char* s, const char* c) { +struct miqt_string QMenu_TrUtf82(const char* s, const char* c) { QString _ret = QMenu::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QMenu_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QMenu_TrUtf83(const char* s, const char* c, int n) { QString _ret = QMenu::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QMenu_Popup2(QMenu* self, QPoint* pos, QAction* at) { diff --git a/qt/gen_qmenu.go b/qt/gen_qmenu.go index eba3f93c..68cbdebf 100644 --- a/qt/gen_qmenu.go +++ b/qt/gen_qmenu.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "runtime/cgo" "unsafe" @@ -53,9 +52,11 @@ func NewQMenu() *QMenu { // NewQMenu2 constructs a new QMenu object. func NewQMenu2(title string) *QMenu { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - ret := C.QMenu_new2((*C.struct_miqt_string)(title_ms)) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + ret := C.QMenu_new2(title_ms) return newQMenu(ret) } @@ -67,9 +68,11 @@ func NewQMenu3(parent *QWidget) *QMenu { // NewQMenu4 constructs a new QMenu object. func NewQMenu4(title string, parent *QWidget) *QMenu { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - ret := C.QMenu_new4((*C.struct_miqt_string)(title_ms), parent.cPointer()) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + ret := C.QMenu_new4(title_ms, parent.cPointer()) return newQMenu(ret) } @@ -80,37 +83,41 @@ func (this *QMenu) MetaObject() *QMetaObject { func (this *QMenu) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QMenu_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QMenu_Metacast(this.h, param1_Cstring)) } func QMenu_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QMenu_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMenu_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QMenu_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QMenu_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMenu_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QMenu) AddAction(text string) *QAction { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - return UnsafeNewQAction(unsafe.Pointer(C.QMenu_AddAction(this.h, (*C.struct_miqt_string)(text_ms)))) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + return UnsafeNewQAction(unsafe.Pointer(C.QMenu_AddAction(this.h, text_ms))) } func (this *QMenu) AddAction2(icon *QIcon, text string) *QAction { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - return UnsafeNewQAction(unsafe.Pointer(C.QMenu_AddAction2(this.h, icon.cPointer(), (*C.struct_miqt_string)(text_ms)))) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + return UnsafeNewQAction(unsafe.Pointer(C.QMenu_AddAction2(this.h, icon.cPointer(), text_ms))) } func (this *QMenu) AddMenu(menu *QMenu) *QAction { @@ -118,15 +125,19 @@ func (this *QMenu) AddMenu(menu *QMenu) *QAction { } func (this *QMenu) AddMenuWithTitle(title string) *QMenu { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - return UnsafeNewQMenu(unsafe.Pointer(C.QMenu_AddMenuWithTitle(this.h, (*C.struct_miqt_string)(title_ms)))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + return UnsafeNewQMenu(unsafe.Pointer(C.QMenu_AddMenuWithTitle(this.h, title_ms))) } func (this *QMenu) AddMenu2(icon *QIcon, title string) *QMenu { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - return UnsafeNewQMenu(unsafe.Pointer(C.QMenu_AddMenu2(this.h, icon.cPointer(), (*C.struct_miqt_string)(title_ms)))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + return UnsafeNewQMenu(unsafe.Pointer(C.QMenu_AddMenu2(this.h, icon.cPointer(), title_ms))) } func (this *QMenu) AddSeparator() *QAction { @@ -134,15 +145,19 @@ func (this *QMenu) AddSeparator() *QAction { } func (this *QMenu) AddSection(text string) *QAction { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - return UnsafeNewQAction(unsafe.Pointer(C.QMenu_AddSection(this.h, (*C.struct_miqt_string)(text_ms)))) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + return UnsafeNewQAction(unsafe.Pointer(C.QMenu_AddSection(this.h, text_ms))) } func (this *QMenu) AddSection2(icon *QIcon, text string) *QAction { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - return UnsafeNewQAction(unsafe.Pointer(C.QMenu_AddSection2(this.h, icon.cPointer(), (*C.struct_miqt_string)(text_ms)))) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + return UnsafeNewQAction(unsafe.Pointer(C.QMenu_AddSection2(this.h, icon.cPointer(), text_ms))) } func (this *QMenu) InsertMenu(before *QAction, menu *QMenu) *QAction { @@ -154,15 +169,19 @@ func (this *QMenu) InsertSeparator(before *QAction) *QAction { } func (this *QMenu) InsertSection(before *QAction, text string) *QAction { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - return UnsafeNewQAction(unsafe.Pointer(C.QMenu_InsertSection(this.h, before.cPointer(), (*C.struct_miqt_string)(text_ms)))) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + return UnsafeNewQAction(unsafe.Pointer(C.QMenu_InsertSection(this.h, before.cPointer(), text_ms))) } func (this *QMenu) InsertSection2(before *QAction, icon *QIcon, text string) *QAction { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - return UnsafeNewQAction(unsafe.Pointer(C.QMenu_InsertSection2(this.h, before.cPointer(), icon.cPointer(), (*C.struct_miqt_string)(text_ms)))) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + return UnsafeNewQAction(unsafe.Pointer(C.QMenu_InsertSection2(this.h, before.cPointer(), icon.cPointer(), text_ms))) } func (this *QMenu) IsEmpty() bool { @@ -260,16 +279,18 @@ func (this *QMenu) MenuAction() *QAction { } func (this *QMenu) Title() string { - var _ms *C.struct_miqt_string = C.QMenu_Title(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMenu_Title(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QMenu) SetTitle(title string) { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - C.QMenu_SetTitle(this.h, (*C.struct_miqt_string)(title_ms)) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + C.QMenu_SetTitle(this.h, title_ms) } func (this *QMenu) Icon() *QIcon { @@ -382,9 +403,9 @@ func QMenu_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QMenu_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMenu_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -393,9 +414,9 @@ func QMenu_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QMenu_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMenu_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -404,9 +425,9 @@ func QMenu_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QMenu_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMenu_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -415,9 +436,9 @@ func QMenu_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QMenu_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMenu_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qmenu.h b/qt/gen_qmenu.h index 44e27939..253fa733 100644 --- a/qt/gen_qmenu.h +++ b/qt/gen_qmenu.h @@ -34,25 +34,25 @@ typedef struct QWidget QWidget; #endif QMenu* QMenu_new(); -QMenu* QMenu_new2(struct miqt_string* title); +QMenu* QMenu_new2(struct miqt_string title); QMenu* QMenu_new3(QWidget* parent); -QMenu* QMenu_new4(struct miqt_string* title, QWidget* parent); +QMenu* QMenu_new4(struct miqt_string title, QWidget* parent); QMetaObject* QMenu_MetaObject(const QMenu* self); void* QMenu_Metacast(QMenu* self, const char* param1); -struct miqt_string* QMenu_Tr(const char* s); -struct miqt_string* QMenu_TrUtf8(const char* s); -QAction* QMenu_AddAction(QMenu* self, struct miqt_string* text); -QAction* QMenu_AddAction2(QMenu* self, QIcon* icon, struct miqt_string* text); +struct miqt_string QMenu_Tr(const char* s); +struct miqt_string QMenu_TrUtf8(const char* s); +QAction* QMenu_AddAction(QMenu* self, struct miqt_string text); +QAction* QMenu_AddAction2(QMenu* self, QIcon* icon, struct miqt_string text); QAction* QMenu_AddMenu(QMenu* self, QMenu* menu); -QMenu* QMenu_AddMenuWithTitle(QMenu* self, struct miqt_string* title); -QMenu* QMenu_AddMenu2(QMenu* self, QIcon* icon, struct miqt_string* title); +QMenu* QMenu_AddMenuWithTitle(QMenu* self, struct miqt_string title); +QMenu* QMenu_AddMenu2(QMenu* self, QIcon* icon, struct miqt_string title); QAction* QMenu_AddSeparator(QMenu* self); -QAction* QMenu_AddSection(QMenu* self, struct miqt_string* text); -QAction* QMenu_AddSection2(QMenu* self, QIcon* icon, struct miqt_string* text); +QAction* QMenu_AddSection(QMenu* self, struct miqt_string text); +QAction* QMenu_AddSection2(QMenu* self, QIcon* icon, struct miqt_string text); QAction* QMenu_InsertMenu(QMenu* self, QAction* before, QMenu* menu); QAction* QMenu_InsertSeparator(QMenu* self, QAction* before); -QAction* QMenu_InsertSection(QMenu* self, QAction* before, struct miqt_string* text); -QAction* QMenu_InsertSection2(QMenu* self, QAction* before, QIcon* icon, struct miqt_string* text); +QAction* QMenu_InsertSection(QMenu* self, QAction* before, struct miqt_string text); +QAction* QMenu_InsertSection2(QMenu* self, QAction* before, QIcon* icon, struct miqt_string text); bool QMenu_IsEmpty(const QMenu* self); void QMenu_Clear(QMenu* self); void QMenu_SetTearOffEnabled(QMenu* self, bool tearOffEnabled); @@ -73,8 +73,8 @@ QSize* QMenu_SizeHint(const QMenu* self); QRect* QMenu_ActionGeometry(const QMenu* self, QAction* param1); QAction* QMenu_ActionAt(const QMenu* self, QPoint* param1); QAction* QMenu_MenuAction(const QMenu* self); -struct miqt_string* QMenu_Title(const QMenu* self); -void QMenu_SetTitle(QMenu* self, struct miqt_string* title); +struct miqt_string QMenu_Title(const QMenu* self); +void QMenu_SetTitle(QMenu* self, struct miqt_string title); QIcon* QMenu_Icon(const QMenu* self); void QMenu_SetIcon(QMenu* self, QIcon* icon); void QMenu_SetNoReplayFor(QMenu* self, QWidget* widget); @@ -90,10 +90,10 @@ void QMenu_Triggered(QMenu* self, QAction* action); void QMenu_connect_Triggered(QMenu* self, intptr_t slot); void QMenu_Hovered(QMenu* self, QAction* action); void QMenu_connect_Hovered(QMenu* self, intptr_t slot); -struct miqt_string* QMenu_Tr2(const char* s, const char* c); -struct miqt_string* QMenu_Tr3(const char* s, const char* c, int n); -struct miqt_string* QMenu_TrUtf82(const char* s, const char* c); -struct miqt_string* QMenu_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QMenu_Tr2(const char* s, const char* c); +struct miqt_string QMenu_Tr3(const char* s, const char* c, int n); +struct miqt_string QMenu_TrUtf82(const char* s, const char* c); +struct miqt_string QMenu_TrUtf83(const char* s, const char* c, int n); void QMenu_Popup2(QMenu* self, QPoint* pos, QAction* at); QAction* QMenu_Exec22(QMenu* self, QPoint* pos, QAction* at); QAction* QMenu_Exec3(struct miqt_array* /* of QAction* */ actions, QPoint* pos, QAction* at); diff --git a/qt/gen_qmenubar.cpp b/qt/gen_qmenubar.cpp index 3f19a310..b4730d75 100644 --- a/qt/gen_qmenubar.cpp +++ b/qt/gen_qmenubar.cpp @@ -30,22 +30,30 @@ void* QMenuBar_Metacast(QMenuBar* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QMenuBar_Tr(const char* s) { +struct miqt_string QMenuBar_Tr(const char* s) { QString _ret = QMenuBar::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QMenuBar_TrUtf8(const char* s) { +struct miqt_string QMenuBar_TrUtf8(const char* s) { QString _ret = QMenuBar::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -QAction* QMenuBar_AddAction(QMenuBar* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QAction* QMenuBar_AddAction(QMenuBar* self, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); return self->addAction(text_QString); } @@ -53,13 +61,13 @@ QAction* QMenuBar_AddMenu(QMenuBar* self, QMenu* menu) { return self->addMenu(menu); } -QMenu* QMenuBar_AddMenuWithTitle(QMenuBar* self, struct miqt_string* title) { - QString title_QString = QString::fromUtf8(&title->data, title->len); +QMenu* QMenuBar_AddMenuWithTitle(QMenuBar* self, struct miqt_string title) { + QString title_QString = QString::fromUtf8(title.data, title.len); return self->addMenu(title_QString); } -QMenu* QMenuBar_AddMenu2(QMenuBar* self, QIcon* icon, struct miqt_string* title) { - QString title_QString = QString::fromUtf8(&title->data, title->len); +QMenu* QMenuBar_AddMenu2(QMenuBar* self, QIcon* icon, struct miqt_string title) { + QString title_QString = QString::fromUtf8(title.data, title.len); return self->addMenu(*icon, title_QString); } @@ -157,32 +165,48 @@ void QMenuBar_connect_Hovered(QMenuBar* self, intptr_t slot) { }); } -struct miqt_string* QMenuBar_Tr2(const char* s, const char* c) { +struct miqt_string QMenuBar_Tr2(const char* s, const char* c) { QString _ret = QMenuBar::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QMenuBar_Tr3(const char* s, const char* c, int n) { +struct miqt_string QMenuBar_Tr3(const char* s, const char* c, int n) { QString _ret = QMenuBar::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QMenuBar_TrUtf82(const char* s, const char* c) { +struct miqt_string QMenuBar_TrUtf82(const char* s, const char* c) { QString _ret = QMenuBar::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QMenuBar_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QMenuBar_TrUtf83(const char* s, const char* c, int n) { QString _ret = QMenuBar::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QMenuBar_SetCornerWidget2(QMenuBar* self, QWidget* w, int corner) { diff --git a/qt/gen_qmenubar.go b/qt/gen_qmenubar.go index 2abebcfe..affc5a8c 100644 --- a/qt/gen_qmenubar.go +++ b/qt/gen_qmenubar.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "runtime/cgo" "unsafe" @@ -64,31 +63,33 @@ func (this *QMenuBar) MetaObject() *QMetaObject { func (this *QMenuBar) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QMenuBar_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QMenuBar_Metacast(this.h, param1_Cstring)) } func QMenuBar_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QMenuBar_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMenuBar_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QMenuBar_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QMenuBar_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMenuBar_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QMenuBar) AddAction(text string) *QAction { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - return UnsafeNewQAction(unsafe.Pointer(C.QMenuBar_AddAction(this.h, (*C.struct_miqt_string)(text_ms)))) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + return UnsafeNewQAction(unsafe.Pointer(C.QMenuBar_AddAction(this.h, text_ms))) } func (this *QMenuBar) AddMenu(menu *QMenu) *QAction { @@ -96,15 +97,19 @@ func (this *QMenuBar) AddMenu(menu *QMenu) *QAction { } func (this *QMenuBar) AddMenuWithTitle(title string) *QMenu { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - return UnsafeNewQMenu(unsafe.Pointer(C.QMenuBar_AddMenuWithTitle(this.h, (*C.struct_miqt_string)(title_ms)))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + return UnsafeNewQMenu(unsafe.Pointer(C.QMenuBar_AddMenuWithTitle(this.h, title_ms))) } func (this *QMenuBar) AddMenu2(icon *QIcon, title string) *QMenu { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - return UnsafeNewQMenu(unsafe.Pointer(C.QMenuBar_AddMenu2(this.h, icon.cPointer(), (*C.struct_miqt_string)(title_ms)))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + return UnsafeNewQMenu(unsafe.Pointer(C.QMenuBar_AddMenu2(this.h, icon.cPointer(), title_ms))) } func (this *QMenuBar) AddSeparator() *QAction { @@ -233,9 +238,9 @@ func QMenuBar_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QMenuBar_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMenuBar_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -244,9 +249,9 @@ func QMenuBar_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QMenuBar_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMenuBar_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -255,9 +260,9 @@ func QMenuBar_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QMenuBar_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMenuBar_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -266,9 +271,9 @@ func QMenuBar_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QMenuBar_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMenuBar_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qmenubar.h b/qt/gen_qmenubar.h index bb0b9081..7fcdc78f 100644 --- a/qt/gen_qmenubar.h +++ b/qt/gen_qmenubar.h @@ -39,12 +39,12 @@ QMenuBar* QMenuBar_new(); QMenuBar* QMenuBar_new2(QWidget* parent); QMetaObject* QMenuBar_MetaObject(const QMenuBar* self); void* QMenuBar_Metacast(QMenuBar* self, const char* param1); -struct miqt_string* QMenuBar_Tr(const char* s); -struct miqt_string* QMenuBar_TrUtf8(const char* s); -QAction* QMenuBar_AddAction(QMenuBar* self, struct miqt_string* text); +struct miqt_string QMenuBar_Tr(const char* s); +struct miqt_string QMenuBar_TrUtf8(const char* s); +QAction* QMenuBar_AddAction(QMenuBar* self, struct miqt_string text); QAction* QMenuBar_AddMenu(QMenuBar* self, QMenu* menu); -QMenu* QMenuBar_AddMenuWithTitle(QMenuBar* self, struct miqt_string* title); -QMenu* QMenuBar_AddMenu2(QMenuBar* self, QIcon* icon, struct miqt_string* title); +QMenu* QMenuBar_AddMenuWithTitle(QMenuBar* self, struct miqt_string title); +QMenu* QMenuBar_AddMenu2(QMenuBar* self, QIcon* icon, struct miqt_string title); QAction* QMenuBar_AddSeparator(QMenuBar* self); QAction* QMenuBar_InsertSeparator(QMenuBar* self, QAction* before); QAction* QMenuBar_InsertMenu(QMenuBar* self, QAction* before, QMenu* menu); @@ -67,10 +67,10 @@ void QMenuBar_Triggered(QMenuBar* self, QAction* action); void QMenuBar_connect_Triggered(QMenuBar* self, intptr_t slot); void QMenuBar_Hovered(QMenuBar* self, QAction* action); void QMenuBar_connect_Hovered(QMenuBar* self, intptr_t slot); -struct miqt_string* QMenuBar_Tr2(const char* s, const char* c); -struct miqt_string* QMenuBar_Tr3(const char* s, const char* c, int n); -struct miqt_string* QMenuBar_TrUtf82(const char* s, const char* c); -struct miqt_string* QMenuBar_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QMenuBar_Tr2(const char* s, const char* c); +struct miqt_string QMenuBar_Tr3(const char* s, const char* c, int n); +struct miqt_string QMenuBar_TrUtf82(const char* s, const char* c); +struct miqt_string QMenuBar_TrUtf83(const char* s, const char* c, int n); void QMenuBar_SetCornerWidget2(QMenuBar* self, QWidget* w, int corner); QWidget* QMenuBar_CornerWidget1(const QMenuBar* self, int corner); void QMenuBar_Delete(QMenuBar* self); diff --git a/qt/gen_qmessageauthenticationcode.cpp b/qt/gen_qmessageauthenticationcode.cpp index 02969dc7..b43e1a9c 100644 --- a/qt/gen_qmessageauthenticationcode.cpp +++ b/qt/gen_qmessageauthenticationcode.cpp @@ -9,36 +9,51 @@ QMessageAuthenticationCode* QMessageAuthenticationCode_new(int method) { return new QMessageAuthenticationCode(static_cast(method)); } -QMessageAuthenticationCode* QMessageAuthenticationCode_new2(int method, QByteArray* key) { - return new QMessageAuthenticationCode(static_cast(method), *key); +QMessageAuthenticationCode* QMessageAuthenticationCode_new2(int method, struct miqt_string key) { + QByteArray key_QByteArray(key.data, key.len); + return new QMessageAuthenticationCode(static_cast(method), key_QByteArray); } void QMessageAuthenticationCode_Reset(QMessageAuthenticationCode* self) { self->reset(); } -void QMessageAuthenticationCode_SetKey(QMessageAuthenticationCode* self, QByteArray* key) { - self->setKey(*key); +void QMessageAuthenticationCode_SetKey(QMessageAuthenticationCode* self, struct miqt_string key) { + QByteArray key_QByteArray(key.data, key.len); + self->setKey(key_QByteArray); } void QMessageAuthenticationCode_AddData(QMessageAuthenticationCode* self, const char* data, int length) { self->addData(data, static_cast(length)); } -void QMessageAuthenticationCode_AddDataWithData(QMessageAuthenticationCode* self, QByteArray* data) { - self->addData(*data); +void QMessageAuthenticationCode_AddDataWithData(QMessageAuthenticationCode* self, struct miqt_string data) { + QByteArray data_QByteArray(data.data, data.len); + self->addData(data_QByteArray); } bool QMessageAuthenticationCode_AddDataWithDevice(QMessageAuthenticationCode* self, QIODevice* device) { return self->addData(device); } -QByteArray* QMessageAuthenticationCode_Result(const QMessageAuthenticationCode* self) { - return new QByteArray(self->result()); +struct miqt_string QMessageAuthenticationCode_Result(const QMessageAuthenticationCode* self) { + QByteArray _qb = self->result(); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } -QByteArray* QMessageAuthenticationCode_Hash(QByteArray* message, QByteArray* key, int method) { - return new QByteArray(QMessageAuthenticationCode::hash(*message, *key, static_cast(method))); +struct miqt_string QMessageAuthenticationCode_Hash(struct miqt_string message, struct miqt_string key, int method) { + QByteArray message_QByteArray(message.data, message.len); + QByteArray key_QByteArray(key.data, key.len); + QByteArray _qb = QMessageAuthenticationCode::hash(message_QByteArray, key_QByteArray, static_cast(method)); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } void QMessageAuthenticationCode_Delete(QMessageAuthenticationCode* self) { diff --git a/qt/gen_qmessageauthenticationcode.go b/qt/gen_qmessageauthenticationcode.go index 9a971972..023fa8f3 100644 --- a/qt/gen_qmessageauthenticationcode.go +++ b/qt/gen_qmessageauthenticationcode.go @@ -49,8 +49,11 @@ func NewQMessageAuthenticationCode(method QCryptographicHash__Algorithm) *QMessa } // NewQMessageAuthenticationCode2 constructs a new QMessageAuthenticationCode object. -func NewQMessageAuthenticationCode2(method QCryptographicHash__Algorithm, key *QByteArray) *QMessageAuthenticationCode { - ret := C.QMessageAuthenticationCode_new2((C.int)(method), key.cPointer()) +func NewQMessageAuthenticationCode2(method QCryptographicHash__Algorithm, key []byte) *QMessageAuthenticationCode { + key_alias := C.struct_miqt_string{} + key_alias.data = (*C.char)(unsafe.Pointer(&key[0])) + key_alias.len = C.size_t(len(key)) + ret := C.QMessageAuthenticationCode_new2((C.int)(method), key_alias) return newQMessageAuthenticationCode(ret) } @@ -58,8 +61,11 @@ func (this *QMessageAuthenticationCode) Reset() { C.QMessageAuthenticationCode_Reset(this.h) } -func (this *QMessageAuthenticationCode) SetKey(key *QByteArray) { - C.QMessageAuthenticationCode_SetKey(this.h, key.cPointer()) +func (this *QMessageAuthenticationCode) SetKey(key []byte) { + key_alias := C.struct_miqt_string{} + key_alias.data = (*C.char)(unsafe.Pointer(&key[0])) + key_alias.len = C.size_t(len(key)) + C.QMessageAuthenticationCode_SetKey(this.h, key_alias) } func (this *QMessageAuthenticationCode) AddData(data string, length int) { @@ -68,26 +74,35 @@ func (this *QMessageAuthenticationCode) AddData(data string, length int) { C.QMessageAuthenticationCode_AddData(this.h, data_Cstring, (C.int)(length)) } -func (this *QMessageAuthenticationCode) AddDataWithData(data *QByteArray) { - C.QMessageAuthenticationCode_AddDataWithData(this.h, data.cPointer()) +func (this *QMessageAuthenticationCode) AddDataWithData(data []byte) { + data_alias := C.struct_miqt_string{} + data_alias.data = (*C.char)(unsafe.Pointer(&data[0])) + data_alias.len = C.size_t(len(data)) + C.QMessageAuthenticationCode_AddDataWithData(this.h, data_alias) } func (this *QMessageAuthenticationCode) AddDataWithDevice(device *QIODevice) bool { return (bool)(C.QMessageAuthenticationCode_AddDataWithDevice(this.h, device.cPointer())) } -func (this *QMessageAuthenticationCode) Result() *QByteArray { - _ret := C.QMessageAuthenticationCode_Result(this.h) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QMessageAuthenticationCode) Result() []byte { + var _bytearray C.struct_miqt_string = C.QMessageAuthenticationCode_Result(this.h) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } -func QMessageAuthenticationCode_Hash(message *QByteArray, key *QByteArray, method QCryptographicHash__Algorithm) *QByteArray { - _ret := C.QMessageAuthenticationCode_Hash(message.cPointer(), key.cPointer(), (C.int)(method)) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func QMessageAuthenticationCode_Hash(message []byte, key []byte, method QCryptographicHash__Algorithm) []byte { + message_alias := C.struct_miqt_string{} + message_alias.data = (*C.char)(unsafe.Pointer(&message[0])) + message_alias.len = C.size_t(len(message)) + key_alias := C.struct_miqt_string{} + key_alias.data = (*C.char)(unsafe.Pointer(&key[0])) + key_alias.len = C.size_t(len(key)) + var _bytearray C.struct_miqt_string = C.QMessageAuthenticationCode_Hash(message_alias, key_alias, (C.int)(method)) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } // Delete this object from C++ memory. diff --git a/qt/gen_qmessageauthenticationcode.h b/qt/gen_qmessageauthenticationcode.h index 9c2a90e0..cb45dd79 100644 --- a/qt/gen_qmessageauthenticationcode.h +++ b/qt/gen_qmessageauthenticationcode.h @@ -24,14 +24,14 @@ typedef struct QMessageAuthenticationCode QMessageAuthenticationCode; #endif QMessageAuthenticationCode* QMessageAuthenticationCode_new(int method); -QMessageAuthenticationCode* QMessageAuthenticationCode_new2(int method, QByteArray* key); +QMessageAuthenticationCode* QMessageAuthenticationCode_new2(int method, struct miqt_string key); void QMessageAuthenticationCode_Reset(QMessageAuthenticationCode* self); -void QMessageAuthenticationCode_SetKey(QMessageAuthenticationCode* self, QByteArray* key); +void QMessageAuthenticationCode_SetKey(QMessageAuthenticationCode* self, struct miqt_string key); void QMessageAuthenticationCode_AddData(QMessageAuthenticationCode* self, const char* data, int length); -void QMessageAuthenticationCode_AddDataWithData(QMessageAuthenticationCode* self, QByteArray* data); +void QMessageAuthenticationCode_AddDataWithData(QMessageAuthenticationCode* self, struct miqt_string data); bool QMessageAuthenticationCode_AddDataWithDevice(QMessageAuthenticationCode* self, QIODevice* device); -QByteArray* QMessageAuthenticationCode_Result(const QMessageAuthenticationCode* self); -QByteArray* QMessageAuthenticationCode_Hash(QByteArray* message, QByteArray* key, int method); +struct miqt_string QMessageAuthenticationCode_Result(const QMessageAuthenticationCode* self); +struct miqt_string QMessageAuthenticationCode_Hash(struct miqt_string message, struct miqt_string key, int method); void QMessageAuthenticationCode_Delete(QMessageAuthenticationCode* self); #ifdef __cplusplus diff --git a/qt/gen_qmessagebox.cpp b/qt/gen_qmessagebox.cpp index 8a9f980d..3080ed35 100644 --- a/qt/gen_qmessagebox.cpp +++ b/qt/gen_qmessagebox.cpp @@ -17,15 +17,15 @@ QMessageBox* QMessageBox_new() { return new QMessageBox(); } -QMessageBox* QMessageBox_new2(int icon, struct miqt_string* title, struct miqt_string* text) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); +QMessageBox* QMessageBox_new2(int icon, struct miqt_string title, struct miqt_string text) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString text_QString = QString::fromUtf8(text.data, text.len); return new QMessageBox(static_cast(icon), title_QString, text_QString); } -QMessageBox* QMessageBox_new3(struct miqt_string* title, struct miqt_string* text, int icon, int button0, int button1, int button2) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); +QMessageBox* QMessageBox_new3(struct miqt_string title, struct miqt_string text, int icon, int button0, int button1, int button2) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString text_QString = QString::fromUtf8(text.data, text.len); return new QMessageBox(title_QString, text_QString, static_cast(icon), static_cast(button0), static_cast(button1), static_cast(button2)); } @@ -33,33 +33,33 @@ QMessageBox* QMessageBox_new4(QWidget* parent) { return new QMessageBox(parent); } -QMessageBox* QMessageBox_new5(int icon, struct miqt_string* title, struct miqt_string* text, int buttons) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); +QMessageBox* QMessageBox_new5(int icon, struct miqt_string title, struct miqt_string text, int buttons) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString text_QString = QString::fromUtf8(text.data, text.len); return new QMessageBox(static_cast(icon), title_QString, text_QString, static_cast(buttons)); } -QMessageBox* QMessageBox_new6(int icon, struct miqt_string* title, struct miqt_string* text, int buttons, QWidget* parent) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); +QMessageBox* QMessageBox_new6(int icon, struct miqt_string title, struct miqt_string text, int buttons, QWidget* parent) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString text_QString = QString::fromUtf8(text.data, text.len); return new QMessageBox(static_cast(icon), title_QString, text_QString, static_cast(buttons), parent); } -QMessageBox* QMessageBox_new7(int icon, struct miqt_string* title, struct miqt_string* text, int buttons, QWidget* parent, int flags) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); +QMessageBox* QMessageBox_new7(int icon, struct miqt_string title, struct miqt_string text, int buttons, QWidget* parent, int flags) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString text_QString = QString::fromUtf8(text.data, text.len); return new QMessageBox(static_cast(icon), title_QString, text_QString, static_cast(buttons), parent, static_cast(flags)); } -QMessageBox* QMessageBox_new8(struct miqt_string* title, struct miqt_string* text, int icon, int button0, int button1, int button2, QWidget* parent) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); +QMessageBox* QMessageBox_new8(struct miqt_string title, struct miqt_string text, int icon, int button0, int button1, int button2, QWidget* parent) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString text_QString = QString::fromUtf8(text.data, text.len); return new QMessageBox(title_QString, text_QString, static_cast(icon), static_cast(button0), static_cast(button1), static_cast(button2), parent); } -QMessageBox* QMessageBox_new9(struct miqt_string* title, struct miqt_string* text, int icon, int button0, int button1, int button2, QWidget* parent, int f) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); +QMessageBox* QMessageBox_new9(struct miqt_string title, struct miqt_string text, int icon, int button0, int button1, int button2, QWidget* parent, int f) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString text_QString = QString::fromUtf8(text.data, text.len); return new QMessageBox(title_QString, text_QString, static_cast(icon), static_cast(button0), static_cast(button1), static_cast(button2), parent, static_cast(f)); } @@ -71,26 +71,34 @@ void* QMessageBox_Metacast(QMessageBox* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QMessageBox_Tr(const char* s) { +struct miqt_string QMessageBox_Tr(const char* s) { QString _ret = QMessageBox::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QMessageBox_TrUtf8(const char* s) { +struct miqt_string QMessageBox_TrUtf8(const char* s) { QString _ret = QMessageBox::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QMessageBox_AddButton(QMessageBox* self, QAbstractButton* button, int role) { self->addButton(button, static_cast(role)); } -QPushButton* QMessageBox_AddButton2(QMessageBox* self, struct miqt_string* text, int role) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QPushButton* QMessageBox_AddButton2(QMessageBox* self, struct miqt_string text, int role) { + QString text_QString = QString::fromUtf8(text.data, text.len); return self->addButton(text_QString, static_cast(role)); } @@ -166,15 +174,19 @@ QAbstractButton* QMessageBox_ClickedButton(const QMessageBox* self) { return self->clickedButton(); } -struct miqt_string* QMessageBox_Text(const QMessageBox* self) { +struct miqt_string QMessageBox_Text(const QMessageBox* self) { QString _ret = self->text(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QMessageBox_SetText(QMessageBox* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QMessageBox_SetText(QMessageBox* self, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->setText(text_QString); } @@ -221,37 +233,37 @@ QCheckBox* QMessageBox_CheckBox(const QMessageBox* self) { return self->checkBox(); } -int QMessageBox_Information(QWidget* parent, struct miqt_string* title, struct miqt_string* text) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); +int QMessageBox_Information(QWidget* parent, struct miqt_string title, struct miqt_string text) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString text_QString = QString::fromUtf8(text.data, text.len); QMessageBox::StandardButton _ret = QMessageBox::information(parent, title_QString, text_QString); return static_cast(_ret); } -int QMessageBox_Question(QWidget* parent, struct miqt_string* title, struct miqt_string* text) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); +int QMessageBox_Question(QWidget* parent, struct miqt_string title, struct miqt_string text) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString text_QString = QString::fromUtf8(text.data, text.len); QMessageBox::StandardButton _ret = QMessageBox::question(parent, title_QString, text_QString); return static_cast(_ret); } -int QMessageBox_Warning(QWidget* parent, struct miqt_string* title, struct miqt_string* text) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); +int QMessageBox_Warning(QWidget* parent, struct miqt_string title, struct miqt_string text) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString text_QString = QString::fromUtf8(text.data, text.len); QMessageBox::StandardButton _ret = QMessageBox::warning(parent, title_QString, text_QString); return static_cast(_ret); } -int QMessageBox_Critical(QWidget* parent, struct miqt_string* title, struct miqt_string* text) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); +int QMessageBox_Critical(QWidget* parent, struct miqt_string title, struct miqt_string text) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString text_QString = QString::fromUtf8(text.data, text.len); QMessageBox::StandardButton _ret = QMessageBox::critical(parent, title_QString, text_QString); return static_cast(_ret); } -void QMessageBox_About(QWidget* parent, struct miqt_string* title, struct miqt_string* text) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QMessageBox_About(QWidget* parent, struct miqt_string title, struct miqt_string text) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString text_QString = QString::fromUtf8(text.data, text.len); QMessageBox::about(parent, title_QString, text_QString); } @@ -259,121 +271,133 @@ void QMessageBox_AboutQt(QWidget* parent) { QMessageBox::aboutQt(parent); } -int QMessageBox_Information2(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int button0) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); +int QMessageBox_Information2(QWidget* parent, struct miqt_string title, struct miqt_string text, int button0) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString text_QString = QString::fromUtf8(text.data, text.len); return QMessageBox::information(parent, title_QString, text_QString, static_cast(button0)); } -int QMessageBox_Information3(QWidget* parent, struct miqt_string* title, struct miqt_string* text, struct miqt_string* button0Text) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); - QString button0Text_QString = QString::fromUtf8(&button0Text->data, button0Text->len); +int QMessageBox_Information3(QWidget* parent, struct miqt_string title, struct miqt_string text, struct miqt_string button0Text) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString text_QString = QString::fromUtf8(text.data, text.len); + QString button0Text_QString = QString::fromUtf8(button0Text.data, button0Text.len); return QMessageBox::information(parent, title_QString, text_QString, button0Text_QString); } -int QMessageBox_Information4(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int button0) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); +int QMessageBox_Information4(QWidget* parent, struct miqt_string title, struct miqt_string text, int button0) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString text_QString = QString::fromUtf8(text.data, text.len); QMessageBox::StandardButton _ret = QMessageBox::information(parent, title_QString, text_QString, static_cast(button0)); return static_cast(_ret); } -int QMessageBox_Question2(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int button0) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); +int QMessageBox_Question2(QWidget* parent, struct miqt_string title, struct miqt_string text, int button0) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString text_QString = QString::fromUtf8(text.data, text.len); return QMessageBox::question(parent, title_QString, text_QString, static_cast(button0)); } -int QMessageBox_Question3(QWidget* parent, struct miqt_string* title, struct miqt_string* text, struct miqt_string* button0Text) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); - QString button0Text_QString = QString::fromUtf8(&button0Text->data, button0Text->len); +int QMessageBox_Question3(QWidget* parent, struct miqt_string title, struct miqt_string text, struct miqt_string button0Text) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString text_QString = QString::fromUtf8(text.data, text.len); + QString button0Text_QString = QString::fromUtf8(button0Text.data, button0Text.len); return QMessageBox::question(parent, title_QString, text_QString, button0Text_QString); } -int QMessageBox_Question4(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int button0, int button1) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); +int QMessageBox_Question4(QWidget* parent, struct miqt_string title, struct miqt_string text, int button0, int button1) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString text_QString = QString::fromUtf8(text.data, text.len); return QMessageBox::question(parent, title_QString, text_QString, static_cast(button0), static_cast(button1)); } -int QMessageBox_Warning2(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int button0, int button1) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); +int QMessageBox_Warning2(QWidget* parent, struct miqt_string title, struct miqt_string text, int button0, int button1) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString text_QString = QString::fromUtf8(text.data, text.len); return QMessageBox::warning(parent, title_QString, text_QString, static_cast(button0), static_cast(button1)); } -int QMessageBox_Warning3(QWidget* parent, struct miqt_string* title, struct miqt_string* text, struct miqt_string* button0Text) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); - QString button0Text_QString = QString::fromUtf8(&button0Text->data, button0Text->len); +int QMessageBox_Warning3(QWidget* parent, struct miqt_string title, struct miqt_string text, struct miqt_string button0Text) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString text_QString = QString::fromUtf8(text.data, text.len); + QString button0Text_QString = QString::fromUtf8(button0Text.data, button0Text.len); return QMessageBox::warning(parent, title_QString, text_QString, button0Text_QString); } -int QMessageBox_Warning4(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int button0, int button1) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); +int QMessageBox_Warning4(QWidget* parent, struct miqt_string title, struct miqt_string text, int button0, int button1) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString text_QString = QString::fromUtf8(text.data, text.len); return QMessageBox::warning(parent, title_QString, text_QString, static_cast(button0), static_cast(button1)); } -int QMessageBox_Critical2(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int button0, int button1) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); +int QMessageBox_Critical2(QWidget* parent, struct miqt_string title, struct miqt_string text, int button0, int button1) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString text_QString = QString::fromUtf8(text.data, text.len); return QMessageBox::critical(parent, title_QString, text_QString, static_cast(button0), static_cast(button1)); } -int QMessageBox_Critical3(QWidget* parent, struct miqt_string* title, struct miqt_string* text, struct miqt_string* button0Text) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); - QString button0Text_QString = QString::fromUtf8(&button0Text->data, button0Text->len); +int QMessageBox_Critical3(QWidget* parent, struct miqt_string title, struct miqt_string text, struct miqt_string button0Text) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString text_QString = QString::fromUtf8(text.data, text.len); + QString button0Text_QString = QString::fromUtf8(button0Text.data, button0Text.len); return QMessageBox::critical(parent, title_QString, text_QString, button0Text_QString); } -int QMessageBox_Critical4(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int button0, int button1) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); +int QMessageBox_Critical4(QWidget* parent, struct miqt_string title, struct miqt_string text, int button0, int button1) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString text_QString = QString::fromUtf8(text.data, text.len); return QMessageBox::critical(parent, title_QString, text_QString, static_cast(button0), static_cast(button1)); } -struct miqt_string* QMessageBox_ButtonText(const QMessageBox* self, int button) { +struct miqt_string QMessageBox_ButtonText(const QMessageBox* self, int button) { QString _ret = self->buttonText(static_cast(button)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QMessageBox_SetButtonText(QMessageBox* self, int button, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QMessageBox_SetButtonText(QMessageBox* self, int button, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->setButtonText(static_cast(button), text_QString); } -struct miqt_string* QMessageBox_InformativeText(const QMessageBox* self) { +struct miqt_string QMessageBox_InformativeText(const QMessageBox* self) { QString _ret = self->informativeText(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QMessageBox_SetInformativeText(QMessageBox* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QMessageBox_SetInformativeText(QMessageBox* self, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->setInformativeText(text_QString); } -struct miqt_string* QMessageBox_DetailedText(const QMessageBox* self) { +struct miqt_string QMessageBox_DetailedText(const QMessageBox* self) { QString _ret = self->detailedText(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QMessageBox_SetDetailedText(QMessageBox* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QMessageBox_SetDetailedText(QMessageBox* self, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->setDetailedText(text_QString); } -void QMessageBox_SetWindowTitle(QMessageBox* self, struct miqt_string* title) { - QString title_QString = QString::fromUtf8(&title->data, title->len); +void QMessageBox_SetWindowTitle(QMessageBox* self, struct miqt_string title) { + QString title_QString = QString::fromUtf8(title.data, title.len); self->setWindowTitle(title_QString); } @@ -396,275 +420,291 @@ void QMessageBox_connect_ButtonClicked(QMessageBox* self, intptr_t slot) { }); } -struct miqt_string* QMessageBox_Tr2(const char* s, const char* c) { +struct miqt_string QMessageBox_Tr2(const char* s, const char* c) { QString _ret = QMessageBox::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QMessageBox_Tr3(const char* s, const char* c, int n) { +struct miqt_string QMessageBox_Tr3(const char* s, const char* c, int n) { QString _ret = QMessageBox::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QMessageBox_TrUtf82(const char* s, const char* c) { +struct miqt_string QMessageBox_TrUtf82(const char* s, const char* c) { QString _ret = QMessageBox::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QMessageBox_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QMessageBox_TrUtf83(const char* s, const char* c, int n) { QString _ret = QMessageBox::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -int QMessageBox_Information42(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int buttons) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); +int QMessageBox_Information42(QWidget* parent, struct miqt_string title, struct miqt_string text, int buttons) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString text_QString = QString::fromUtf8(text.data, text.len); QMessageBox::StandardButton _ret = QMessageBox::information(parent, title_QString, text_QString, static_cast(buttons)); return static_cast(_ret); } -int QMessageBox_Information5(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int buttons, int defaultButton) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); +int QMessageBox_Information5(QWidget* parent, struct miqt_string title, struct miqt_string text, int buttons, int defaultButton) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString text_QString = QString::fromUtf8(text.data, text.len); QMessageBox::StandardButton _ret = QMessageBox::information(parent, title_QString, text_QString, static_cast(buttons), static_cast(defaultButton)); return static_cast(_ret); } -int QMessageBox_Question42(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int buttons) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); +int QMessageBox_Question42(QWidget* parent, struct miqt_string title, struct miqt_string text, int buttons) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString text_QString = QString::fromUtf8(text.data, text.len); QMessageBox::StandardButton _ret = QMessageBox::question(parent, title_QString, text_QString, static_cast(buttons)); return static_cast(_ret); } -int QMessageBox_Question5(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int buttons, int defaultButton) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); +int QMessageBox_Question5(QWidget* parent, struct miqt_string title, struct miqt_string text, int buttons, int defaultButton) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString text_QString = QString::fromUtf8(text.data, text.len); QMessageBox::StandardButton _ret = QMessageBox::question(parent, title_QString, text_QString, static_cast(buttons), static_cast(defaultButton)); return static_cast(_ret); } -int QMessageBox_Warning42(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int buttons) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); +int QMessageBox_Warning42(QWidget* parent, struct miqt_string title, struct miqt_string text, int buttons) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString text_QString = QString::fromUtf8(text.data, text.len); QMessageBox::StandardButton _ret = QMessageBox::warning(parent, title_QString, text_QString, static_cast(buttons)); return static_cast(_ret); } -int QMessageBox_Warning5(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int buttons, int defaultButton) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); +int QMessageBox_Warning5(QWidget* parent, struct miqt_string title, struct miqt_string text, int buttons, int defaultButton) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString text_QString = QString::fromUtf8(text.data, text.len); QMessageBox::StandardButton _ret = QMessageBox::warning(parent, title_QString, text_QString, static_cast(buttons), static_cast(defaultButton)); return static_cast(_ret); } -int QMessageBox_Critical42(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int buttons) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); +int QMessageBox_Critical42(QWidget* parent, struct miqt_string title, struct miqt_string text, int buttons) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString text_QString = QString::fromUtf8(text.data, text.len); QMessageBox::StandardButton _ret = QMessageBox::critical(parent, title_QString, text_QString, static_cast(buttons)); return static_cast(_ret); } -int QMessageBox_Critical5(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int buttons, int defaultButton) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); +int QMessageBox_Critical5(QWidget* parent, struct miqt_string title, struct miqt_string text, int buttons, int defaultButton) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString text_QString = QString::fromUtf8(text.data, text.len); QMessageBox::StandardButton _ret = QMessageBox::critical(parent, title_QString, text_QString, static_cast(buttons), static_cast(defaultButton)); return static_cast(_ret); } -void QMessageBox_AboutQt2(QWidget* parent, struct miqt_string* title) { - QString title_QString = QString::fromUtf8(&title->data, title->len); +void QMessageBox_AboutQt2(QWidget* parent, struct miqt_string title) { + QString title_QString = QString::fromUtf8(title.data, title.len); QMessageBox::aboutQt(parent, title_QString); } -int QMessageBox_Information52(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int button0, int button1) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); +int QMessageBox_Information52(QWidget* parent, struct miqt_string title, struct miqt_string text, int button0, int button1) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString text_QString = QString::fromUtf8(text.data, text.len); return QMessageBox::information(parent, title_QString, text_QString, static_cast(button0), static_cast(button1)); } -int QMessageBox_Information6(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int button0, int button1, int button2) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); +int QMessageBox_Information6(QWidget* parent, struct miqt_string title, struct miqt_string text, int button0, int button1, int button2) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString text_QString = QString::fromUtf8(text.data, text.len); return QMessageBox::information(parent, title_QString, text_QString, static_cast(button0), static_cast(button1), static_cast(button2)); } -int QMessageBox_Information53(QWidget* parent, struct miqt_string* title, struct miqt_string* text, struct miqt_string* button0Text, struct miqt_string* button1Text) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); - QString button0Text_QString = QString::fromUtf8(&button0Text->data, button0Text->len); - QString button1Text_QString = QString::fromUtf8(&button1Text->data, button1Text->len); +int QMessageBox_Information53(QWidget* parent, struct miqt_string title, struct miqt_string text, struct miqt_string button0Text, struct miqt_string button1Text) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString text_QString = QString::fromUtf8(text.data, text.len); + QString button0Text_QString = QString::fromUtf8(button0Text.data, button0Text.len); + QString button1Text_QString = QString::fromUtf8(button1Text.data, button1Text.len); return QMessageBox::information(parent, title_QString, text_QString, button0Text_QString, button1Text_QString); } -int QMessageBox_Information62(QWidget* parent, struct miqt_string* title, struct miqt_string* text, struct miqt_string* button0Text, struct miqt_string* button1Text, struct miqt_string* button2Text) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); - QString button0Text_QString = QString::fromUtf8(&button0Text->data, button0Text->len); - QString button1Text_QString = QString::fromUtf8(&button1Text->data, button1Text->len); - QString button2Text_QString = QString::fromUtf8(&button2Text->data, button2Text->len); +int QMessageBox_Information62(QWidget* parent, struct miqt_string title, struct miqt_string text, struct miqt_string button0Text, struct miqt_string button1Text, struct miqt_string button2Text) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString text_QString = QString::fromUtf8(text.data, text.len); + QString button0Text_QString = QString::fromUtf8(button0Text.data, button0Text.len); + QString button1Text_QString = QString::fromUtf8(button1Text.data, button1Text.len); + QString button2Text_QString = QString::fromUtf8(button2Text.data, button2Text.len); return QMessageBox::information(parent, title_QString, text_QString, button0Text_QString, button1Text_QString, button2Text_QString); } -int QMessageBox_Information7(QWidget* parent, struct miqt_string* title, struct miqt_string* text, struct miqt_string* button0Text, struct miqt_string* button1Text, struct miqt_string* button2Text, int defaultButtonNumber) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); - QString button0Text_QString = QString::fromUtf8(&button0Text->data, button0Text->len); - QString button1Text_QString = QString::fromUtf8(&button1Text->data, button1Text->len); - QString button2Text_QString = QString::fromUtf8(&button2Text->data, button2Text->len); +int QMessageBox_Information7(QWidget* parent, struct miqt_string title, struct miqt_string text, struct miqt_string button0Text, struct miqt_string button1Text, struct miqt_string button2Text, int defaultButtonNumber) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString text_QString = QString::fromUtf8(text.data, text.len); + QString button0Text_QString = QString::fromUtf8(button0Text.data, button0Text.len); + QString button1Text_QString = QString::fromUtf8(button1Text.data, button1Text.len); + QString button2Text_QString = QString::fromUtf8(button2Text.data, button2Text.len); return QMessageBox::information(parent, title_QString, text_QString, button0Text_QString, button1Text_QString, button2Text_QString, static_cast(defaultButtonNumber)); } -int QMessageBox_Information8(QWidget* parent, struct miqt_string* title, struct miqt_string* text, struct miqt_string* button0Text, struct miqt_string* button1Text, struct miqt_string* button2Text, int defaultButtonNumber, int escapeButtonNumber) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); - QString button0Text_QString = QString::fromUtf8(&button0Text->data, button0Text->len); - QString button1Text_QString = QString::fromUtf8(&button1Text->data, button1Text->len); - QString button2Text_QString = QString::fromUtf8(&button2Text->data, button2Text->len); +int QMessageBox_Information8(QWidget* parent, struct miqt_string title, struct miqt_string text, struct miqt_string button0Text, struct miqt_string button1Text, struct miqt_string button2Text, int defaultButtonNumber, int escapeButtonNumber) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString text_QString = QString::fromUtf8(text.data, text.len); + QString button0Text_QString = QString::fromUtf8(button0Text.data, button0Text.len); + QString button1Text_QString = QString::fromUtf8(button1Text.data, button1Text.len); + QString button2Text_QString = QString::fromUtf8(button2Text.data, button2Text.len); return QMessageBox::information(parent, title_QString, text_QString, button0Text_QString, button1Text_QString, button2Text_QString, static_cast(defaultButtonNumber), static_cast(escapeButtonNumber)); } -int QMessageBox_Information54(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int button0, int button1) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); +int QMessageBox_Information54(QWidget* parent, struct miqt_string title, struct miqt_string text, int button0, int button1) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString text_QString = QString::fromUtf8(text.data, text.len); QMessageBox::StandardButton _ret = QMessageBox::information(parent, title_QString, text_QString, static_cast(button0), static_cast(button1)); return static_cast(_ret); } -int QMessageBox_Question52(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int button0, int button1) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); +int QMessageBox_Question52(QWidget* parent, struct miqt_string title, struct miqt_string text, int button0, int button1) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString text_QString = QString::fromUtf8(text.data, text.len); return QMessageBox::question(parent, title_QString, text_QString, static_cast(button0), static_cast(button1)); } -int QMessageBox_Question6(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int button0, int button1, int button2) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); +int QMessageBox_Question6(QWidget* parent, struct miqt_string title, struct miqt_string text, int button0, int button1, int button2) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString text_QString = QString::fromUtf8(text.data, text.len); return QMessageBox::question(parent, title_QString, text_QString, static_cast(button0), static_cast(button1), static_cast(button2)); } -int QMessageBox_Question53(QWidget* parent, struct miqt_string* title, struct miqt_string* text, struct miqt_string* button0Text, struct miqt_string* button1Text) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); - QString button0Text_QString = QString::fromUtf8(&button0Text->data, button0Text->len); - QString button1Text_QString = QString::fromUtf8(&button1Text->data, button1Text->len); +int QMessageBox_Question53(QWidget* parent, struct miqt_string title, struct miqt_string text, struct miqt_string button0Text, struct miqt_string button1Text) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString text_QString = QString::fromUtf8(text.data, text.len); + QString button0Text_QString = QString::fromUtf8(button0Text.data, button0Text.len); + QString button1Text_QString = QString::fromUtf8(button1Text.data, button1Text.len); return QMessageBox::question(parent, title_QString, text_QString, button0Text_QString, button1Text_QString); } -int QMessageBox_Question62(QWidget* parent, struct miqt_string* title, struct miqt_string* text, struct miqt_string* button0Text, struct miqt_string* button1Text, struct miqt_string* button2Text) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); - QString button0Text_QString = QString::fromUtf8(&button0Text->data, button0Text->len); - QString button1Text_QString = QString::fromUtf8(&button1Text->data, button1Text->len); - QString button2Text_QString = QString::fromUtf8(&button2Text->data, button2Text->len); +int QMessageBox_Question62(QWidget* parent, struct miqt_string title, struct miqt_string text, struct miqt_string button0Text, struct miqt_string button1Text, struct miqt_string button2Text) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString text_QString = QString::fromUtf8(text.data, text.len); + QString button0Text_QString = QString::fromUtf8(button0Text.data, button0Text.len); + QString button1Text_QString = QString::fromUtf8(button1Text.data, button1Text.len); + QString button2Text_QString = QString::fromUtf8(button2Text.data, button2Text.len); return QMessageBox::question(parent, title_QString, text_QString, button0Text_QString, button1Text_QString, button2Text_QString); } -int QMessageBox_Question7(QWidget* parent, struct miqt_string* title, struct miqt_string* text, struct miqt_string* button0Text, struct miqt_string* button1Text, struct miqt_string* button2Text, int defaultButtonNumber) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); - QString button0Text_QString = QString::fromUtf8(&button0Text->data, button0Text->len); - QString button1Text_QString = QString::fromUtf8(&button1Text->data, button1Text->len); - QString button2Text_QString = QString::fromUtf8(&button2Text->data, button2Text->len); +int QMessageBox_Question7(QWidget* parent, struct miqt_string title, struct miqt_string text, struct miqt_string button0Text, struct miqt_string button1Text, struct miqt_string button2Text, int defaultButtonNumber) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString text_QString = QString::fromUtf8(text.data, text.len); + QString button0Text_QString = QString::fromUtf8(button0Text.data, button0Text.len); + QString button1Text_QString = QString::fromUtf8(button1Text.data, button1Text.len); + QString button2Text_QString = QString::fromUtf8(button2Text.data, button2Text.len); return QMessageBox::question(parent, title_QString, text_QString, button0Text_QString, button1Text_QString, button2Text_QString, static_cast(defaultButtonNumber)); } -int QMessageBox_Question8(QWidget* parent, struct miqt_string* title, struct miqt_string* text, struct miqt_string* button0Text, struct miqt_string* button1Text, struct miqt_string* button2Text, int defaultButtonNumber, int escapeButtonNumber) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); - QString button0Text_QString = QString::fromUtf8(&button0Text->data, button0Text->len); - QString button1Text_QString = QString::fromUtf8(&button1Text->data, button1Text->len); - QString button2Text_QString = QString::fromUtf8(&button2Text->data, button2Text->len); +int QMessageBox_Question8(QWidget* parent, struct miqt_string title, struct miqt_string text, struct miqt_string button0Text, struct miqt_string button1Text, struct miqt_string button2Text, int defaultButtonNumber, int escapeButtonNumber) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString text_QString = QString::fromUtf8(text.data, text.len); + QString button0Text_QString = QString::fromUtf8(button0Text.data, button0Text.len); + QString button1Text_QString = QString::fromUtf8(button1Text.data, button1Text.len); + QString button2Text_QString = QString::fromUtf8(button2Text.data, button2Text.len); return QMessageBox::question(parent, title_QString, text_QString, button0Text_QString, button1Text_QString, button2Text_QString, static_cast(defaultButtonNumber), static_cast(escapeButtonNumber)); } -int QMessageBox_Warning6(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int button0, int button1, int button2) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); +int QMessageBox_Warning6(QWidget* parent, struct miqt_string title, struct miqt_string text, int button0, int button1, int button2) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString text_QString = QString::fromUtf8(text.data, text.len); return QMessageBox::warning(parent, title_QString, text_QString, static_cast(button0), static_cast(button1), static_cast(button2)); } -int QMessageBox_Warning52(QWidget* parent, struct miqt_string* title, struct miqt_string* text, struct miqt_string* button0Text, struct miqt_string* button1Text) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); - QString button0Text_QString = QString::fromUtf8(&button0Text->data, button0Text->len); - QString button1Text_QString = QString::fromUtf8(&button1Text->data, button1Text->len); +int QMessageBox_Warning52(QWidget* parent, struct miqt_string title, struct miqt_string text, struct miqt_string button0Text, struct miqt_string button1Text) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString text_QString = QString::fromUtf8(text.data, text.len); + QString button0Text_QString = QString::fromUtf8(button0Text.data, button0Text.len); + QString button1Text_QString = QString::fromUtf8(button1Text.data, button1Text.len); return QMessageBox::warning(parent, title_QString, text_QString, button0Text_QString, button1Text_QString); } -int QMessageBox_Warning62(QWidget* parent, struct miqt_string* title, struct miqt_string* text, struct miqt_string* button0Text, struct miqt_string* button1Text, struct miqt_string* button2Text) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); - QString button0Text_QString = QString::fromUtf8(&button0Text->data, button0Text->len); - QString button1Text_QString = QString::fromUtf8(&button1Text->data, button1Text->len); - QString button2Text_QString = QString::fromUtf8(&button2Text->data, button2Text->len); +int QMessageBox_Warning62(QWidget* parent, struct miqt_string title, struct miqt_string text, struct miqt_string button0Text, struct miqt_string button1Text, struct miqt_string button2Text) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString text_QString = QString::fromUtf8(text.data, text.len); + QString button0Text_QString = QString::fromUtf8(button0Text.data, button0Text.len); + QString button1Text_QString = QString::fromUtf8(button1Text.data, button1Text.len); + QString button2Text_QString = QString::fromUtf8(button2Text.data, button2Text.len); return QMessageBox::warning(parent, title_QString, text_QString, button0Text_QString, button1Text_QString, button2Text_QString); } -int QMessageBox_Warning7(QWidget* parent, struct miqt_string* title, struct miqt_string* text, struct miqt_string* button0Text, struct miqt_string* button1Text, struct miqt_string* button2Text, int defaultButtonNumber) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); - QString button0Text_QString = QString::fromUtf8(&button0Text->data, button0Text->len); - QString button1Text_QString = QString::fromUtf8(&button1Text->data, button1Text->len); - QString button2Text_QString = QString::fromUtf8(&button2Text->data, button2Text->len); +int QMessageBox_Warning7(QWidget* parent, struct miqt_string title, struct miqt_string text, struct miqt_string button0Text, struct miqt_string button1Text, struct miqt_string button2Text, int defaultButtonNumber) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString text_QString = QString::fromUtf8(text.data, text.len); + QString button0Text_QString = QString::fromUtf8(button0Text.data, button0Text.len); + QString button1Text_QString = QString::fromUtf8(button1Text.data, button1Text.len); + QString button2Text_QString = QString::fromUtf8(button2Text.data, button2Text.len); return QMessageBox::warning(parent, title_QString, text_QString, button0Text_QString, button1Text_QString, button2Text_QString, static_cast(defaultButtonNumber)); } -int QMessageBox_Warning8(QWidget* parent, struct miqt_string* title, struct miqt_string* text, struct miqt_string* button0Text, struct miqt_string* button1Text, struct miqt_string* button2Text, int defaultButtonNumber, int escapeButtonNumber) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); - QString button0Text_QString = QString::fromUtf8(&button0Text->data, button0Text->len); - QString button1Text_QString = QString::fromUtf8(&button1Text->data, button1Text->len); - QString button2Text_QString = QString::fromUtf8(&button2Text->data, button2Text->len); +int QMessageBox_Warning8(QWidget* parent, struct miqt_string title, struct miqt_string text, struct miqt_string button0Text, struct miqt_string button1Text, struct miqt_string button2Text, int defaultButtonNumber, int escapeButtonNumber) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString text_QString = QString::fromUtf8(text.data, text.len); + QString button0Text_QString = QString::fromUtf8(button0Text.data, button0Text.len); + QString button1Text_QString = QString::fromUtf8(button1Text.data, button1Text.len); + QString button2Text_QString = QString::fromUtf8(button2Text.data, button2Text.len); return QMessageBox::warning(parent, title_QString, text_QString, button0Text_QString, button1Text_QString, button2Text_QString, static_cast(defaultButtonNumber), static_cast(escapeButtonNumber)); } -int QMessageBox_Critical6(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int button0, int button1, int button2) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); +int QMessageBox_Critical6(QWidget* parent, struct miqt_string title, struct miqt_string text, int button0, int button1, int button2) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString text_QString = QString::fromUtf8(text.data, text.len); return QMessageBox::critical(parent, title_QString, text_QString, static_cast(button0), static_cast(button1), static_cast(button2)); } -int QMessageBox_Critical52(QWidget* parent, struct miqt_string* title, struct miqt_string* text, struct miqt_string* button0Text, struct miqt_string* button1Text) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); - QString button0Text_QString = QString::fromUtf8(&button0Text->data, button0Text->len); - QString button1Text_QString = QString::fromUtf8(&button1Text->data, button1Text->len); +int QMessageBox_Critical52(QWidget* parent, struct miqt_string title, struct miqt_string text, struct miqt_string button0Text, struct miqt_string button1Text) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString text_QString = QString::fromUtf8(text.data, text.len); + QString button0Text_QString = QString::fromUtf8(button0Text.data, button0Text.len); + QString button1Text_QString = QString::fromUtf8(button1Text.data, button1Text.len); return QMessageBox::critical(parent, title_QString, text_QString, button0Text_QString, button1Text_QString); } -int QMessageBox_Critical62(QWidget* parent, struct miqt_string* title, struct miqt_string* text, struct miqt_string* button0Text, struct miqt_string* button1Text, struct miqt_string* button2Text) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); - QString button0Text_QString = QString::fromUtf8(&button0Text->data, button0Text->len); - QString button1Text_QString = QString::fromUtf8(&button1Text->data, button1Text->len); - QString button2Text_QString = QString::fromUtf8(&button2Text->data, button2Text->len); +int QMessageBox_Critical62(QWidget* parent, struct miqt_string title, struct miqt_string text, struct miqt_string button0Text, struct miqt_string button1Text, struct miqt_string button2Text) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString text_QString = QString::fromUtf8(text.data, text.len); + QString button0Text_QString = QString::fromUtf8(button0Text.data, button0Text.len); + QString button1Text_QString = QString::fromUtf8(button1Text.data, button1Text.len); + QString button2Text_QString = QString::fromUtf8(button2Text.data, button2Text.len); return QMessageBox::critical(parent, title_QString, text_QString, button0Text_QString, button1Text_QString, button2Text_QString); } -int QMessageBox_Critical7(QWidget* parent, struct miqt_string* title, struct miqt_string* text, struct miqt_string* button0Text, struct miqt_string* button1Text, struct miqt_string* button2Text, int defaultButtonNumber) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); - QString button0Text_QString = QString::fromUtf8(&button0Text->data, button0Text->len); - QString button1Text_QString = QString::fromUtf8(&button1Text->data, button1Text->len); - QString button2Text_QString = QString::fromUtf8(&button2Text->data, button2Text->len); +int QMessageBox_Critical7(QWidget* parent, struct miqt_string title, struct miqt_string text, struct miqt_string button0Text, struct miqt_string button1Text, struct miqt_string button2Text, int defaultButtonNumber) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString text_QString = QString::fromUtf8(text.data, text.len); + QString button0Text_QString = QString::fromUtf8(button0Text.data, button0Text.len); + QString button1Text_QString = QString::fromUtf8(button1Text.data, button1Text.len); + QString button2Text_QString = QString::fromUtf8(button2Text.data, button2Text.len); return QMessageBox::critical(parent, title_QString, text_QString, button0Text_QString, button1Text_QString, button2Text_QString, static_cast(defaultButtonNumber)); } -int QMessageBox_Critical8(QWidget* parent, struct miqt_string* title, struct miqt_string* text, struct miqt_string* button0Text, struct miqt_string* button1Text, struct miqt_string* button2Text, int defaultButtonNumber, int escapeButtonNumber) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); - QString button0Text_QString = QString::fromUtf8(&button0Text->data, button0Text->len); - QString button1Text_QString = QString::fromUtf8(&button1Text->data, button1Text->len); - QString button2Text_QString = QString::fromUtf8(&button2Text->data, button2Text->len); +int QMessageBox_Critical8(QWidget* parent, struct miqt_string title, struct miqt_string text, struct miqt_string button0Text, struct miqt_string button1Text, struct miqt_string button2Text, int defaultButtonNumber, int escapeButtonNumber) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString text_QString = QString::fromUtf8(text.data, text.len); + QString button0Text_QString = QString::fromUtf8(button0Text.data, button0Text.len); + QString button1Text_QString = QString::fromUtf8(button1Text.data, button1Text.len); + QString button2Text_QString = QString::fromUtf8(button2Text.data, button2Text.len); return QMessageBox::critical(parent, title_QString, text_QString, button0Text_QString, button1Text_QString, button2Text_QString, static_cast(defaultButtonNumber), static_cast(escapeButtonNumber)); } diff --git a/qt/gen_qmessagebox.go b/qt/gen_qmessagebox.go index 0a59853f..41e18ae5 100644 --- a/qt/gen_qmessagebox.go +++ b/qt/gen_qmessagebox.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "runtime/cgo" "unsafe" @@ -111,21 +110,29 @@ func NewQMessageBox() *QMessageBox { // NewQMessageBox2 constructs a new QMessageBox object. func NewQMessageBox2(icon QMessageBox__Icon, title string, text string) *QMessageBox { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - ret := C.QMessageBox_new2((C.int)(icon), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms)) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + ret := C.QMessageBox_new2((C.int)(icon), title_ms, text_ms) return newQMessageBox(ret) } // NewQMessageBox3 constructs a new QMessageBox object. func NewQMessageBox3(title string, text string, icon QMessageBox__Icon, button0 int, button1 int, button2 int) *QMessageBox { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - ret := C.QMessageBox_new3((*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.int)(icon), (C.int)(button0), (C.int)(button1), (C.int)(button2)) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + ret := C.QMessageBox_new3(title_ms, text_ms, (C.int)(icon), (C.int)(button0), (C.int)(button1), (C.int)(button2)) return newQMessageBox(ret) } @@ -137,51 +144,71 @@ func NewQMessageBox4(parent *QWidget) *QMessageBox { // NewQMessageBox5 constructs a new QMessageBox object. func NewQMessageBox5(icon QMessageBox__Icon, title string, text string, buttons QMessageBox__StandardButton) *QMessageBox { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - ret := C.QMessageBox_new5((C.int)(icon), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.int)(buttons)) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + ret := C.QMessageBox_new5((C.int)(icon), title_ms, text_ms, (C.int)(buttons)) return newQMessageBox(ret) } // NewQMessageBox6 constructs a new QMessageBox object. func NewQMessageBox6(icon QMessageBox__Icon, title string, text string, buttons QMessageBox__StandardButton, parent *QWidget) *QMessageBox { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - ret := C.QMessageBox_new6((C.int)(icon), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.int)(buttons), parent.cPointer()) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + ret := C.QMessageBox_new6((C.int)(icon), title_ms, text_ms, (C.int)(buttons), parent.cPointer()) return newQMessageBox(ret) } // NewQMessageBox7 constructs a new QMessageBox object. func NewQMessageBox7(icon QMessageBox__Icon, title string, text string, buttons QMessageBox__StandardButton, parent *QWidget, flags WindowType) *QMessageBox { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - ret := C.QMessageBox_new7((C.int)(icon), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.int)(buttons), parent.cPointer(), (C.int)(flags)) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + ret := C.QMessageBox_new7((C.int)(icon), title_ms, text_ms, (C.int)(buttons), parent.cPointer(), (C.int)(flags)) return newQMessageBox(ret) } // NewQMessageBox8 constructs a new QMessageBox object. func NewQMessageBox8(title string, text string, icon QMessageBox__Icon, button0 int, button1 int, button2 int, parent *QWidget) *QMessageBox { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - ret := C.QMessageBox_new8((*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.int)(icon), (C.int)(button0), (C.int)(button1), (C.int)(button2), parent.cPointer()) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + ret := C.QMessageBox_new8(title_ms, text_ms, (C.int)(icon), (C.int)(button0), (C.int)(button1), (C.int)(button2), parent.cPointer()) return newQMessageBox(ret) } // NewQMessageBox9 constructs a new QMessageBox object. func NewQMessageBox9(title string, text string, icon QMessageBox__Icon, button0 int, button1 int, button2 int, parent *QWidget, f WindowType) *QMessageBox { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - ret := C.QMessageBox_new9((*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.int)(icon), (C.int)(button0), (C.int)(button1), (C.int)(button2), parent.cPointer(), (C.int)(f)) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + ret := C.QMessageBox_new9(title_ms, text_ms, (C.int)(icon), (C.int)(button0), (C.int)(button1), (C.int)(button2), parent.cPointer(), (C.int)(f)) return newQMessageBox(ret) } @@ -192,24 +219,24 @@ func (this *QMessageBox) MetaObject() *QMetaObject { func (this *QMessageBox) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QMessageBox_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QMessageBox_Metacast(this.h, param1_Cstring)) } func QMessageBox_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QMessageBox_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMessageBox_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QMessageBox_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QMessageBox_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMessageBox_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -218,9 +245,11 @@ func (this *QMessageBox) AddButton(button *QAbstractButton, role QMessageBox__Bu } func (this *QMessageBox) AddButton2(text string, role QMessageBox__ButtonRole) *QPushButton { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - return UnsafeNewQPushButton(unsafe.Pointer(C.QMessageBox_AddButton2(this.h, (*C.struct_miqt_string)(text_ms), (C.int)(role)))) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + return UnsafeNewQPushButton(unsafe.Pointer(C.QMessageBox_AddButton2(this.h, text_ms, (C.int)(role)))) } func (this *QMessageBox) AddButtonWithButton(button QMessageBox__StandardButton) *QPushButton { @@ -291,16 +320,18 @@ func (this *QMessageBox) ClickedButton() *QAbstractButton { } func (this *QMessageBox) Text() string { - var _ms *C.struct_miqt_string = C.QMessageBox_Text(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMessageBox_Text(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QMessageBox) SetText(text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QMessageBox_SetText(this.h, (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QMessageBox_SetText(this.h, text_ms) } func (this *QMessageBox) Icon() QMessageBox__Icon { @@ -347,43 +378,63 @@ func (this *QMessageBox) CheckBox() *QCheckBox { } func QMessageBox_Information(parent *QWidget, title string, text string) QMessageBox__StandardButton { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - return (QMessageBox__StandardButton)(C.QMessageBox_Information(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + return (QMessageBox__StandardButton)(C.QMessageBox_Information(parent.cPointer(), title_ms, text_ms)) } func QMessageBox_Question(parent *QWidget, title string, text string) QMessageBox__StandardButton { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - return (QMessageBox__StandardButton)(C.QMessageBox_Question(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + return (QMessageBox__StandardButton)(C.QMessageBox_Question(parent.cPointer(), title_ms, text_ms)) } func QMessageBox_Warning(parent *QWidget, title string, text string) QMessageBox__StandardButton { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - return (QMessageBox__StandardButton)(C.QMessageBox_Warning(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + return (QMessageBox__StandardButton)(C.QMessageBox_Warning(parent.cPointer(), title_ms, text_ms)) } func QMessageBox_Critical(parent *QWidget, title string, text string) QMessageBox__StandardButton { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - return (QMessageBox__StandardButton)(C.QMessageBox_Critical(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + return (QMessageBox__StandardButton)(C.QMessageBox_Critical(parent.cPointer(), title_ms, text_ms)) } func QMessageBox_About(parent *QWidget, title string, text string) { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QMessageBox_About(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms)) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QMessageBox_About(parent.cPointer(), title_ms, text_ms) } func QMessageBox_AboutQt(parent *QWidget) { @@ -391,152 +442,216 @@ func QMessageBox_AboutQt(parent *QWidget) { } func QMessageBox_Information2(parent *QWidget, title string, text string, button0 int) int { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - return (int)(C.QMessageBox_Information2(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.int)(button0))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + return (int)(C.QMessageBox_Information2(parent.cPointer(), title_ms, text_ms, (C.int)(button0))) } func QMessageBox_Information3(parent *QWidget, title string, text string, button0Text string) int { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - button0Text_ms := libmiqt.Strdupg(button0Text) - defer C.free(button0Text_ms) - return (int)(C.QMessageBox_Information3(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (*C.struct_miqt_string)(button0Text_ms))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + button0Text_ms := C.struct_miqt_string{} + button0Text_ms.data = C.CString(button0Text) + button0Text_ms.len = C.size_t(len(button0Text)) + defer C.free(unsafe.Pointer(button0Text_ms.data)) + return (int)(C.QMessageBox_Information3(parent.cPointer(), title_ms, text_ms, button0Text_ms)) } func QMessageBox_Information4(parent *QWidget, title string, text string, button0 QMessageBox__StandardButton) QMessageBox__StandardButton { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - return (QMessageBox__StandardButton)(C.QMessageBox_Information4(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.int)(button0))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + return (QMessageBox__StandardButton)(C.QMessageBox_Information4(parent.cPointer(), title_ms, text_ms, (C.int)(button0))) } func QMessageBox_Question2(parent *QWidget, title string, text string, button0 int) int { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - return (int)(C.QMessageBox_Question2(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.int)(button0))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + return (int)(C.QMessageBox_Question2(parent.cPointer(), title_ms, text_ms, (C.int)(button0))) } func QMessageBox_Question3(parent *QWidget, title string, text string, button0Text string) int { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - button0Text_ms := libmiqt.Strdupg(button0Text) - defer C.free(button0Text_ms) - return (int)(C.QMessageBox_Question3(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (*C.struct_miqt_string)(button0Text_ms))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + button0Text_ms := C.struct_miqt_string{} + button0Text_ms.data = C.CString(button0Text) + button0Text_ms.len = C.size_t(len(button0Text)) + defer C.free(unsafe.Pointer(button0Text_ms.data)) + return (int)(C.QMessageBox_Question3(parent.cPointer(), title_ms, text_ms, button0Text_ms)) } func QMessageBox_Question4(parent *QWidget, title string, text string, button0 QMessageBox__StandardButton, button1 QMessageBox__StandardButton) int { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - return (int)(C.QMessageBox_Question4(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.int)(button0), (C.int)(button1))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + return (int)(C.QMessageBox_Question4(parent.cPointer(), title_ms, text_ms, (C.int)(button0), (C.int)(button1))) } func QMessageBox_Warning2(parent *QWidget, title string, text string, button0 int, button1 int) int { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - return (int)(C.QMessageBox_Warning2(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.int)(button0), (C.int)(button1))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + return (int)(C.QMessageBox_Warning2(parent.cPointer(), title_ms, text_ms, (C.int)(button0), (C.int)(button1))) } func QMessageBox_Warning3(parent *QWidget, title string, text string, button0Text string) int { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - button0Text_ms := libmiqt.Strdupg(button0Text) - defer C.free(button0Text_ms) - return (int)(C.QMessageBox_Warning3(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (*C.struct_miqt_string)(button0Text_ms))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + button0Text_ms := C.struct_miqt_string{} + button0Text_ms.data = C.CString(button0Text) + button0Text_ms.len = C.size_t(len(button0Text)) + defer C.free(unsafe.Pointer(button0Text_ms.data)) + return (int)(C.QMessageBox_Warning3(parent.cPointer(), title_ms, text_ms, button0Text_ms)) } func QMessageBox_Warning4(parent *QWidget, title string, text string, button0 QMessageBox__StandardButton, button1 QMessageBox__StandardButton) int { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - return (int)(C.QMessageBox_Warning4(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.int)(button0), (C.int)(button1))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + return (int)(C.QMessageBox_Warning4(parent.cPointer(), title_ms, text_ms, (C.int)(button0), (C.int)(button1))) } func QMessageBox_Critical2(parent *QWidget, title string, text string, button0 int, button1 int) int { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - return (int)(C.QMessageBox_Critical2(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.int)(button0), (C.int)(button1))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + return (int)(C.QMessageBox_Critical2(parent.cPointer(), title_ms, text_ms, (C.int)(button0), (C.int)(button1))) } func QMessageBox_Critical3(parent *QWidget, title string, text string, button0Text string) int { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - button0Text_ms := libmiqt.Strdupg(button0Text) - defer C.free(button0Text_ms) - return (int)(C.QMessageBox_Critical3(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (*C.struct_miqt_string)(button0Text_ms))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + button0Text_ms := C.struct_miqt_string{} + button0Text_ms.data = C.CString(button0Text) + button0Text_ms.len = C.size_t(len(button0Text)) + defer C.free(unsafe.Pointer(button0Text_ms.data)) + return (int)(C.QMessageBox_Critical3(parent.cPointer(), title_ms, text_ms, button0Text_ms)) } func QMessageBox_Critical4(parent *QWidget, title string, text string, button0 QMessageBox__StandardButton, button1 QMessageBox__StandardButton) int { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - return (int)(C.QMessageBox_Critical4(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.int)(button0), (C.int)(button1))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + return (int)(C.QMessageBox_Critical4(parent.cPointer(), title_ms, text_ms, (C.int)(button0), (C.int)(button1))) } func (this *QMessageBox) ButtonText(button int) string { - var _ms *C.struct_miqt_string = C.QMessageBox_ButtonText(this.h, (C.int)(button)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMessageBox_ButtonText(this.h, (C.int)(button)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QMessageBox) SetButtonText(button int, text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QMessageBox_SetButtonText(this.h, (C.int)(button), (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QMessageBox_SetButtonText(this.h, (C.int)(button), text_ms) } func (this *QMessageBox) InformativeText() string { - var _ms *C.struct_miqt_string = C.QMessageBox_InformativeText(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMessageBox_InformativeText(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QMessageBox) SetInformativeText(text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QMessageBox_SetInformativeText(this.h, (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QMessageBox_SetInformativeText(this.h, text_ms) } func (this *QMessageBox) DetailedText() string { - var _ms *C.struct_miqt_string = C.QMessageBox_DetailedText(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMessageBox_DetailedText(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QMessageBox) SetDetailedText(text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QMessageBox_SetDetailedText(this.h, (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QMessageBox_SetDetailedText(this.h, text_ms) } func (this *QMessageBox) SetWindowTitle(title string) { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - C.QMessageBox_SetWindowTitle(this.h, (*C.struct_miqt_string)(title_ms)) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + C.QMessageBox_SetWindowTitle(this.h, title_ms) } func (this *QMessageBox) SetWindowModality(windowModality WindowModality) { @@ -575,9 +690,9 @@ func QMessageBox_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QMessageBox_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMessageBox_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -586,9 +701,9 @@ func QMessageBox_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QMessageBox_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMessageBox_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -597,9 +712,9 @@ func QMessageBox_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QMessageBox_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMessageBox_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -608,352 +723,566 @@ func QMessageBox_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QMessageBox_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMessageBox_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QMessageBox_Information42(parent *QWidget, title string, text string, buttons QMessageBox__StandardButton) QMessageBox__StandardButton { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - return (QMessageBox__StandardButton)(C.QMessageBox_Information42(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.int)(buttons))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + return (QMessageBox__StandardButton)(C.QMessageBox_Information42(parent.cPointer(), title_ms, text_ms, (C.int)(buttons))) } func QMessageBox_Information5(parent *QWidget, title string, text string, buttons QMessageBox__StandardButton, defaultButton QMessageBox__StandardButton) QMessageBox__StandardButton { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - return (QMessageBox__StandardButton)(C.QMessageBox_Information5(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.int)(buttons), (C.int)(defaultButton))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + return (QMessageBox__StandardButton)(C.QMessageBox_Information5(parent.cPointer(), title_ms, text_ms, (C.int)(buttons), (C.int)(defaultButton))) } func QMessageBox_Question42(parent *QWidget, title string, text string, buttons QMessageBox__StandardButton) QMessageBox__StandardButton { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - return (QMessageBox__StandardButton)(C.QMessageBox_Question42(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.int)(buttons))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + return (QMessageBox__StandardButton)(C.QMessageBox_Question42(parent.cPointer(), title_ms, text_ms, (C.int)(buttons))) } func QMessageBox_Question5(parent *QWidget, title string, text string, buttons QMessageBox__StandardButton, defaultButton QMessageBox__StandardButton) QMessageBox__StandardButton { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - return (QMessageBox__StandardButton)(C.QMessageBox_Question5(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.int)(buttons), (C.int)(defaultButton))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + return (QMessageBox__StandardButton)(C.QMessageBox_Question5(parent.cPointer(), title_ms, text_ms, (C.int)(buttons), (C.int)(defaultButton))) } func QMessageBox_Warning42(parent *QWidget, title string, text string, buttons QMessageBox__StandardButton) QMessageBox__StandardButton { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - return (QMessageBox__StandardButton)(C.QMessageBox_Warning42(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.int)(buttons))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + return (QMessageBox__StandardButton)(C.QMessageBox_Warning42(parent.cPointer(), title_ms, text_ms, (C.int)(buttons))) } func QMessageBox_Warning5(parent *QWidget, title string, text string, buttons QMessageBox__StandardButton, defaultButton QMessageBox__StandardButton) QMessageBox__StandardButton { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - return (QMessageBox__StandardButton)(C.QMessageBox_Warning5(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.int)(buttons), (C.int)(defaultButton))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + return (QMessageBox__StandardButton)(C.QMessageBox_Warning5(parent.cPointer(), title_ms, text_ms, (C.int)(buttons), (C.int)(defaultButton))) } func QMessageBox_Critical42(parent *QWidget, title string, text string, buttons QMessageBox__StandardButton) QMessageBox__StandardButton { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - return (QMessageBox__StandardButton)(C.QMessageBox_Critical42(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.int)(buttons))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + return (QMessageBox__StandardButton)(C.QMessageBox_Critical42(parent.cPointer(), title_ms, text_ms, (C.int)(buttons))) } func QMessageBox_Critical5(parent *QWidget, title string, text string, buttons QMessageBox__StandardButton, defaultButton QMessageBox__StandardButton) QMessageBox__StandardButton { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - return (QMessageBox__StandardButton)(C.QMessageBox_Critical5(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.int)(buttons), (C.int)(defaultButton))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + return (QMessageBox__StandardButton)(C.QMessageBox_Critical5(parent.cPointer(), title_ms, text_ms, (C.int)(buttons), (C.int)(defaultButton))) } func QMessageBox_AboutQt2(parent *QWidget, title string) { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - C.QMessageBox_AboutQt2(parent.cPointer(), (*C.struct_miqt_string)(title_ms)) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + C.QMessageBox_AboutQt2(parent.cPointer(), title_ms) } func QMessageBox_Information52(parent *QWidget, title string, text string, button0 int, button1 int) int { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - return (int)(C.QMessageBox_Information52(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.int)(button0), (C.int)(button1))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + return (int)(C.QMessageBox_Information52(parent.cPointer(), title_ms, text_ms, (C.int)(button0), (C.int)(button1))) } func QMessageBox_Information6(parent *QWidget, title string, text string, button0 int, button1 int, button2 int) int { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - return (int)(C.QMessageBox_Information6(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.int)(button0), (C.int)(button1), (C.int)(button2))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + return (int)(C.QMessageBox_Information6(parent.cPointer(), title_ms, text_ms, (C.int)(button0), (C.int)(button1), (C.int)(button2))) } func QMessageBox_Information53(parent *QWidget, title string, text string, button0Text string, button1Text string) int { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - button0Text_ms := libmiqt.Strdupg(button0Text) - defer C.free(button0Text_ms) - button1Text_ms := libmiqt.Strdupg(button1Text) - defer C.free(button1Text_ms) - return (int)(C.QMessageBox_Information53(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (*C.struct_miqt_string)(button0Text_ms), (*C.struct_miqt_string)(button1Text_ms))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + button0Text_ms := C.struct_miqt_string{} + button0Text_ms.data = C.CString(button0Text) + button0Text_ms.len = C.size_t(len(button0Text)) + defer C.free(unsafe.Pointer(button0Text_ms.data)) + button1Text_ms := C.struct_miqt_string{} + button1Text_ms.data = C.CString(button1Text) + button1Text_ms.len = C.size_t(len(button1Text)) + defer C.free(unsafe.Pointer(button1Text_ms.data)) + return (int)(C.QMessageBox_Information53(parent.cPointer(), title_ms, text_ms, button0Text_ms, button1Text_ms)) } func QMessageBox_Information62(parent *QWidget, title string, text string, button0Text string, button1Text string, button2Text string) int { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - button0Text_ms := libmiqt.Strdupg(button0Text) - defer C.free(button0Text_ms) - button1Text_ms := libmiqt.Strdupg(button1Text) - defer C.free(button1Text_ms) - button2Text_ms := libmiqt.Strdupg(button2Text) - defer C.free(button2Text_ms) - return (int)(C.QMessageBox_Information62(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (*C.struct_miqt_string)(button0Text_ms), (*C.struct_miqt_string)(button1Text_ms), (*C.struct_miqt_string)(button2Text_ms))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + button0Text_ms := C.struct_miqt_string{} + button0Text_ms.data = C.CString(button0Text) + button0Text_ms.len = C.size_t(len(button0Text)) + defer C.free(unsafe.Pointer(button0Text_ms.data)) + button1Text_ms := C.struct_miqt_string{} + button1Text_ms.data = C.CString(button1Text) + button1Text_ms.len = C.size_t(len(button1Text)) + defer C.free(unsafe.Pointer(button1Text_ms.data)) + button2Text_ms := C.struct_miqt_string{} + button2Text_ms.data = C.CString(button2Text) + button2Text_ms.len = C.size_t(len(button2Text)) + defer C.free(unsafe.Pointer(button2Text_ms.data)) + return (int)(C.QMessageBox_Information62(parent.cPointer(), title_ms, text_ms, button0Text_ms, button1Text_ms, button2Text_ms)) } func QMessageBox_Information7(parent *QWidget, title string, text string, button0Text string, button1Text string, button2Text string, defaultButtonNumber int) int { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - button0Text_ms := libmiqt.Strdupg(button0Text) - defer C.free(button0Text_ms) - button1Text_ms := libmiqt.Strdupg(button1Text) - defer C.free(button1Text_ms) - button2Text_ms := libmiqt.Strdupg(button2Text) - defer C.free(button2Text_ms) - return (int)(C.QMessageBox_Information7(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (*C.struct_miqt_string)(button0Text_ms), (*C.struct_miqt_string)(button1Text_ms), (*C.struct_miqt_string)(button2Text_ms), (C.int)(defaultButtonNumber))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + button0Text_ms := C.struct_miqt_string{} + button0Text_ms.data = C.CString(button0Text) + button0Text_ms.len = C.size_t(len(button0Text)) + defer C.free(unsafe.Pointer(button0Text_ms.data)) + button1Text_ms := C.struct_miqt_string{} + button1Text_ms.data = C.CString(button1Text) + button1Text_ms.len = C.size_t(len(button1Text)) + defer C.free(unsafe.Pointer(button1Text_ms.data)) + button2Text_ms := C.struct_miqt_string{} + button2Text_ms.data = C.CString(button2Text) + button2Text_ms.len = C.size_t(len(button2Text)) + defer C.free(unsafe.Pointer(button2Text_ms.data)) + return (int)(C.QMessageBox_Information7(parent.cPointer(), title_ms, text_ms, button0Text_ms, button1Text_ms, button2Text_ms, (C.int)(defaultButtonNumber))) } func QMessageBox_Information8(parent *QWidget, title string, text string, button0Text string, button1Text string, button2Text string, defaultButtonNumber int, escapeButtonNumber int) int { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - button0Text_ms := libmiqt.Strdupg(button0Text) - defer C.free(button0Text_ms) - button1Text_ms := libmiqt.Strdupg(button1Text) - defer C.free(button1Text_ms) - button2Text_ms := libmiqt.Strdupg(button2Text) - defer C.free(button2Text_ms) - return (int)(C.QMessageBox_Information8(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (*C.struct_miqt_string)(button0Text_ms), (*C.struct_miqt_string)(button1Text_ms), (*C.struct_miqt_string)(button2Text_ms), (C.int)(defaultButtonNumber), (C.int)(escapeButtonNumber))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + button0Text_ms := C.struct_miqt_string{} + button0Text_ms.data = C.CString(button0Text) + button0Text_ms.len = C.size_t(len(button0Text)) + defer C.free(unsafe.Pointer(button0Text_ms.data)) + button1Text_ms := C.struct_miqt_string{} + button1Text_ms.data = C.CString(button1Text) + button1Text_ms.len = C.size_t(len(button1Text)) + defer C.free(unsafe.Pointer(button1Text_ms.data)) + button2Text_ms := C.struct_miqt_string{} + button2Text_ms.data = C.CString(button2Text) + button2Text_ms.len = C.size_t(len(button2Text)) + defer C.free(unsafe.Pointer(button2Text_ms.data)) + return (int)(C.QMessageBox_Information8(parent.cPointer(), title_ms, text_ms, button0Text_ms, button1Text_ms, button2Text_ms, (C.int)(defaultButtonNumber), (C.int)(escapeButtonNumber))) } func QMessageBox_Information54(parent *QWidget, title string, text string, button0 QMessageBox__StandardButton, button1 QMessageBox__StandardButton) QMessageBox__StandardButton { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - return (QMessageBox__StandardButton)(C.QMessageBox_Information54(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.int)(button0), (C.int)(button1))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + return (QMessageBox__StandardButton)(C.QMessageBox_Information54(parent.cPointer(), title_ms, text_ms, (C.int)(button0), (C.int)(button1))) } func QMessageBox_Question52(parent *QWidget, title string, text string, button0 int, button1 int) int { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - return (int)(C.QMessageBox_Question52(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.int)(button0), (C.int)(button1))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + return (int)(C.QMessageBox_Question52(parent.cPointer(), title_ms, text_ms, (C.int)(button0), (C.int)(button1))) } func QMessageBox_Question6(parent *QWidget, title string, text string, button0 int, button1 int, button2 int) int { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - return (int)(C.QMessageBox_Question6(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.int)(button0), (C.int)(button1), (C.int)(button2))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + return (int)(C.QMessageBox_Question6(parent.cPointer(), title_ms, text_ms, (C.int)(button0), (C.int)(button1), (C.int)(button2))) } func QMessageBox_Question53(parent *QWidget, title string, text string, button0Text string, button1Text string) int { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - button0Text_ms := libmiqt.Strdupg(button0Text) - defer C.free(button0Text_ms) - button1Text_ms := libmiqt.Strdupg(button1Text) - defer C.free(button1Text_ms) - return (int)(C.QMessageBox_Question53(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (*C.struct_miqt_string)(button0Text_ms), (*C.struct_miqt_string)(button1Text_ms))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + button0Text_ms := C.struct_miqt_string{} + button0Text_ms.data = C.CString(button0Text) + button0Text_ms.len = C.size_t(len(button0Text)) + defer C.free(unsafe.Pointer(button0Text_ms.data)) + button1Text_ms := C.struct_miqt_string{} + button1Text_ms.data = C.CString(button1Text) + button1Text_ms.len = C.size_t(len(button1Text)) + defer C.free(unsafe.Pointer(button1Text_ms.data)) + return (int)(C.QMessageBox_Question53(parent.cPointer(), title_ms, text_ms, button0Text_ms, button1Text_ms)) } func QMessageBox_Question62(parent *QWidget, title string, text string, button0Text string, button1Text string, button2Text string) int { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - button0Text_ms := libmiqt.Strdupg(button0Text) - defer C.free(button0Text_ms) - button1Text_ms := libmiqt.Strdupg(button1Text) - defer C.free(button1Text_ms) - button2Text_ms := libmiqt.Strdupg(button2Text) - defer C.free(button2Text_ms) - return (int)(C.QMessageBox_Question62(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (*C.struct_miqt_string)(button0Text_ms), (*C.struct_miqt_string)(button1Text_ms), (*C.struct_miqt_string)(button2Text_ms))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + button0Text_ms := C.struct_miqt_string{} + button0Text_ms.data = C.CString(button0Text) + button0Text_ms.len = C.size_t(len(button0Text)) + defer C.free(unsafe.Pointer(button0Text_ms.data)) + button1Text_ms := C.struct_miqt_string{} + button1Text_ms.data = C.CString(button1Text) + button1Text_ms.len = C.size_t(len(button1Text)) + defer C.free(unsafe.Pointer(button1Text_ms.data)) + button2Text_ms := C.struct_miqt_string{} + button2Text_ms.data = C.CString(button2Text) + button2Text_ms.len = C.size_t(len(button2Text)) + defer C.free(unsafe.Pointer(button2Text_ms.data)) + return (int)(C.QMessageBox_Question62(parent.cPointer(), title_ms, text_ms, button0Text_ms, button1Text_ms, button2Text_ms)) } func QMessageBox_Question7(parent *QWidget, title string, text string, button0Text string, button1Text string, button2Text string, defaultButtonNumber int) int { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - button0Text_ms := libmiqt.Strdupg(button0Text) - defer C.free(button0Text_ms) - button1Text_ms := libmiqt.Strdupg(button1Text) - defer C.free(button1Text_ms) - button2Text_ms := libmiqt.Strdupg(button2Text) - defer C.free(button2Text_ms) - return (int)(C.QMessageBox_Question7(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (*C.struct_miqt_string)(button0Text_ms), (*C.struct_miqt_string)(button1Text_ms), (*C.struct_miqt_string)(button2Text_ms), (C.int)(defaultButtonNumber))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + button0Text_ms := C.struct_miqt_string{} + button0Text_ms.data = C.CString(button0Text) + button0Text_ms.len = C.size_t(len(button0Text)) + defer C.free(unsafe.Pointer(button0Text_ms.data)) + button1Text_ms := C.struct_miqt_string{} + button1Text_ms.data = C.CString(button1Text) + button1Text_ms.len = C.size_t(len(button1Text)) + defer C.free(unsafe.Pointer(button1Text_ms.data)) + button2Text_ms := C.struct_miqt_string{} + button2Text_ms.data = C.CString(button2Text) + button2Text_ms.len = C.size_t(len(button2Text)) + defer C.free(unsafe.Pointer(button2Text_ms.data)) + return (int)(C.QMessageBox_Question7(parent.cPointer(), title_ms, text_ms, button0Text_ms, button1Text_ms, button2Text_ms, (C.int)(defaultButtonNumber))) } func QMessageBox_Question8(parent *QWidget, title string, text string, button0Text string, button1Text string, button2Text string, defaultButtonNumber int, escapeButtonNumber int) int { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - button0Text_ms := libmiqt.Strdupg(button0Text) - defer C.free(button0Text_ms) - button1Text_ms := libmiqt.Strdupg(button1Text) - defer C.free(button1Text_ms) - button2Text_ms := libmiqt.Strdupg(button2Text) - defer C.free(button2Text_ms) - return (int)(C.QMessageBox_Question8(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (*C.struct_miqt_string)(button0Text_ms), (*C.struct_miqt_string)(button1Text_ms), (*C.struct_miqt_string)(button2Text_ms), (C.int)(defaultButtonNumber), (C.int)(escapeButtonNumber))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + button0Text_ms := C.struct_miqt_string{} + button0Text_ms.data = C.CString(button0Text) + button0Text_ms.len = C.size_t(len(button0Text)) + defer C.free(unsafe.Pointer(button0Text_ms.data)) + button1Text_ms := C.struct_miqt_string{} + button1Text_ms.data = C.CString(button1Text) + button1Text_ms.len = C.size_t(len(button1Text)) + defer C.free(unsafe.Pointer(button1Text_ms.data)) + button2Text_ms := C.struct_miqt_string{} + button2Text_ms.data = C.CString(button2Text) + button2Text_ms.len = C.size_t(len(button2Text)) + defer C.free(unsafe.Pointer(button2Text_ms.data)) + return (int)(C.QMessageBox_Question8(parent.cPointer(), title_ms, text_ms, button0Text_ms, button1Text_ms, button2Text_ms, (C.int)(defaultButtonNumber), (C.int)(escapeButtonNumber))) } func QMessageBox_Warning6(parent *QWidget, title string, text string, button0 int, button1 int, button2 int) int { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - return (int)(C.QMessageBox_Warning6(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.int)(button0), (C.int)(button1), (C.int)(button2))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + return (int)(C.QMessageBox_Warning6(parent.cPointer(), title_ms, text_ms, (C.int)(button0), (C.int)(button1), (C.int)(button2))) } func QMessageBox_Warning52(parent *QWidget, title string, text string, button0Text string, button1Text string) int { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - button0Text_ms := libmiqt.Strdupg(button0Text) - defer C.free(button0Text_ms) - button1Text_ms := libmiqt.Strdupg(button1Text) - defer C.free(button1Text_ms) - return (int)(C.QMessageBox_Warning52(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (*C.struct_miqt_string)(button0Text_ms), (*C.struct_miqt_string)(button1Text_ms))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + button0Text_ms := C.struct_miqt_string{} + button0Text_ms.data = C.CString(button0Text) + button0Text_ms.len = C.size_t(len(button0Text)) + defer C.free(unsafe.Pointer(button0Text_ms.data)) + button1Text_ms := C.struct_miqt_string{} + button1Text_ms.data = C.CString(button1Text) + button1Text_ms.len = C.size_t(len(button1Text)) + defer C.free(unsafe.Pointer(button1Text_ms.data)) + return (int)(C.QMessageBox_Warning52(parent.cPointer(), title_ms, text_ms, button0Text_ms, button1Text_ms)) } func QMessageBox_Warning62(parent *QWidget, title string, text string, button0Text string, button1Text string, button2Text string) int { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - button0Text_ms := libmiqt.Strdupg(button0Text) - defer C.free(button0Text_ms) - button1Text_ms := libmiqt.Strdupg(button1Text) - defer C.free(button1Text_ms) - button2Text_ms := libmiqt.Strdupg(button2Text) - defer C.free(button2Text_ms) - return (int)(C.QMessageBox_Warning62(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (*C.struct_miqt_string)(button0Text_ms), (*C.struct_miqt_string)(button1Text_ms), (*C.struct_miqt_string)(button2Text_ms))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + button0Text_ms := C.struct_miqt_string{} + button0Text_ms.data = C.CString(button0Text) + button0Text_ms.len = C.size_t(len(button0Text)) + defer C.free(unsafe.Pointer(button0Text_ms.data)) + button1Text_ms := C.struct_miqt_string{} + button1Text_ms.data = C.CString(button1Text) + button1Text_ms.len = C.size_t(len(button1Text)) + defer C.free(unsafe.Pointer(button1Text_ms.data)) + button2Text_ms := C.struct_miqt_string{} + button2Text_ms.data = C.CString(button2Text) + button2Text_ms.len = C.size_t(len(button2Text)) + defer C.free(unsafe.Pointer(button2Text_ms.data)) + return (int)(C.QMessageBox_Warning62(parent.cPointer(), title_ms, text_ms, button0Text_ms, button1Text_ms, button2Text_ms)) } func QMessageBox_Warning7(parent *QWidget, title string, text string, button0Text string, button1Text string, button2Text string, defaultButtonNumber int) int { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - button0Text_ms := libmiqt.Strdupg(button0Text) - defer C.free(button0Text_ms) - button1Text_ms := libmiqt.Strdupg(button1Text) - defer C.free(button1Text_ms) - button2Text_ms := libmiqt.Strdupg(button2Text) - defer C.free(button2Text_ms) - return (int)(C.QMessageBox_Warning7(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (*C.struct_miqt_string)(button0Text_ms), (*C.struct_miqt_string)(button1Text_ms), (*C.struct_miqt_string)(button2Text_ms), (C.int)(defaultButtonNumber))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + button0Text_ms := C.struct_miqt_string{} + button0Text_ms.data = C.CString(button0Text) + button0Text_ms.len = C.size_t(len(button0Text)) + defer C.free(unsafe.Pointer(button0Text_ms.data)) + button1Text_ms := C.struct_miqt_string{} + button1Text_ms.data = C.CString(button1Text) + button1Text_ms.len = C.size_t(len(button1Text)) + defer C.free(unsafe.Pointer(button1Text_ms.data)) + button2Text_ms := C.struct_miqt_string{} + button2Text_ms.data = C.CString(button2Text) + button2Text_ms.len = C.size_t(len(button2Text)) + defer C.free(unsafe.Pointer(button2Text_ms.data)) + return (int)(C.QMessageBox_Warning7(parent.cPointer(), title_ms, text_ms, button0Text_ms, button1Text_ms, button2Text_ms, (C.int)(defaultButtonNumber))) } func QMessageBox_Warning8(parent *QWidget, title string, text string, button0Text string, button1Text string, button2Text string, defaultButtonNumber int, escapeButtonNumber int) int { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - button0Text_ms := libmiqt.Strdupg(button0Text) - defer C.free(button0Text_ms) - button1Text_ms := libmiqt.Strdupg(button1Text) - defer C.free(button1Text_ms) - button2Text_ms := libmiqt.Strdupg(button2Text) - defer C.free(button2Text_ms) - return (int)(C.QMessageBox_Warning8(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (*C.struct_miqt_string)(button0Text_ms), (*C.struct_miqt_string)(button1Text_ms), (*C.struct_miqt_string)(button2Text_ms), (C.int)(defaultButtonNumber), (C.int)(escapeButtonNumber))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + button0Text_ms := C.struct_miqt_string{} + button0Text_ms.data = C.CString(button0Text) + button0Text_ms.len = C.size_t(len(button0Text)) + defer C.free(unsafe.Pointer(button0Text_ms.data)) + button1Text_ms := C.struct_miqt_string{} + button1Text_ms.data = C.CString(button1Text) + button1Text_ms.len = C.size_t(len(button1Text)) + defer C.free(unsafe.Pointer(button1Text_ms.data)) + button2Text_ms := C.struct_miqt_string{} + button2Text_ms.data = C.CString(button2Text) + button2Text_ms.len = C.size_t(len(button2Text)) + defer C.free(unsafe.Pointer(button2Text_ms.data)) + return (int)(C.QMessageBox_Warning8(parent.cPointer(), title_ms, text_ms, button0Text_ms, button1Text_ms, button2Text_ms, (C.int)(defaultButtonNumber), (C.int)(escapeButtonNumber))) } func QMessageBox_Critical6(parent *QWidget, title string, text string, button0 int, button1 int, button2 int) int { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - return (int)(C.QMessageBox_Critical6(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.int)(button0), (C.int)(button1), (C.int)(button2))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + return (int)(C.QMessageBox_Critical6(parent.cPointer(), title_ms, text_ms, (C.int)(button0), (C.int)(button1), (C.int)(button2))) } func QMessageBox_Critical52(parent *QWidget, title string, text string, button0Text string, button1Text string) int { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - button0Text_ms := libmiqt.Strdupg(button0Text) - defer C.free(button0Text_ms) - button1Text_ms := libmiqt.Strdupg(button1Text) - defer C.free(button1Text_ms) - return (int)(C.QMessageBox_Critical52(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (*C.struct_miqt_string)(button0Text_ms), (*C.struct_miqt_string)(button1Text_ms))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + button0Text_ms := C.struct_miqt_string{} + button0Text_ms.data = C.CString(button0Text) + button0Text_ms.len = C.size_t(len(button0Text)) + defer C.free(unsafe.Pointer(button0Text_ms.data)) + button1Text_ms := C.struct_miqt_string{} + button1Text_ms.data = C.CString(button1Text) + button1Text_ms.len = C.size_t(len(button1Text)) + defer C.free(unsafe.Pointer(button1Text_ms.data)) + return (int)(C.QMessageBox_Critical52(parent.cPointer(), title_ms, text_ms, button0Text_ms, button1Text_ms)) } func QMessageBox_Critical62(parent *QWidget, title string, text string, button0Text string, button1Text string, button2Text string) int { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - button0Text_ms := libmiqt.Strdupg(button0Text) - defer C.free(button0Text_ms) - button1Text_ms := libmiqt.Strdupg(button1Text) - defer C.free(button1Text_ms) - button2Text_ms := libmiqt.Strdupg(button2Text) - defer C.free(button2Text_ms) - return (int)(C.QMessageBox_Critical62(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (*C.struct_miqt_string)(button0Text_ms), (*C.struct_miqt_string)(button1Text_ms), (*C.struct_miqt_string)(button2Text_ms))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + button0Text_ms := C.struct_miqt_string{} + button0Text_ms.data = C.CString(button0Text) + button0Text_ms.len = C.size_t(len(button0Text)) + defer C.free(unsafe.Pointer(button0Text_ms.data)) + button1Text_ms := C.struct_miqt_string{} + button1Text_ms.data = C.CString(button1Text) + button1Text_ms.len = C.size_t(len(button1Text)) + defer C.free(unsafe.Pointer(button1Text_ms.data)) + button2Text_ms := C.struct_miqt_string{} + button2Text_ms.data = C.CString(button2Text) + button2Text_ms.len = C.size_t(len(button2Text)) + defer C.free(unsafe.Pointer(button2Text_ms.data)) + return (int)(C.QMessageBox_Critical62(parent.cPointer(), title_ms, text_ms, button0Text_ms, button1Text_ms, button2Text_ms)) } func QMessageBox_Critical7(parent *QWidget, title string, text string, button0Text string, button1Text string, button2Text string, defaultButtonNumber int) int { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - button0Text_ms := libmiqt.Strdupg(button0Text) - defer C.free(button0Text_ms) - button1Text_ms := libmiqt.Strdupg(button1Text) - defer C.free(button1Text_ms) - button2Text_ms := libmiqt.Strdupg(button2Text) - defer C.free(button2Text_ms) - return (int)(C.QMessageBox_Critical7(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (*C.struct_miqt_string)(button0Text_ms), (*C.struct_miqt_string)(button1Text_ms), (*C.struct_miqt_string)(button2Text_ms), (C.int)(defaultButtonNumber))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + button0Text_ms := C.struct_miqt_string{} + button0Text_ms.data = C.CString(button0Text) + button0Text_ms.len = C.size_t(len(button0Text)) + defer C.free(unsafe.Pointer(button0Text_ms.data)) + button1Text_ms := C.struct_miqt_string{} + button1Text_ms.data = C.CString(button1Text) + button1Text_ms.len = C.size_t(len(button1Text)) + defer C.free(unsafe.Pointer(button1Text_ms.data)) + button2Text_ms := C.struct_miqt_string{} + button2Text_ms.data = C.CString(button2Text) + button2Text_ms.len = C.size_t(len(button2Text)) + defer C.free(unsafe.Pointer(button2Text_ms.data)) + return (int)(C.QMessageBox_Critical7(parent.cPointer(), title_ms, text_ms, button0Text_ms, button1Text_ms, button2Text_ms, (C.int)(defaultButtonNumber))) } func QMessageBox_Critical8(parent *QWidget, title string, text string, button0Text string, button1Text string, button2Text string, defaultButtonNumber int, escapeButtonNumber int) int { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - button0Text_ms := libmiqt.Strdupg(button0Text) - defer C.free(button0Text_ms) - button1Text_ms := libmiqt.Strdupg(button1Text) - defer C.free(button1Text_ms) - button2Text_ms := libmiqt.Strdupg(button2Text) - defer C.free(button2Text_ms) - return (int)(C.QMessageBox_Critical8(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (*C.struct_miqt_string)(button0Text_ms), (*C.struct_miqt_string)(button1Text_ms), (*C.struct_miqt_string)(button2Text_ms), (C.int)(defaultButtonNumber), (C.int)(escapeButtonNumber))) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + button0Text_ms := C.struct_miqt_string{} + button0Text_ms.data = C.CString(button0Text) + button0Text_ms.len = C.size_t(len(button0Text)) + defer C.free(unsafe.Pointer(button0Text_ms.data)) + button1Text_ms := C.struct_miqt_string{} + button1Text_ms.data = C.CString(button1Text) + button1Text_ms.len = C.size_t(len(button1Text)) + defer C.free(unsafe.Pointer(button1Text_ms.data)) + button2Text_ms := C.struct_miqt_string{} + button2Text_ms.data = C.CString(button2Text) + button2Text_ms.len = C.size_t(len(button2Text)) + defer C.free(unsafe.Pointer(button2Text_ms.data)) + return (int)(C.QMessageBox_Critical8(parent.cPointer(), title_ms, text_ms, button0Text_ms, button1Text_ms, button2Text_ms, (C.int)(defaultButtonNumber), (C.int)(escapeButtonNumber))) } // Delete this object from C++ memory. diff --git a/qt/gen_qmessagebox.h b/qt/gen_qmessagebox.h index 520893f8..3c6633d1 100644 --- a/qt/gen_qmessagebox.h +++ b/qt/gen_qmessagebox.h @@ -32,20 +32,20 @@ typedef struct QWidget QWidget; #endif QMessageBox* QMessageBox_new(); -QMessageBox* QMessageBox_new2(int icon, struct miqt_string* title, struct miqt_string* text); -QMessageBox* QMessageBox_new3(struct miqt_string* title, struct miqt_string* text, int icon, int button0, int button1, int button2); +QMessageBox* QMessageBox_new2(int icon, struct miqt_string title, struct miqt_string text); +QMessageBox* QMessageBox_new3(struct miqt_string title, struct miqt_string text, int icon, int button0, int button1, int button2); QMessageBox* QMessageBox_new4(QWidget* parent); -QMessageBox* QMessageBox_new5(int icon, struct miqt_string* title, struct miqt_string* text, int buttons); -QMessageBox* QMessageBox_new6(int icon, struct miqt_string* title, struct miqt_string* text, int buttons, QWidget* parent); -QMessageBox* QMessageBox_new7(int icon, struct miqt_string* title, struct miqt_string* text, int buttons, QWidget* parent, int flags); -QMessageBox* QMessageBox_new8(struct miqt_string* title, struct miqt_string* text, int icon, int button0, int button1, int button2, QWidget* parent); -QMessageBox* QMessageBox_new9(struct miqt_string* title, struct miqt_string* text, int icon, int button0, int button1, int button2, QWidget* parent, int f); +QMessageBox* QMessageBox_new5(int icon, struct miqt_string title, struct miqt_string text, int buttons); +QMessageBox* QMessageBox_new6(int icon, struct miqt_string title, struct miqt_string text, int buttons, QWidget* parent); +QMessageBox* QMessageBox_new7(int icon, struct miqt_string title, struct miqt_string text, int buttons, QWidget* parent, int flags); +QMessageBox* QMessageBox_new8(struct miqt_string title, struct miqt_string text, int icon, int button0, int button1, int button2, QWidget* parent); +QMessageBox* QMessageBox_new9(struct miqt_string title, struct miqt_string text, int icon, int button0, int button1, int button2, QWidget* parent, int f); QMetaObject* QMessageBox_MetaObject(const QMessageBox* self); void* QMessageBox_Metacast(QMessageBox* self, const char* param1); -struct miqt_string* QMessageBox_Tr(const char* s); -struct miqt_string* QMessageBox_TrUtf8(const char* s); +struct miqt_string QMessageBox_Tr(const char* s); +struct miqt_string QMessageBox_TrUtf8(const char* s); void QMessageBox_AddButton(QMessageBox* self, QAbstractButton* button, int role); -QPushButton* QMessageBox_AddButton2(QMessageBox* self, struct miqt_string* text, int role); +QPushButton* QMessageBox_AddButton2(QMessageBox* self, struct miqt_string text, int role); QPushButton* QMessageBox_AddButtonWithButton(QMessageBox* self, int button); void QMessageBox_RemoveButton(QMessageBox* self, QAbstractButton* button); struct miqt_array* QMessageBox_Buttons(const QMessageBox* self); @@ -61,8 +61,8 @@ QAbstractButton* QMessageBox_EscapeButton(const QMessageBox* self); void QMessageBox_SetEscapeButton(QMessageBox* self, QAbstractButton* button); void QMessageBox_SetEscapeButtonWithButton(QMessageBox* self, int button); QAbstractButton* QMessageBox_ClickedButton(const QMessageBox* self); -struct miqt_string* QMessageBox_Text(const QMessageBox* self); -void QMessageBox_SetText(QMessageBox* self, struct miqt_string* text); +struct miqt_string QMessageBox_Text(const QMessageBox* self); +void QMessageBox_SetText(QMessageBox* self, struct miqt_string text); int QMessageBox_Icon(const QMessageBox* self); void QMessageBox_SetIcon(QMessageBox* self, int icon); QPixmap* QMessageBox_IconPixmap(const QMessageBox* self); @@ -73,71 +73,71 @@ void QMessageBox_SetTextInteractionFlags(QMessageBox* self, int flags); int QMessageBox_TextInteractionFlags(const QMessageBox* self); void QMessageBox_SetCheckBox(QMessageBox* self, QCheckBox* cb); QCheckBox* QMessageBox_CheckBox(const QMessageBox* self); -int QMessageBox_Information(QWidget* parent, struct miqt_string* title, struct miqt_string* text); -int QMessageBox_Question(QWidget* parent, struct miqt_string* title, struct miqt_string* text); -int QMessageBox_Warning(QWidget* parent, struct miqt_string* title, struct miqt_string* text); -int QMessageBox_Critical(QWidget* parent, struct miqt_string* title, struct miqt_string* text); -void QMessageBox_About(QWidget* parent, struct miqt_string* title, struct miqt_string* text); +int QMessageBox_Information(QWidget* parent, struct miqt_string title, struct miqt_string text); +int QMessageBox_Question(QWidget* parent, struct miqt_string title, struct miqt_string text); +int QMessageBox_Warning(QWidget* parent, struct miqt_string title, struct miqt_string text); +int QMessageBox_Critical(QWidget* parent, struct miqt_string title, struct miqt_string text); +void QMessageBox_About(QWidget* parent, struct miqt_string title, struct miqt_string text); void QMessageBox_AboutQt(QWidget* parent); -int QMessageBox_Information2(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int button0); -int QMessageBox_Information3(QWidget* parent, struct miqt_string* title, struct miqt_string* text, struct miqt_string* button0Text); -int QMessageBox_Information4(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int button0); -int QMessageBox_Question2(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int button0); -int QMessageBox_Question3(QWidget* parent, struct miqt_string* title, struct miqt_string* text, struct miqt_string* button0Text); -int QMessageBox_Question4(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int button0, int button1); -int QMessageBox_Warning2(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int button0, int button1); -int QMessageBox_Warning3(QWidget* parent, struct miqt_string* title, struct miqt_string* text, struct miqt_string* button0Text); -int QMessageBox_Warning4(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int button0, int button1); -int QMessageBox_Critical2(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int button0, int button1); -int QMessageBox_Critical3(QWidget* parent, struct miqt_string* title, struct miqt_string* text, struct miqt_string* button0Text); -int QMessageBox_Critical4(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int button0, int button1); -struct miqt_string* QMessageBox_ButtonText(const QMessageBox* self, int button); -void QMessageBox_SetButtonText(QMessageBox* self, int button, struct miqt_string* text); -struct miqt_string* QMessageBox_InformativeText(const QMessageBox* self); -void QMessageBox_SetInformativeText(QMessageBox* self, struct miqt_string* text); -struct miqt_string* QMessageBox_DetailedText(const QMessageBox* self); -void QMessageBox_SetDetailedText(QMessageBox* self, struct miqt_string* text); -void QMessageBox_SetWindowTitle(QMessageBox* self, struct miqt_string* title); +int QMessageBox_Information2(QWidget* parent, struct miqt_string title, struct miqt_string text, int button0); +int QMessageBox_Information3(QWidget* parent, struct miqt_string title, struct miqt_string text, struct miqt_string button0Text); +int QMessageBox_Information4(QWidget* parent, struct miqt_string title, struct miqt_string text, int button0); +int QMessageBox_Question2(QWidget* parent, struct miqt_string title, struct miqt_string text, int button0); +int QMessageBox_Question3(QWidget* parent, struct miqt_string title, struct miqt_string text, struct miqt_string button0Text); +int QMessageBox_Question4(QWidget* parent, struct miqt_string title, struct miqt_string text, int button0, int button1); +int QMessageBox_Warning2(QWidget* parent, struct miqt_string title, struct miqt_string text, int button0, int button1); +int QMessageBox_Warning3(QWidget* parent, struct miqt_string title, struct miqt_string text, struct miqt_string button0Text); +int QMessageBox_Warning4(QWidget* parent, struct miqt_string title, struct miqt_string text, int button0, int button1); +int QMessageBox_Critical2(QWidget* parent, struct miqt_string title, struct miqt_string text, int button0, int button1); +int QMessageBox_Critical3(QWidget* parent, struct miqt_string title, struct miqt_string text, struct miqt_string button0Text); +int QMessageBox_Critical4(QWidget* parent, struct miqt_string title, struct miqt_string text, int button0, int button1); +struct miqt_string QMessageBox_ButtonText(const QMessageBox* self, int button); +void QMessageBox_SetButtonText(QMessageBox* self, int button, struct miqt_string text); +struct miqt_string QMessageBox_InformativeText(const QMessageBox* self); +void QMessageBox_SetInformativeText(QMessageBox* self, struct miqt_string text); +struct miqt_string QMessageBox_DetailedText(const QMessageBox* self); +void QMessageBox_SetDetailedText(QMessageBox* self, struct miqt_string text); +void QMessageBox_SetWindowTitle(QMessageBox* self, struct miqt_string title); void QMessageBox_SetWindowModality(QMessageBox* self, int windowModality); QPixmap* QMessageBox_StandardIcon(int icon); void QMessageBox_ButtonClicked(QMessageBox* self, QAbstractButton* button); void QMessageBox_connect_ButtonClicked(QMessageBox* self, intptr_t slot); -struct miqt_string* QMessageBox_Tr2(const char* s, const char* c); -struct miqt_string* QMessageBox_Tr3(const char* s, const char* c, int n); -struct miqt_string* QMessageBox_TrUtf82(const char* s, const char* c); -struct miqt_string* QMessageBox_TrUtf83(const char* s, const char* c, int n); -int QMessageBox_Information42(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int buttons); -int QMessageBox_Information5(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int buttons, int defaultButton); -int QMessageBox_Question42(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int buttons); -int QMessageBox_Question5(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int buttons, int defaultButton); -int QMessageBox_Warning42(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int buttons); -int QMessageBox_Warning5(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int buttons, int defaultButton); -int QMessageBox_Critical42(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int buttons); -int QMessageBox_Critical5(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int buttons, int defaultButton); -void QMessageBox_AboutQt2(QWidget* parent, struct miqt_string* title); -int QMessageBox_Information52(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int button0, int button1); -int QMessageBox_Information6(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int button0, int button1, int button2); -int QMessageBox_Information53(QWidget* parent, struct miqt_string* title, struct miqt_string* text, struct miqt_string* button0Text, struct miqt_string* button1Text); -int QMessageBox_Information62(QWidget* parent, struct miqt_string* title, struct miqt_string* text, struct miqt_string* button0Text, struct miqt_string* button1Text, struct miqt_string* button2Text); -int QMessageBox_Information7(QWidget* parent, struct miqt_string* title, struct miqt_string* text, struct miqt_string* button0Text, struct miqt_string* button1Text, struct miqt_string* button2Text, int defaultButtonNumber); -int QMessageBox_Information8(QWidget* parent, struct miqt_string* title, struct miqt_string* text, struct miqt_string* button0Text, struct miqt_string* button1Text, struct miqt_string* button2Text, int defaultButtonNumber, int escapeButtonNumber); -int QMessageBox_Information54(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int button0, int button1); -int QMessageBox_Question52(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int button0, int button1); -int QMessageBox_Question6(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int button0, int button1, int button2); -int QMessageBox_Question53(QWidget* parent, struct miqt_string* title, struct miqt_string* text, struct miqt_string* button0Text, struct miqt_string* button1Text); -int QMessageBox_Question62(QWidget* parent, struct miqt_string* title, struct miqt_string* text, struct miqt_string* button0Text, struct miqt_string* button1Text, struct miqt_string* button2Text); -int QMessageBox_Question7(QWidget* parent, struct miqt_string* title, struct miqt_string* text, struct miqt_string* button0Text, struct miqt_string* button1Text, struct miqt_string* button2Text, int defaultButtonNumber); -int QMessageBox_Question8(QWidget* parent, struct miqt_string* title, struct miqt_string* text, struct miqt_string* button0Text, struct miqt_string* button1Text, struct miqt_string* button2Text, int defaultButtonNumber, int escapeButtonNumber); -int QMessageBox_Warning6(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int button0, int button1, int button2); -int QMessageBox_Warning52(QWidget* parent, struct miqt_string* title, struct miqt_string* text, struct miqt_string* button0Text, struct miqt_string* button1Text); -int QMessageBox_Warning62(QWidget* parent, struct miqt_string* title, struct miqt_string* text, struct miqt_string* button0Text, struct miqt_string* button1Text, struct miqt_string* button2Text); -int QMessageBox_Warning7(QWidget* parent, struct miqt_string* title, struct miqt_string* text, struct miqt_string* button0Text, struct miqt_string* button1Text, struct miqt_string* button2Text, int defaultButtonNumber); -int QMessageBox_Warning8(QWidget* parent, struct miqt_string* title, struct miqt_string* text, struct miqt_string* button0Text, struct miqt_string* button1Text, struct miqt_string* button2Text, int defaultButtonNumber, int escapeButtonNumber); -int QMessageBox_Critical6(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int button0, int button1, int button2); -int QMessageBox_Critical52(QWidget* parent, struct miqt_string* title, struct miqt_string* text, struct miqt_string* button0Text, struct miqt_string* button1Text); -int QMessageBox_Critical62(QWidget* parent, struct miqt_string* title, struct miqt_string* text, struct miqt_string* button0Text, struct miqt_string* button1Text, struct miqt_string* button2Text); -int QMessageBox_Critical7(QWidget* parent, struct miqt_string* title, struct miqt_string* text, struct miqt_string* button0Text, struct miqt_string* button1Text, struct miqt_string* button2Text, int defaultButtonNumber); -int QMessageBox_Critical8(QWidget* parent, struct miqt_string* title, struct miqt_string* text, struct miqt_string* button0Text, struct miqt_string* button1Text, struct miqt_string* button2Text, int defaultButtonNumber, int escapeButtonNumber); +struct miqt_string QMessageBox_Tr2(const char* s, const char* c); +struct miqt_string QMessageBox_Tr3(const char* s, const char* c, int n); +struct miqt_string QMessageBox_TrUtf82(const char* s, const char* c); +struct miqt_string QMessageBox_TrUtf83(const char* s, const char* c, int n); +int QMessageBox_Information42(QWidget* parent, struct miqt_string title, struct miqt_string text, int buttons); +int QMessageBox_Information5(QWidget* parent, struct miqt_string title, struct miqt_string text, int buttons, int defaultButton); +int QMessageBox_Question42(QWidget* parent, struct miqt_string title, struct miqt_string text, int buttons); +int QMessageBox_Question5(QWidget* parent, struct miqt_string title, struct miqt_string text, int buttons, int defaultButton); +int QMessageBox_Warning42(QWidget* parent, struct miqt_string title, struct miqt_string text, int buttons); +int QMessageBox_Warning5(QWidget* parent, struct miqt_string title, struct miqt_string text, int buttons, int defaultButton); +int QMessageBox_Critical42(QWidget* parent, struct miqt_string title, struct miqt_string text, int buttons); +int QMessageBox_Critical5(QWidget* parent, struct miqt_string title, struct miqt_string text, int buttons, int defaultButton); +void QMessageBox_AboutQt2(QWidget* parent, struct miqt_string title); +int QMessageBox_Information52(QWidget* parent, struct miqt_string title, struct miqt_string text, int button0, int button1); +int QMessageBox_Information6(QWidget* parent, struct miqt_string title, struct miqt_string text, int button0, int button1, int button2); +int QMessageBox_Information53(QWidget* parent, struct miqt_string title, struct miqt_string text, struct miqt_string button0Text, struct miqt_string button1Text); +int QMessageBox_Information62(QWidget* parent, struct miqt_string title, struct miqt_string text, struct miqt_string button0Text, struct miqt_string button1Text, struct miqt_string button2Text); +int QMessageBox_Information7(QWidget* parent, struct miqt_string title, struct miqt_string text, struct miqt_string button0Text, struct miqt_string button1Text, struct miqt_string button2Text, int defaultButtonNumber); +int QMessageBox_Information8(QWidget* parent, struct miqt_string title, struct miqt_string text, struct miqt_string button0Text, struct miqt_string button1Text, struct miqt_string button2Text, int defaultButtonNumber, int escapeButtonNumber); +int QMessageBox_Information54(QWidget* parent, struct miqt_string title, struct miqt_string text, int button0, int button1); +int QMessageBox_Question52(QWidget* parent, struct miqt_string title, struct miqt_string text, int button0, int button1); +int QMessageBox_Question6(QWidget* parent, struct miqt_string title, struct miqt_string text, int button0, int button1, int button2); +int QMessageBox_Question53(QWidget* parent, struct miqt_string title, struct miqt_string text, struct miqt_string button0Text, struct miqt_string button1Text); +int QMessageBox_Question62(QWidget* parent, struct miqt_string title, struct miqt_string text, struct miqt_string button0Text, struct miqt_string button1Text, struct miqt_string button2Text); +int QMessageBox_Question7(QWidget* parent, struct miqt_string title, struct miqt_string text, struct miqt_string button0Text, struct miqt_string button1Text, struct miqt_string button2Text, int defaultButtonNumber); +int QMessageBox_Question8(QWidget* parent, struct miqt_string title, struct miqt_string text, struct miqt_string button0Text, struct miqt_string button1Text, struct miqt_string button2Text, int defaultButtonNumber, int escapeButtonNumber); +int QMessageBox_Warning6(QWidget* parent, struct miqt_string title, struct miqt_string text, int button0, int button1, int button2); +int QMessageBox_Warning52(QWidget* parent, struct miqt_string title, struct miqt_string text, struct miqt_string button0Text, struct miqt_string button1Text); +int QMessageBox_Warning62(QWidget* parent, struct miqt_string title, struct miqt_string text, struct miqt_string button0Text, struct miqt_string button1Text, struct miqt_string button2Text); +int QMessageBox_Warning7(QWidget* parent, struct miqt_string title, struct miqt_string text, struct miqt_string button0Text, struct miqt_string button1Text, struct miqt_string button2Text, int defaultButtonNumber); +int QMessageBox_Warning8(QWidget* parent, struct miqt_string title, struct miqt_string text, struct miqt_string button0Text, struct miqt_string button1Text, struct miqt_string button2Text, int defaultButtonNumber, int escapeButtonNumber); +int QMessageBox_Critical6(QWidget* parent, struct miqt_string title, struct miqt_string text, int button0, int button1, int button2); +int QMessageBox_Critical52(QWidget* parent, struct miqt_string title, struct miqt_string text, struct miqt_string button0Text, struct miqt_string button1Text); +int QMessageBox_Critical62(QWidget* parent, struct miqt_string title, struct miqt_string text, struct miqt_string button0Text, struct miqt_string button1Text, struct miqt_string button2Text); +int QMessageBox_Critical7(QWidget* parent, struct miqt_string title, struct miqt_string text, struct miqt_string button0Text, struct miqt_string button1Text, struct miqt_string button2Text, int defaultButtonNumber); +int QMessageBox_Critical8(QWidget* parent, struct miqt_string title, struct miqt_string text, struct miqt_string button0Text, struct miqt_string button1Text, struct miqt_string button2Text, int defaultButtonNumber, int escapeButtonNumber); void QMessageBox_Delete(QMessageBox* self); #ifdef __cplusplus diff --git a/qt/gen_qmetaobject.cpp b/qt/gen_qmetaobject.cpp index 40b58e0d..c1ba12ca 100644 --- a/qt/gen_qmetaobject.cpp +++ b/qt/gen_qmetaobject.cpp @@ -21,12 +21,22 @@ QMetaMethod* QMetaMethod_new2(QMetaMethod* param1) { return new QMetaMethod(*param1); } -QByteArray* QMetaMethod_MethodSignature(const QMetaMethod* self) { - return new QByteArray(self->methodSignature()); +struct miqt_string QMetaMethod_MethodSignature(const QMetaMethod* self) { + QByteArray _qb = self->methodSignature(); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } -QByteArray* QMetaMethod_Name(const QMetaMethod* self) { - return new QByteArray(self->name()); +struct miqt_string QMetaMethod_Name(const QMetaMethod* self) { + QByteArray _qb = self->name(); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } const char* QMetaMethod_TypeName(const QMetaMethod* self) { @@ -52,9 +62,14 @@ void QMetaMethod_GetParameterTypes(const QMetaMethod* self, int* types) { struct miqt_array* QMetaMethod_ParameterTypes(const QMetaMethod* self) { QList _ret = self->parameterTypes(); // Convert QList<> from C++ memory to manually-managed C memory - QByteArray** _arr = static_cast(malloc(sizeof(QByteArray*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { - _arr[i] = new QByteArray(_ret[i]); + QByteArray _lv_qb = _ret[i]; + struct miqt_string _lv_ms; + _lv_ms.len = _lv_qb.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_qb.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -65,9 +80,14 @@ struct miqt_array* QMetaMethod_ParameterTypes(const QMetaMethod* self) { struct miqt_array* QMetaMethod_ParameterNames(const QMetaMethod* self) { QList _ret = self->parameterNames(); // Convert QList<> from C++ memory to manually-managed C memory - QByteArray** _arr = static_cast(malloc(sizeof(QByteArray*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { - _arr[i] = new QByteArray(_ret[i]); + QByteArray _lv_qb = _ret[i]; + struct miqt_string _lv_ms; + _lv_ms.len = _lv_qb.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_qb.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -429,8 +449,13 @@ int QMetaEnum_KeysToValue(const QMetaEnum* self, const char* keys) { return self->keysToValue(keys); } -QByteArray* QMetaEnum_ValueToKeys(const QMetaEnum* self, int value) { - return new QByteArray(self->valueToKeys(static_cast(value))); +struct miqt_string QMetaEnum_ValueToKeys(const QMetaEnum* self, int value) { + QByteArray _qb = self->valueToKeys(static_cast(value)); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } QMetaObject* QMetaEnum_EnclosingMetaObject(const QMetaEnum* self) { diff --git a/qt/gen_qmetaobject.go b/qt/gen_qmetaobject.go index bd4e2298..b3e481b3 100644 --- a/qt/gen_qmetaobject.go +++ b/qt/gen_qmetaobject.go @@ -79,23 +79,23 @@ func NewQMetaMethod2(param1 *QMetaMethod) *QMetaMethod { return newQMetaMethod(ret) } -func (this *QMetaMethod) MethodSignature() *QByteArray { - _ret := C.QMetaMethod_MethodSignature(this.h) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QMetaMethod) MethodSignature() []byte { + var _bytearray C.struct_miqt_string = C.QMetaMethod_MethodSignature(this.h) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } -func (this *QMetaMethod) Name() *QByteArray { - _ret := C.QMetaMethod_Name(this.h) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QMetaMethod) Name() []byte { + var _bytearray C.struct_miqt_string = C.QMetaMethod_Name(this.h) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } -func (this *QMetaMethod) TypeName() unsafe.Pointer { +func (this *QMetaMethod) TypeName() string { _ret := C.QMetaMethod_TypeName(this.h) - return (unsafe.Pointer)(_ret) + return C.GoString(_ret) } func (this *QMetaMethod) ReturnType() int { @@ -114,37 +114,37 @@ func (this *QMetaMethod) GetParameterTypes(types *int) { C.QMetaMethod_GetParameterTypes(this.h, (*C.int)(unsafe.Pointer(types))) } -func (this *QMetaMethod) ParameterTypes() []QByteArray { +func (this *QMetaMethod) ParameterTypes() [][]byte { var _ma *C.struct_miqt_array = C.QMetaMethod_ParameterTypes(this.h) - _ret := make([]QByteArray, int(_ma.len)) - _outCast := (*[0xffff]*C.QByteArray)(unsafe.Pointer(_ma.data)) // hey ya + _ret := make([][]byte, int(_ma.len)) + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - _lv_ret := _outCast[i] - _lv_goptr := newQByteArray(_lv_ret) - _lv_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - _ret[i] = *_lv_goptr + var _lv_bytearray C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoBytes(unsafe.Pointer(_lv_bytearray.data), C.int(int64(_lv_bytearray.len))) + C.free(unsafe.Pointer(_lv_bytearray.data)) + _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) return _ret } -func (this *QMetaMethod) ParameterNames() []QByteArray { +func (this *QMetaMethod) ParameterNames() [][]byte { var _ma *C.struct_miqt_array = C.QMetaMethod_ParameterNames(this.h) - _ret := make([]QByteArray, int(_ma.len)) - _outCast := (*[0xffff]*C.QByteArray)(unsafe.Pointer(_ma.data)) // hey ya + _ret := make([][]byte, int(_ma.len)) + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - _lv_ret := _outCast[i] - _lv_goptr := newQByteArray(_lv_ret) - _lv_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - _ret[i] = *_lv_goptr + var _lv_bytearray C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoBytes(unsafe.Pointer(_lv_bytearray.data), C.int(int64(_lv_bytearray.len))) + C.free(unsafe.Pointer(_lv_bytearray.data)) + _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) return _ret } -func (this *QMetaMethod) Tag() unsafe.Pointer { +func (this *QMetaMethod) Tag() string { _ret := C.QMetaMethod_Tag(this.h) - return (unsafe.Pointer)(_ret) + return C.GoString(_ret) } func (this *QMetaMethod) Access() QMetaMethod__Access { @@ -494,14 +494,14 @@ func NewQMetaEnum2(param1 *QMetaEnum) *QMetaEnum { return newQMetaEnum(ret) } -func (this *QMetaEnum) Name() unsafe.Pointer { +func (this *QMetaEnum) Name() string { _ret := C.QMetaEnum_Name(this.h) - return (unsafe.Pointer)(_ret) + return C.GoString(_ret) } -func (this *QMetaEnum) EnumName() unsafe.Pointer { +func (this *QMetaEnum) EnumName() string { _ret := C.QMetaEnum_EnumName(this.h) - return (unsafe.Pointer)(_ret) + return C.GoString(_ret) } func (this *QMetaEnum) IsFlag() bool { @@ -516,18 +516,18 @@ func (this *QMetaEnum) KeyCount() int { return (int)(C.QMetaEnum_KeyCount(this.h)) } -func (this *QMetaEnum) Key(index int) unsafe.Pointer { +func (this *QMetaEnum) Key(index int) string { _ret := C.QMetaEnum_Key(this.h, (C.int)(index)) - return (unsafe.Pointer)(_ret) + return C.GoString(_ret) } func (this *QMetaEnum) Value(index int) int { return (int)(C.QMetaEnum_Value(this.h, (C.int)(index))) } -func (this *QMetaEnum) Scope() unsafe.Pointer { +func (this *QMetaEnum) Scope() string { _ret := C.QMetaEnum_Scope(this.h) - return (unsafe.Pointer)(_ret) + return C.GoString(_ret) } func (this *QMetaEnum) KeyToValue(key string) int { @@ -536,9 +536,9 @@ func (this *QMetaEnum) KeyToValue(key string) int { return (int)(C.QMetaEnum_KeyToValue(this.h, key_Cstring)) } -func (this *QMetaEnum) ValueToKey(value int) unsafe.Pointer { +func (this *QMetaEnum) ValueToKey(value int) string { _ret := C.QMetaEnum_ValueToKey(this.h, (C.int)(value)) - return (unsafe.Pointer)(_ret) + return C.GoString(_ret) } func (this *QMetaEnum) KeysToValue(keys string) int { @@ -547,11 +547,11 @@ func (this *QMetaEnum) KeysToValue(keys string) int { return (int)(C.QMetaEnum_KeysToValue(this.h, keys_Cstring)) } -func (this *QMetaEnum) ValueToKeys(value int) *QByteArray { - _ret := C.QMetaEnum_ValueToKeys(this.h, (C.int)(value)) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QMetaEnum) ValueToKeys(value int) []byte { + var _bytearray C.struct_miqt_string = C.QMetaEnum_ValueToKeys(this.h, (C.int)(value)) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } func (this *QMetaEnum) EnclosingMetaObject() *QMetaObject { @@ -623,14 +623,14 @@ func NewQMetaProperty() *QMetaProperty { return newQMetaProperty(ret) } -func (this *QMetaProperty) Name() unsafe.Pointer { +func (this *QMetaProperty) Name() string { _ret := C.QMetaProperty_Name(this.h) - return (unsafe.Pointer)(_ret) + return C.GoString(_ret) } -func (this *QMetaProperty) TypeName() unsafe.Pointer { +func (this *QMetaProperty) TypeName() string { _ret := C.QMetaProperty_TypeName(this.h) - return (unsafe.Pointer)(_ret) + return C.GoString(_ret) } func (this *QMetaProperty) Type() QVariant__Type { @@ -838,14 +838,14 @@ func NewQMetaClassInfo() *QMetaClassInfo { return newQMetaClassInfo(ret) } -func (this *QMetaClassInfo) Name() unsafe.Pointer { +func (this *QMetaClassInfo) Name() string { _ret := C.QMetaClassInfo_Name(this.h) - return (unsafe.Pointer)(_ret) + return C.GoString(_ret) } -func (this *QMetaClassInfo) Value() unsafe.Pointer { +func (this *QMetaClassInfo) Value() string { _ret := C.QMetaClassInfo_Value(this.h) - return (unsafe.Pointer)(_ret) + return C.GoString(_ret) } func (this *QMetaClassInfo) EnclosingMetaObject() *QMetaObject { diff --git a/qt/gen_qmetaobject.h b/qt/gen_qmetaobject.h index 4b8ac9bf..db210340 100644 --- a/qt/gen_qmetaobject.h +++ b/qt/gen_qmetaobject.h @@ -39,8 +39,8 @@ typedef struct QVariant QVariant; QMetaMethod* QMetaMethod_new(); QMetaMethod* QMetaMethod_new2(QMetaMethod* param1); -QByteArray* QMetaMethod_MethodSignature(const QMetaMethod* self); -QByteArray* QMetaMethod_Name(const QMetaMethod* self); +struct miqt_string QMetaMethod_MethodSignature(const QMetaMethod* self); +struct miqt_string QMetaMethod_Name(const QMetaMethod* self); const char* QMetaMethod_TypeName(const QMetaMethod* self); int QMetaMethod_ReturnType(const QMetaMethod* self); int QMetaMethod_ParameterCount(const QMetaMethod* self); @@ -137,7 +137,7 @@ const char* QMetaEnum_Scope(const QMetaEnum* self); int QMetaEnum_KeyToValue(const QMetaEnum* self, const char* key); const char* QMetaEnum_ValueToKey(const QMetaEnum* self, int value); int QMetaEnum_KeysToValue(const QMetaEnum* self, const char* keys); -QByteArray* QMetaEnum_ValueToKeys(const QMetaEnum* self, int value); +struct miqt_string QMetaEnum_ValueToKeys(const QMetaEnum* self, int value); QMetaObject* QMetaEnum_EnclosingMetaObject(const QMetaEnum* self); bool QMetaEnum_IsValid(const QMetaEnum* self); int QMetaEnum_KeyToValue2(const QMetaEnum* self, const char* key, bool* ok); diff --git a/qt/gen_qmetatype.cpp b/qt/gen_qmetatype.cpp index 57106e45..aa787d2e 100644 --- a/qt/gen_qmetatype.cpp +++ b/qt/gen_qmetatype.cpp @@ -55,16 +55,18 @@ int QMetaType_RegisterTypedef(const char* typeName, int aliasId) { return QMetaType::registerTypedef(typeName, static_cast(aliasId)); } -int QMetaType_RegisterNormalizedTypedef(QByteArray* normalizedTypeName, int aliasId) { - return QMetaType::registerNormalizedTypedef(*normalizedTypeName, static_cast(aliasId)); +int QMetaType_RegisterNormalizedTypedef(struct miqt_string normalizedTypeName, int aliasId) { + QByteArray normalizedTypeName_QByteArray(normalizedTypeName.data, normalizedTypeName.len); + return QMetaType::registerNormalizedTypedef(normalizedTypeName_QByteArray, static_cast(aliasId)); } int QMetaType_Type(const char* typeName) { return QMetaType::type(typeName); } -int QMetaType_TypeWithTypeName(QByteArray* typeName) { - return QMetaType::type(*typeName); +int QMetaType_TypeWithTypeName(struct miqt_string typeName) { + QByteArray typeName_QByteArray(typeName.data, typeName.len); + return QMetaType::type(typeName_QByteArray); } const char* QMetaType_TypeName(int typeVal) { @@ -137,8 +139,13 @@ QMetaObject* QMetaType_MetaObject(const QMetaType* self) { return (QMetaObject*) self->metaObject(); } -QByteArray* QMetaType_Name(const QMetaType* self) { - return new QByteArray(self->name()); +struct miqt_string QMetaType_Name(const QMetaType* self) { + QByteArray _qb = self->name(); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } void* QMetaType_Create2(const QMetaType* self) { diff --git a/qt/gen_qmetatype.go b/qt/gen_qmetatype.go index 08e99651..f9116cfb 100644 --- a/qt/gen_qmetatype.go +++ b/qt/gen_qmetatype.go @@ -343,8 +343,11 @@ func QMetaType_RegisterTypedef(typeName string, aliasId int) int { return (int)(C.QMetaType_RegisterTypedef(typeName_Cstring, (C.int)(aliasId))) } -func QMetaType_RegisterNormalizedTypedef(normalizedTypeName *QByteArray, aliasId int) int { - return (int)(C.QMetaType_RegisterNormalizedTypedef(normalizedTypeName.cPointer(), (C.int)(aliasId))) +func QMetaType_RegisterNormalizedTypedef(normalizedTypeName []byte, aliasId int) int { + normalizedTypeName_alias := C.struct_miqt_string{} + normalizedTypeName_alias.data = (*C.char)(unsafe.Pointer(&normalizedTypeName[0])) + normalizedTypeName_alias.len = C.size_t(len(normalizedTypeName)) + return (int)(C.QMetaType_RegisterNormalizedTypedef(normalizedTypeName_alias, (C.int)(aliasId))) } func QMetaType_Type(typeName string) int { @@ -353,13 +356,16 @@ func QMetaType_Type(typeName string) int { return (int)(C.QMetaType_Type(typeName_Cstring)) } -func QMetaType_TypeWithTypeName(typeName *QByteArray) int { - return (int)(C.QMetaType_TypeWithTypeName(typeName.cPointer())) +func QMetaType_TypeWithTypeName(typeName []byte) int { + typeName_alias := C.struct_miqt_string{} + typeName_alias.data = (*C.char)(unsafe.Pointer(&typeName[0])) + typeName_alias.len = C.size_t(len(typeName)) + return (int)(C.QMetaType_TypeWithTypeName(typeName_alias)) } -func QMetaType_TypeName(typeVal int) unsafe.Pointer { +func QMetaType_TypeName(typeVal int) string { _ret := C.QMetaType_TypeName((C.int)(typeVal)) - return (unsafe.Pointer)(_ret) + return C.GoString(_ret) } func QMetaType_SizeOf(typeVal int) int { @@ -379,7 +385,7 @@ func QMetaType_IsRegistered(typeVal int) bool { } func QMetaType_Create(typeVal int) unsafe.Pointer { - return C.QMetaType_Create((C.int)(typeVal)) + return (unsafe.Pointer)(C.QMetaType_Create((C.int)(typeVal))) } func QMetaType_Destroy(typeVal int, data unsafe.Pointer) { @@ -387,7 +393,7 @@ func QMetaType_Destroy(typeVal int, data unsafe.Pointer) { } func QMetaType_Construct(typeVal int, where unsafe.Pointer, copyVal unsafe.Pointer) unsafe.Pointer { - return C.QMetaType_Construct((C.int)(typeVal), where, copyVal) + return (unsafe.Pointer)(C.QMetaType_Construct((C.int)(typeVal), where, copyVal)) } func QMetaType_Destruct(typeVal int, where unsafe.Pointer) { @@ -426,15 +432,15 @@ func (this *QMetaType) MetaObject() *QMetaObject { return UnsafeNewQMetaObject(unsafe.Pointer(C.QMetaType_MetaObject(this.h))) } -func (this *QMetaType) Name() *QByteArray { - _ret := C.QMetaType_Name(this.h) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QMetaType) Name() []byte { + var _bytearray C.struct_miqt_string = C.QMetaType_Name(this.h) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } func (this *QMetaType) Create2() unsafe.Pointer { - return C.QMetaType_Create2(this.h) + return (unsafe.Pointer)(C.QMetaType_Create2(this.h)) } func (this *QMetaType) DestroyWithData(data unsafe.Pointer) { @@ -442,7 +448,7 @@ func (this *QMetaType) DestroyWithData(data unsafe.Pointer) { } func (this *QMetaType) ConstructWithWhere(where unsafe.Pointer) unsafe.Pointer { - return C.QMetaType_ConstructWithWhere(this.h, where) + return (unsafe.Pointer)(C.QMetaType_ConstructWithWhere(this.h, where)) } func (this *QMetaType) DestructWithData(data unsafe.Pointer) { @@ -478,15 +484,15 @@ func QMetaType_HasRegisteredConverterFunction(fromTypeId int, toTypeId int) bool } func QMetaType_Create22(typeVal int, copyVal unsafe.Pointer) unsafe.Pointer { - return C.QMetaType_Create22((C.int)(typeVal), copyVal) + return (unsafe.Pointer)(C.QMetaType_Create22((C.int)(typeVal), copyVal)) } func (this *QMetaType) Create1(copyVal unsafe.Pointer) unsafe.Pointer { - return C.QMetaType_Create1(this.h, copyVal) + return (unsafe.Pointer)(C.QMetaType_Create1(this.h, copyVal)) } func (this *QMetaType) Construct2(where unsafe.Pointer, copyVal unsafe.Pointer) unsafe.Pointer { - return C.QMetaType_Construct2(this.h, where, copyVal) + return (unsafe.Pointer)(C.QMetaType_Construct2(this.h, where, copyVal)) } // Delete this object from C++ memory. diff --git a/qt/gen_qmetatype.h b/qt/gen_qmetatype.h index 6b3acc75..5aab0b59 100644 --- a/qt/gen_qmetatype.h +++ b/qt/gen_qmetatype.h @@ -88,9 +88,9 @@ QMetaType* QMetaType_new(); QMetaType* QMetaType_new2(const int typeVal); bool QMetaType_UnregisterType(int typeVal); int QMetaType_RegisterTypedef(const char* typeName, int aliasId); -int QMetaType_RegisterNormalizedTypedef(QByteArray* normalizedTypeName, int aliasId); +int QMetaType_RegisterNormalizedTypedef(struct miqt_string normalizedTypeName, int aliasId); int QMetaType_Type(const char* typeName); -int QMetaType_TypeWithTypeName(QByteArray* typeName); +int QMetaType_TypeWithTypeName(struct miqt_string typeName); const char* QMetaType_TypeName(int typeVal); int QMetaType_SizeOf(int typeVal); int QMetaType_TypeFlags(int typeVal); @@ -108,7 +108,7 @@ int QMetaType_Id(const QMetaType* self); int QMetaType_SizeOf2(const QMetaType* self); int QMetaType_Flags(const QMetaType* self); QMetaObject* QMetaType_MetaObject(const QMetaType* self); -QByteArray* QMetaType_Name(const QMetaType* self); +struct miqt_string QMetaType_Name(const QMetaType* self); void* QMetaType_Create2(const QMetaType* self); void QMetaType_DestroyWithData(const QMetaType* self, void* data); void* QMetaType_ConstructWithWhere(const QMetaType* self, void* where); diff --git a/qt/gen_qmimedata.cpp b/qt/gen_qmimedata.cpp index 4f14646d..97ff5484 100644 --- a/qt/gen_qmimedata.cpp +++ b/qt/gen_qmimedata.cpp @@ -23,18 +23,26 @@ void* QMimeData_Metacast(QMimeData* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QMimeData_Tr(const char* s) { +struct miqt_string QMimeData_Tr(const char* s) { QString _ret = QMimeData::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QMimeData_TrUtf8(const char* s) { +struct miqt_string QMimeData_TrUtf8(const char* s) { QString _ret = QMimeData::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } struct miqt_array* QMimeData_Urls(const QMimeData* self) { @@ -64,15 +72,19 @@ bool QMimeData_HasUrls(const QMimeData* self) { return self->hasUrls(); } -struct miqt_string* QMimeData_Text(const QMimeData* self) { +struct miqt_string QMimeData_Text(const QMimeData* self) { QString _ret = self->text(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QMimeData_SetText(QMimeData* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QMimeData_SetText(QMimeData* self, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->setText(text_QString); } @@ -80,15 +92,19 @@ bool QMimeData_HasText(const QMimeData* self) { return self->hasText(); } -struct miqt_string* QMimeData_Html(const QMimeData* self) { +struct miqt_string QMimeData_Html(const QMimeData* self) { QString _ret = self->html(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QMimeData_SetHtml(QMimeData* self, struct miqt_string* html) { - QString html_QString = QString::fromUtf8(&html->data, html->len); +void QMimeData_SetHtml(QMimeData* self, struct miqt_string html) { + QString html_QString = QString::fromUtf8(html.data, html.len); self->setHtml(html_QString); } @@ -120,35 +136,45 @@ bool QMimeData_HasColor(const QMimeData* self) { return self->hasColor(); } -QByteArray* QMimeData_Data(const QMimeData* self, struct miqt_string* mimetype) { - QString mimetype_QString = QString::fromUtf8(&mimetype->data, mimetype->len); - return new QByteArray(self->data(mimetype_QString)); +struct miqt_string QMimeData_Data(const QMimeData* self, struct miqt_string mimetype) { + QString mimetype_QString = QString::fromUtf8(mimetype.data, mimetype.len); + QByteArray _qb = self->data(mimetype_QString); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } -void QMimeData_SetData(QMimeData* self, struct miqt_string* mimetype, QByteArray* data) { - QString mimetype_QString = QString::fromUtf8(&mimetype->data, mimetype->len); - self->setData(mimetype_QString, *data); +void QMimeData_SetData(QMimeData* self, struct miqt_string mimetype, struct miqt_string data) { + QString mimetype_QString = QString::fromUtf8(mimetype.data, mimetype.len); + QByteArray data_QByteArray(data.data, data.len); + self->setData(mimetype_QString, data_QByteArray); } -void QMimeData_RemoveFormat(QMimeData* self, struct miqt_string* mimetype) { - QString mimetype_QString = QString::fromUtf8(&mimetype->data, mimetype->len); +void QMimeData_RemoveFormat(QMimeData* self, struct miqt_string mimetype) { + QString mimetype_QString = QString::fromUtf8(mimetype.data, mimetype.len); self->removeFormat(mimetype_QString); } -bool QMimeData_HasFormat(const QMimeData* self, struct miqt_string* mimetype) { - QString mimetype_QString = QString::fromUtf8(&mimetype->data, mimetype->len); +bool QMimeData_HasFormat(const QMimeData* self, struct miqt_string mimetype) { + QString mimetype_QString = QString::fromUtf8(mimetype.data, mimetype.len); return self->hasFormat(mimetype_QString); } struct miqt_array* QMimeData_Formats(const QMimeData* self) { QStringList _ret = self->formats(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -160,32 +186,48 @@ void QMimeData_Clear(QMimeData* self) { self->clear(); } -struct miqt_string* QMimeData_Tr2(const char* s, const char* c) { +struct miqt_string QMimeData_Tr2(const char* s, const char* c) { QString _ret = QMimeData::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QMimeData_Tr3(const char* s, const char* c, int n) { +struct miqt_string QMimeData_Tr3(const char* s, const char* c, int n) { QString _ret = QMimeData::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QMimeData_TrUtf82(const char* s, const char* c) { +struct miqt_string QMimeData_TrUtf82(const char* s, const char* c) { QString _ret = QMimeData::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QMimeData_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QMimeData_TrUtf83(const char* s, const char* c, int n) { QString _ret = QMimeData::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QMimeData_Delete(QMimeData* self) { diff --git a/qt/gen_qmimedata.go b/qt/gen_qmimedata.go index 0ca29340..29a2174a 100644 --- a/qt/gen_qmimedata.go +++ b/qt/gen_qmimedata.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -57,24 +56,24 @@ func (this *QMimeData) MetaObject() *QMetaObject { func (this *QMimeData) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QMimeData_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QMimeData_Metacast(this.h, param1_Cstring)) } func QMimeData_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QMimeData_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMimeData_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QMimeData_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QMimeData_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMimeData_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -109,16 +108,18 @@ func (this *QMimeData) HasUrls() bool { } func (this *QMimeData) Text() string { - var _ms *C.struct_miqt_string = C.QMimeData_Text(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMimeData_Text(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QMimeData) SetText(text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QMimeData_SetText(this.h, (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QMimeData_SetText(this.h, text_ms) } func (this *QMimeData) HasText() bool { @@ -126,16 +127,18 @@ func (this *QMimeData) HasText() bool { } func (this *QMimeData) Html() string { - var _ms *C.struct_miqt_string = C.QMimeData_Html(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMimeData_Html(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QMimeData) SetHtml(html string) { - html_ms := libmiqt.Strdupg(html) - defer C.free(html_ms) - C.QMimeData_SetHtml(this.h, (*C.struct_miqt_string)(html_ms)) + html_ms := C.struct_miqt_string{} + html_ms.data = C.CString(html) + html_ms.len = C.size_t(len(html)) + defer C.free(unsafe.Pointer(html_ms.data)) + C.QMimeData_SetHtml(this.h, html_ms) } func (this *QMimeData) HasHtml() bool { @@ -172,41 +175,52 @@ func (this *QMimeData) HasColor() bool { return (bool)(C.QMimeData_HasColor(this.h)) } -func (this *QMimeData) Data(mimetype string) *QByteArray { - mimetype_ms := libmiqt.Strdupg(mimetype) - defer C.free(mimetype_ms) - _ret := C.QMimeData_Data(this.h, (*C.struct_miqt_string)(mimetype_ms)) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QMimeData) Data(mimetype string) []byte { + mimetype_ms := C.struct_miqt_string{} + mimetype_ms.data = C.CString(mimetype) + mimetype_ms.len = C.size_t(len(mimetype)) + defer C.free(unsafe.Pointer(mimetype_ms.data)) + var _bytearray C.struct_miqt_string = C.QMimeData_Data(this.h, mimetype_ms) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } -func (this *QMimeData) SetData(mimetype string, data *QByteArray) { - mimetype_ms := libmiqt.Strdupg(mimetype) - defer C.free(mimetype_ms) - C.QMimeData_SetData(this.h, (*C.struct_miqt_string)(mimetype_ms), data.cPointer()) +func (this *QMimeData) SetData(mimetype string, data []byte) { + mimetype_ms := C.struct_miqt_string{} + mimetype_ms.data = C.CString(mimetype) + mimetype_ms.len = C.size_t(len(mimetype)) + defer C.free(unsafe.Pointer(mimetype_ms.data)) + data_alias := C.struct_miqt_string{} + data_alias.data = (*C.char)(unsafe.Pointer(&data[0])) + data_alias.len = C.size_t(len(data)) + C.QMimeData_SetData(this.h, mimetype_ms, data_alias) } func (this *QMimeData) RemoveFormat(mimetype string) { - mimetype_ms := libmiqt.Strdupg(mimetype) - defer C.free(mimetype_ms) - C.QMimeData_RemoveFormat(this.h, (*C.struct_miqt_string)(mimetype_ms)) + mimetype_ms := C.struct_miqt_string{} + mimetype_ms.data = C.CString(mimetype) + mimetype_ms.len = C.size_t(len(mimetype)) + defer C.free(unsafe.Pointer(mimetype_ms.data)) + C.QMimeData_RemoveFormat(this.h, mimetype_ms) } func (this *QMimeData) HasFormat(mimetype string) bool { - mimetype_ms := libmiqt.Strdupg(mimetype) - defer C.free(mimetype_ms) - return (bool)(C.QMimeData_HasFormat(this.h, (*C.struct_miqt_string)(mimetype_ms))) + mimetype_ms := C.struct_miqt_string{} + mimetype_ms.data = C.CString(mimetype) + mimetype_ms.len = C.size_t(len(mimetype)) + defer C.free(unsafe.Pointer(mimetype_ms.data)) + return (bool)(C.QMimeData_HasFormat(this.h, mimetype_ms)) } func (this *QMimeData) Formats() []string { var _ma *C.struct_miqt_array = C.QMimeData_Formats(this.h) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -222,9 +236,9 @@ func QMimeData_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QMimeData_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMimeData_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -233,9 +247,9 @@ func QMimeData_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QMimeData_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMimeData_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -244,9 +258,9 @@ func QMimeData_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QMimeData_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMimeData_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -255,9 +269,9 @@ func QMimeData_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QMimeData_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMimeData_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qmimedata.h b/qt/gen_qmimedata.h index 66e4c3c9..c24fd156 100644 --- a/qt/gen_qmimedata.h +++ b/qt/gen_qmimedata.h @@ -30,16 +30,16 @@ typedef struct QVariant QVariant; QMimeData* QMimeData_new(); QMetaObject* QMimeData_MetaObject(const QMimeData* self); void* QMimeData_Metacast(QMimeData* self, const char* param1); -struct miqt_string* QMimeData_Tr(const char* s); -struct miqt_string* QMimeData_TrUtf8(const char* s); +struct miqt_string QMimeData_Tr(const char* s); +struct miqt_string QMimeData_TrUtf8(const char* s); struct miqt_array* QMimeData_Urls(const QMimeData* self); void QMimeData_SetUrls(QMimeData* self, struct miqt_array* /* of QUrl* */ urls); bool QMimeData_HasUrls(const QMimeData* self); -struct miqt_string* QMimeData_Text(const QMimeData* self); -void QMimeData_SetText(QMimeData* self, struct miqt_string* text); +struct miqt_string QMimeData_Text(const QMimeData* self); +void QMimeData_SetText(QMimeData* self, struct miqt_string text); bool QMimeData_HasText(const QMimeData* self); -struct miqt_string* QMimeData_Html(const QMimeData* self); -void QMimeData_SetHtml(QMimeData* self, struct miqt_string* html); +struct miqt_string QMimeData_Html(const QMimeData* self); +void QMimeData_SetHtml(QMimeData* self, struct miqt_string html); bool QMimeData_HasHtml(const QMimeData* self); QVariant* QMimeData_ImageData(const QMimeData* self); void QMimeData_SetImageData(QMimeData* self, QVariant* image); @@ -47,16 +47,16 @@ bool QMimeData_HasImage(const QMimeData* self); QVariant* QMimeData_ColorData(const QMimeData* self); void QMimeData_SetColorData(QMimeData* self, QVariant* color); bool QMimeData_HasColor(const QMimeData* self); -QByteArray* QMimeData_Data(const QMimeData* self, struct miqt_string* mimetype); -void QMimeData_SetData(QMimeData* self, struct miqt_string* mimetype, QByteArray* data); -void QMimeData_RemoveFormat(QMimeData* self, struct miqt_string* mimetype); -bool QMimeData_HasFormat(const QMimeData* self, struct miqt_string* mimetype); +struct miqt_string QMimeData_Data(const QMimeData* self, struct miqt_string mimetype); +void QMimeData_SetData(QMimeData* self, struct miqt_string mimetype, struct miqt_string data); +void QMimeData_RemoveFormat(QMimeData* self, struct miqt_string mimetype); +bool QMimeData_HasFormat(const QMimeData* self, struct miqt_string mimetype); struct miqt_array* QMimeData_Formats(const QMimeData* self); void QMimeData_Clear(QMimeData* self); -struct miqt_string* QMimeData_Tr2(const char* s, const char* c); -struct miqt_string* QMimeData_Tr3(const char* s, const char* c, int n); -struct miqt_string* QMimeData_TrUtf82(const char* s, const char* c); -struct miqt_string* QMimeData_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QMimeData_Tr2(const char* s, const char* c); +struct miqt_string QMimeData_Tr3(const char* s, const char* c, int n); +struct miqt_string QMimeData_TrUtf82(const char* s, const char* c); +struct miqt_string QMimeData_TrUtf83(const char* s, const char* c, int n); void QMimeData_Delete(QMimeData* self); #ifdef __cplusplus diff --git a/qt/gen_qmimedatabase.cpp b/qt/gen_qmimedatabase.cpp index 611d2e80..968ba9bd 100644 --- a/qt/gen_qmimedatabase.cpp +++ b/qt/gen_qmimedatabase.cpp @@ -16,13 +16,13 @@ QMimeDatabase* QMimeDatabase_new() { return new QMimeDatabase(); } -QMimeType* QMimeDatabase_MimeTypeForName(const QMimeDatabase* self, struct miqt_string* nameOrAlias) { - QString nameOrAlias_QString = QString::fromUtf8(&nameOrAlias->data, nameOrAlias->len); +QMimeType* QMimeDatabase_MimeTypeForName(const QMimeDatabase* self, struct miqt_string nameOrAlias) { + QString nameOrAlias_QString = QString::fromUtf8(nameOrAlias.data, nameOrAlias.len); return new QMimeType(self->mimeTypeForName(nameOrAlias_QString)); } -QMimeType* QMimeDatabase_MimeTypeForFile(const QMimeDatabase* self, struct miqt_string* fileName) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +QMimeType* QMimeDatabase_MimeTypeForFile(const QMimeDatabase* self, struct miqt_string fileName) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); return new QMimeType(self->mimeTypeForFile(fileName_QString)); } @@ -30,8 +30,8 @@ QMimeType* QMimeDatabase_MimeTypeForFileWithFileInfo(const QMimeDatabase* self, return new QMimeType(self->mimeTypeForFile(*fileInfo)); } -struct miqt_array* QMimeDatabase_MimeTypesForFileName(const QMimeDatabase* self, struct miqt_string* fileName) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +struct miqt_array* QMimeDatabase_MimeTypesForFileName(const QMimeDatabase* self, struct miqt_string fileName) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); QList _ret = self->mimeTypesForFileName(fileName_QString); // Convert QList<> from C++ memory to manually-managed C memory QMimeType** _arr = static_cast(malloc(sizeof(QMimeType*) * _ret.length())); @@ -44,8 +44,9 @@ struct miqt_array* QMimeDatabase_MimeTypesForFileName(const QMimeDatabase* self, return _out; } -QMimeType* QMimeDatabase_MimeTypeForData(const QMimeDatabase* self, QByteArray* data) { - return new QMimeType(self->mimeTypeForData(*data)); +QMimeType* QMimeDatabase_MimeTypeForData(const QMimeDatabase* self, struct miqt_string data) { + QByteArray data_QByteArray(data.data, data.len); + return new QMimeType(self->mimeTypeForData(data_QByteArray)); } QMimeType* QMimeDatabase_MimeTypeForDataWithDevice(const QMimeDatabase* self, QIODevice* device) { @@ -56,22 +57,27 @@ QMimeType* QMimeDatabase_MimeTypeForUrl(const QMimeDatabase* self, QUrl* url) { return new QMimeType(self->mimeTypeForUrl(*url)); } -QMimeType* QMimeDatabase_MimeTypeForFileNameAndData(const QMimeDatabase* self, struct miqt_string* fileName, QIODevice* device) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +QMimeType* QMimeDatabase_MimeTypeForFileNameAndData(const QMimeDatabase* self, struct miqt_string fileName, QIODevice* device) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); return new QMimeType(self->mimeTypeForFileNameAndData(fileName_QString, device)); } -QMimeType* QMimeDatabase_MimeTypeForFileNameAndData2(const QMimeDatabase* self, struct miqt_string* fileName, QByteArray* data) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); - return new QMimeType(self->mimeTypeForFileNameAndData(fileName_QString, *data)); +QMimeType* QMimeDatabase_MimeTypeForFileNameAndData2(const QMimeDatabase* self, struct miqt_string fileName, struct miqt_string data) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); + QByteArray data_QByteArray(data.data, data.len); + return new QMimeType(self->mimeTypeForFileNameAndData(fileName_QString, data_QByteArray)); } -struct miqt_string* QMimeDatabase_SuffixForFileName(const QMimeDatabase* self, struct miqt_string* fileName) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +struct miqt_string QMimeDatabase_SuffixForFileName(const QMimeDatabase* self, struct miqt_string fileName) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); QString _ret = self->suffixForFileName(fileName_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } struct miqt_array* QMimeDatabase_AllMimeTypes(const QMimeDatabase* self) { @@ -87,8 +93,8 @@ struct miqt_array* QMimeDatabase_AllMimeTypes(const QMimeDatabase* self) { return _out; } -QMimeType* QMimeDatabase_MimeTypeForFile2(const QMimeDatabase* self, struct miqt_string* fileName, int mode) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +QMimeType* QMimeDatabase_MimeTypeForFile2(const QMimeDatabase* self, struct miqt_string fileName, int mode) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); return new QMimeType(self->mimeTypeForFile(fileName_QString, static_cast(mode))); } diff --git a/qt/gen_qmimedatabase.go b/qt/gen_qmimedatabase.go index 7fe751a4..f433ec41 100644 --- a/qt/gen_qmimedatabase.go +++ b/qt/gen_qmimedatabase.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -58,18 +57,22 @@ func NewQMimeDatabase() *QMimeDatabase { } func (this *QMimeDatabase) MimeTypeForName(nameOrAlias string) *QMimeType { - nameOrAlias_ms := libmiqt.Strdupg(nameOrAlias) - defer C.free(nameOrAlias_ms) - _ret := C.QMimeDatabase_MimeTypeForName(this.h, (*C.struct_miqt_string)(nameOrAlias_ms)) + nameOrAlias_ms := C.struct_miqt_string{} + nameOrAlias_ms.data = C.CString(nameOrAlias) + nameOrAlias_ms.len = C.size_t(len(nameOrAlias)) + defer C.free(unsafe.Pointer(nameOrAlias_ms.data)) + _ret := C.QMimeDatabase_MimeTypeForName(this.h, nameOrAlias_ms) _goptr := newQMimeType(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QMimeDatabase) MimeTypeForFile(fileName string) *QMimeType { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - _ret := C.QMimeDatabase_MimeTypeForFile(this.h, (*C.struct_miqt_string)(fileName_ms)) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + _ret := C.QMimeDatabase_MimeTypeForFile(this.h, fileName_ms) _goptr := newQMimeType(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -83,9 +86,11 @@ func (this *QMimeDatabase) MimeTypeForFileWithFileInfo(fileInfo *QFileInfo) *QMi } func (this *QMimeDatabase) MimeTypesForFileName(fileName string) []QMimeType { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - var _ma *C.struct_miqt_array = C.QMimeDatabase_MimeTypesForFileName(this.h, (*C.struct_miqt_string)(fileName_ms)) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + var _ma *C.struct_miqt_array = C.QMimeDatabase_MimeTypesForFileName(this.h, fileName_ms) _ret := make([]QMimeType, int(_ma.len)) _outCast := (*[0xffff]*C.QMimeType)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -98,8 +103,11 @@ func (this *QMimeDatabase) MimeTypesForFileName(fileName string) []QMimeType { return _ret } -func (this *QMimeDatabase) MimeTypeForData(data *QByteArray) *QMimeType { - _ret := C.QMimeDatabase_MimeTypeForData(this.h, data.cPointer()) +func (this *QMimeDatabase) MimeTypeForData(data []byte) *QMimeType { + data_alias := C.struct_miqt_string{} + data_alias.data = (*C.char)(unsafe.Pointer(&data[0])) + data_alias.len = C.size_t(len(data)) + _ret := C.QMimeDatabase_MimeTypeForData(this.h, data_alias) _goptr := newQMimeType(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -120,29 +128,38 @@ func (this *QMimeDatabase) MimeTypeForUrl(url *QUrl) *QMimeType { } func (this *QMimeDatabase) MimeTypeForFileNameAndData(fileName string, device *QIODevice) *QMimeType { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - _ret := C.QMimeDatabase_MimeTypeForFileNameAndData(this.h, (*C.struct_miqt_string)(fileName_ms), device.cPointer()) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + _ret := C.QMimeDatabase_MimeTypeForFileNameAndData(this.h, fileName_ms, device.cPointer()) _goptr := newQMimeType(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QMimeDatabase) MimeTypeForFileNameAndData2(fileName string, data *QByteArray) *QMimeType { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - _ret := C.QMimeDatabase_MimeTypeForFileNameAndData2(this.h, (*C.struct_miqt_string)(fileName_ms), data.cPointer()) +func (this *QMimeDatabase) MimeTypeForFileNameAndData2(fileName string, data []byte) *QMimeType { + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + data_alias := C.struct_miqt_string{} + data_alias.data = (*C.char)(unsafe.Pointer(&data[0])) + data_alias.len = C.size_t(len(data)) + _ret := C.QMimeDatabase_MimeTypeForFileNameAndData2(this.h, fileName_ms, data_alias) _goptr := newQMimeType(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QMimeDatabase) SuffixForFileName(fileName string) string { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - var _ms *C.struct_miqt_string = C.QMimeDatabase_SuffixForFileName(this.h, (*C.struct_miqt_string)(fileName_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + var _ms C.struct_miqt_string = C.QMimeDatabase_SuffixForFileName(this.h, fileName_ms) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -161,9 +178,11 @@ func (this *QMimeDatabase) AllMimeTypes() []QMimeType { } func (this *QMimeDatabase) MimeTypeForFile2(fileName string, mode QMimeDatabase__MatchMode) *QMimeType { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - _ret := C.QMimeDatabase_MimeTypeForFile2(this.h, (*C.struct_miqt_string)(fileName_ms), (C.int)(mode)) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + _ret := C.QMimeDatabase_MimeTypeForFile2(this.h, fileName_ms, (C.int)(mode)) _goptr := newQMimeType(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr diff --git a/qt/gen_qmimedatabase.h b/qt/gen_qmimedatabase.h index 97c85503..6624fac4 100644 --- a/qt/gen_qmimedatabase.h +++ b/qt/gen_qmimedatabase.h @@ -30,18 +30,18 @@ typedef struct QUrl QUrl; #endif QMimeDatabase* QMimeDatabase_new(); -QMimeType* QMimeDatabase_MimeTypeForName(const QMimeDatabase* self, struct miqt_string* nameOrAlias); -QMimeType* QMimeDatabase_MimeTypeForFile(const QMimeDatabase* self, struct miqt_string* fileName); +QMimeType* QMimeDatabase_MimeTypeForName(const QMimeDatabase* self, struct miqt_string nameOrAlias); +QMimeType* QMimeDatabase_MimeTypeForFile(const QMimeDatabase* self, struct miqt_string fileName); QMimeType* QMimeDatabase_MimeTypeForFileWithFileInfo(const QMimeDatabase* self, QFileInfo* fileInfo); -struct miqt_array* QMimeDatabase_MimeTypesForFileName(const QMimeDatabase* self, struct miqt_string* fileName); -QMimeType* QMimeDatabase_MimeTypeForData(const QMimeDatabase* self, QByteArray* data); +struct miqt_array* QMimeDatabase_MimeTypesForFileName(const QMimeDatabase* self, struct miqt_string fileName); +QMimeType* QMimeDatabase_MimeTypeForData(const QMimeDatabase* self, struct miqt_string data); QMimeType* QMimeDatabase_MimeTypeForDataWithDevice(const QMimeDatabase* self, QIODevice* device); QMimeType* QMimeDatabase_MimeTypeForUrl(const QMimeDatabase* self, QUrl* url); -QMimeType* QMimeDatabase_MimeTypeForFileNameAndData(const QMimeDatabase* self, struct miqt_string* fileName, QIODevice* device); -QMimeType* QMimeDatabase_MimeTypeForFileNameAndData2(const QMimeDatabase* self, struct miqt_string* fileName, QByteArray* data); -struct miqt_string* QMimeDatabase_SuffixForFileName(const QMimeDatabase* self, struct miqt_string* fileName); +QMimeType* QMimeDatabase_MimeTypeForFileNameAndData(const QMimeDatabase* self, struct miqt_string fileName, QIODevice* device); +QMimeType* QMimeDatabase_MimeTypeForFileNameAndData2(const QMimeDatabase* self, struct miqt_string fileName, struct miqt_string data); +struct miqt_string QMimeDatabase_SuffixForFileName(const QMimeDatabase* self, struct miqt_string fileName); struct miqt_array* QMimeDatabase_AllMimeTypes(const QMimeDatabase* self); -QMimeType* QMimeDatabase_MimeTypeForFile2(const QMimeDatabase* self, struct miqt_string* fileName, int mode); +QMimeType* QMimeDatabase_MimeTypeForFile2(const QMimeDatabase* self, struct miqt_string fileName, int mode); QMimeType* QMimeDatabase_MimeTypeForFile22(const QMimeDatabase* self, QFileInfo* fileInfo, int mode); void QMimeDatabase_Delete(QMimeDatabase* self); diff --git a/qt/gen_qmimetype.cpp b/qt/gen_qmimetype.cpp index 343848ce..ee883f82 100644 --- a/qt/gen_qmimetype.cpp +++ b/qt/gen_qmimetype.cpp @@ -39,43 +39,63 @@ bool QMimeType_IsDefault(const QMimeType* self) { return self->isDefault(); } -struct miqt_string* QMimeType_Name(const QMimeType* self) { +struct miqt_string QMimeType_Name(const QMimeType* self) { QString _ret = self->name(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QMimeType_Comment(const QMimeType* self) { +struct miqt_string QMimeType_Comment(const QMimeType* self) { QString _ret = self->comment(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QMimeType_GenericIconName(const QMimeType* self) { +struct miqt_string QMimeType_GenericIconName(const QMimeType* self) { QString _ret = self->genericIconName(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QMimeType_IconName(const QMimeType* self) { +struct miqt_string QMimeType_IconName(const QMimeType* self) { QString _ret = self->iconName(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } struct miqt_array* QMimeType_GlobPatterns(const QMimeType* self) { QStringList _ret = self->globPatterns(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -86,12 +106,16 @@ struct miqt_array* QMimeType_GlobPatterns(const QMimeType* self) { struct miqt_array* QMimeType_ParentMimeTypes(const QMimeType* self) { QStringList _ret = self->parentMimeTypes(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -102,12 +126,16 @@ struct miqt_array* QMimeType_ParentMimeTypes(const QMimeType* self) { struct miqt_array* QMimeType_AllAncestors(const QMimeType* self) { QStringList _ret = self->allAncestors(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -118,12 +146,16 @@ struct miqt_array* QMimeType_AllAncestors(const QMimeType* self) { struct miqt_array* QMimeType_Aliases(const QMimeType* self) { QStringList _ret = self->aliases(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -134,12 +166,16 @@ struct miqt_array* QMimeType_Aliases(const QMimeType* self) { struct miqt_array* QMimeType_Suffixes(const QMimeType* self) { QStringList _ret = self->suffixes(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -147,23 +183,31 @@ struct miqt_array* QMimeType_Suffixes(const QMimeType* self) { return _out; } -struct miqt_string* QMimeType_PreferredSuffix(const QMimeType* self) { +struct miqt_string QMimeType_PreferredSuffix(const QMimeType* self) { QString _ret = self->preferredSuffix(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -bool QMimeType_Inherits(const QMimeType* self, struct miqt_string* mimeTypeName) { - QString mimeTypeName_QString = QString::fromUtf8(&mimeTypeName->data, mimeTypeName->len); +bool QMimeType_Inherits(const QMimeType* self, struct miqt_string mimeTypeName) { + QString mimeTypeName_QString = QString::fromUtf8(mimeTypeName.data, mimeTypeName.len); return self->inherits(mimeTypeName_QString); } -struct miqt_string* QMimeType_FilterString(const QMimeType* self) { +struct miqt_string QMimeType_FilterString(const QMimeType* self) { QString _ret = self->filterString(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QMimeType_Delete(QMimeType* self) { diff --git a/qt/gen_qmimetype.go b/qt/gen_qmimetype.go index 178d0085..b82831fa 100644 --- a/qt/gen_qmimetype.go +++ b/qt/gen_qmimetype.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -80,41 +79,41 @@ func (this *QMimeType) IsDefault() bool { } func (this *QMimeType) Name() string { - var _ms *C.struct_miqt_string = C.QMimeType_Name(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMimeType_Name(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QMimeType) Comment() string { - var _ms *C.struct_miqt_string = C.QMimeType_Comment(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMimeType_Comment(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QMimeType) GenericIconName() string { - var _ms *C.struct_miqt_string = C.QMimeType_GenericIconName(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMimeType_GenericIconName(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QMimeType) IconName() string { - var _ms *C.struct_miqt_string = C.QMimeType_IconName(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMimeType_IconName(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QMimeType) GlobPatterns() []string { var _ma *C.struct_miqt_array = C.QMimeType_GlobPatterns(this.h) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -124,11 +123,11 @@ func (this *QMimeType) GlobPatterns() []string { func (this *QMimeType) ParentMimeTypes() []string { var _ma *C.struct_miqt_array = C.QMimeType_ParentMimeTypes(this.h) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -138,11 +137,11 @@ func (this *QMimeType) ParentMimeTypes() []string { func (this *QMimeType) AllAncestors() []string { var _ma *C.struct_miqt_array = C.QMimeType_AllAncestors(this.h) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -152,11 +151,11 @@ func (this *QMimeType) AllAncestors() []string { func (this *QMimeType) Aliases() []string { var _ma *C.struct_miqt_array = C.QMimeType_Aliases(this.h) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -166,11 +165,11 @@ func (this *QMimeType) Aliases() []string { func (this *QMimeType) Suffixes() []string { var _ma *C.struct_miqt_array = C.QMimeType_Suffixes(this.h) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -178,22 +177,24 @@ func (this *QMimeType) Suffixes() []string { } func (this *QMimeType) PreferredSuffix() string { - var _ms *C.struct_miqt_string = C.QMimeType_PreferredSuffix(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMimeType_PreferredSuffix(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QMimeType) Inherits(mimeTypeName string) bool { - mimeTypeName_ms := libmiqt.Strdupg(mimeTypeName) - defer C.free(mimeTypeName_ms) - return (bool)(C.QMimeType_Inherits(this.h, (*C.struct_miqt_string)(mimeTypeName_ms))) + mimeTypeName_ms := C.struct_miqt_string{} + mimeTypeName_ms.data = C.CString(mimeTypeName) + mimeTypeName_ms.len = C.size_t(len(mimeTypeName)) + defer C.free(unsafe.Pointer(mimeTypeName_ms.data)) + return (bool)(C.QMimeType_Inherits(this.h, mimeTypeName_ms)) } func (this *QMimeType) FilterString() string { - var _ms *C.struct_miqt_string = C.QMimeType_FilterString(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMimeType_FilterString(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qmimetype.h b/qt/gen_qmimetype.h index 5b4c7d9f..557272d7 100644 --- a/qt/gen_qmimetype.h +++ b/qt/gen_qmimetype.h @@ -27,18 +27,18 @@ bool QMimeType_OperatorEqual(const QMimeType* self, QMimeType* other); bool QMimeType_OperatorNotEqual(const QMimeType* self, QMimeType* other); bool QMimeType_IsValid(const QMimeType* self); bool QMimeType_IsDefault(const QMimeType* self); -struct miqt_string* QMimeType_Name(const QMimeType* self); -struct miqt_string* QMimeType_Comment(const QMimeType* self); -struct miqt_string* QMimeType_GenericIconName(const QMimeType* self); -struct miqt_string* QMimeType_IconName(const QMimeType* self); +struct miqt_string QMimeType_Name(const QMimeType* self); +struct miqt_string QMimeType_Comment(const QMimeType* self); +struct miqt_string QMimeType_GenericIconName(const QMimeType* self); +struct miqt_string QMimeType_IconName(const QMimeType* self); struct miqt_array* QMimeType_GlobPatterns(const QMimeType* self); struct miqt_array* QMimeType_ParentMimeTypes(const QMimeType* self); struct miqt_array* QMimeType_AllAncestors(const QMimeType* self); struct miqt_array* QMimeType_Aliases(const QMimeType* self); struct miqt_array* QMimeType_Suffixes(const QMimeType* self); -struct miqt_string* QMimeType_PreferredSuffix(const QMimeType* self); -bool QMimeType_Inherits(const QMimeType* self, struct miqt_string* mimeTypeName); -struct miqt_string* QMimeType_FilterString(const QMimeType* self); +struct miqt_string QMimeType_PreferredSuffix(const QMimeType* self); +bool QMimeType_Inherits(const QMimeType* self, struct miqt_string mimeTypeName); +struct miqt_string QMimeType_FilterString(const QMimeType* self); void QMimeType_Delete(QMimeType* self); #ifdef __cplusplus diff --git a/qt/gen_qmouseeventtransition.cpp b/qt/gen_qmouseeventtransition.cpp index 5500f9e8..f3f372dc 100644 --- a/qt/gen_qmouseeventtransition.cpp +++ b/qt/gen_qmouseeventtransition.cpp @@ -34,18 +34,26 @@ void* QMouseEventTransition_Metacast(QMouseEventTransition* self, const char* pa return self->qt_metacast(param1); } -struct miqt_string* QMouseEventTransition_Tr(const char* s) { +struct miqt_string QMouseEventTransition_Tr(const char* s) { QString _ret = QMouseEventTransition::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QMouseEventTransition_TrUtf8(const char* s) { +struct miqt_string QMouseEventTransition_TrUtf8(const char* s) { QString _ret = QMouseEventTransition::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QMouseEventTransition_Button(const QMouseEventTransition* self) { @@ -74,32 +82,48 @@ void QMouseEventTransition_SetHitTestPath(QMouseEventTransition* self, QPainterP self->setHitTestPath(*path); } -struct miqt_string* QMouseEventTransition_Tr2(const char* s, const char* c) { +struct miqt_string QMouseEventTransition_Tr2(const char* s, const char* c) { QString _ret = QMouseEventTransition::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QMouseEventTransition_Tr3(const char* s, const char* c, int n) { +struct miqt_string QMouseEventTransition_Tr3(const char* s, const char* c, int n) { QString _ret = QMouseEventTransition::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QMouseEventTransition_TrUtf82(const char* s, const char* c) { +struct miqt_string QMouseEventTransition_TrUtf82(const char* s, const char* c) { QString _ret = QMouseEventTransition::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QMouseEventTransition_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QMouseEventTransition_TrUtf83(const char* s, const char* c, int n) { QString _ret = QMouseEventTransition::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QMouseEventTransition_Delete(QMouseEventTransition* self) { diff --git a/qt/gen_qmouseeventtransition.go b/qt/gen_qmouseeventtransition.go index 1e524bef..574d34ca 100644 --- a/qt/gen_qmouseeventtransition.go +++ b/qt/gen_qmouseeventtransition.go @@ -74,24 +74,24 @@ func (this *QMouseEventTransition) MetaObject() *QMetaObject { func (this *QMouseEventTransition) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QMouseEventTransition_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QMouseEventTransition_Metacast(this.h, param1_Cstring)) } func QMouseEventTransition_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QMouseEventTransition_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMouseEventTransition_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QMouseEventTransition_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QMouseEventTransition_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMouseEventTransition_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -127,9 +127,9 @@ func QMouseEventTransition_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QMouseEventTransition_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMouseEventTransition_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -138,9 +138,9 @@ func QMouseEventTransition_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QMouseEventTransition_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMouseEventTransition_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -149,9 +149,9 @@ func QMouseEventTransition_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QMouseEventTransition_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMouseEventTransition_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -160,9 +160,9 @@ func QMouseEventTransition_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QMouseEventTransition_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMouseEventTransition_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qmouseeventtransition.h b/qt/gen_qmouseeventtransition.h index ec2927dc..d2421a2e 100644 --- a/qt/gen_qmouseeventtransition.h +++ b/qt/gen_qmouseeventtransition.h @@ -33,18 +33,18 @@ QMouseEventTransition* QMouseEventTransition_new3(QState* sourceState); QMouseEventTransition* QMouseEventTransition_new4(QObject* object, int typeVal, int button, QState* sourceState); QMetaObject* QMouseEventTransition_MetaObject(const QMouseEventTransition* self); void* QMouseEventTransition_Metacast(QMouseEventTransition* self, const char* param1); -struct miqt_string* QMouseEventTransition_Tr(const char* s); -struct miqt_string* QMouseEventTransition_TrUtf8(const char* s); +struct miqt_string QMouseEventTransition_Tr(const char* s); +struct miqt_string QMouseEventTransition_TrUtf8(const char* s); int QMouseEventTransition_Button(const QMouseEventTransition* self); void QMouseEventTransition_SetButton(QMouseEventTransition* self, int button); int QMouseEventTransition_ModifierMask(const QMouseEventTransition* self); void QMouseEventTransition_SetModifierMask(QMouseEventTransition* self, int modifiers); QPainterPath* QMouseEventTransition_HitTestPath(const QMouseEventTransition* self); void QMouseEventTransition_SetHitTestPath(QMouseEventTransition* self, QPainterPath* path); -struct miqt_string* QMouseEventTransition_Tr2(const char* s, const char* c); -struct miqt_string* QMouseEventTransition_Tr3(const char* s, const char* c, int n); -struct miqt_string* QMouseEventTransition_TrUtf82(const char* s, const char* c); -struct miqt_string* QMouseEventTransition_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QMouseEventTransition_Tr2(const char* s, const char* c); +struct miqt_string QMouseEventTransition_Tr3(const char* s, const char* c, int n); +struct miqt_string QMouseEventTransition_TrUtf82(const char* s, const char* c); +struct miqt_string QMouseEventTransition_TrUtf83(const char* s, const char* c, int n); void QMouseEventTransition_Delete(QMouseEventTransition* self); #ifdef __cplusplus diff --git a/qt/gen_qmovie.cpp b/qt/gen_qmovie.cpp index dd338d45..690de2f5 100644 --- a/qt/gen_qmovie.cpp +++ b/qt/gen_qmovie.cpp @@ -24,8 +24,8 @@ QMovie* QMovie_new2(QIODevice* device) { return new QMovie(device); } -QMovie* QMovie_new3(struct miqt_string* fileName) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +QMovie* QMovie_new3(struct miqt_string fileName) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); return new QMovie(fileName_QString); } @@ -33,22 +33,26 @@ QMovie* QMovie_new4(QObject* parent) { return new QMovie(parent); } -QMovie* QMovie_new5(QIODevice* device, QByteArray* format) { - return new QMovie(device, *format); +QMovie* QMovie_new5(QIODevice* device, struct miqt_string format) { + QByteArray format_QByteArray(format.data, format.len); + return new QMovie(device, format_QByteArray); } -QMovie* QMovie_new6(QIODevice* device, QByteArray* format, QObject* parent) { - return new QMovie(device, *format, parent); +QMovie* QMovie_new6(QIODevice* device, struct miqt_string format, QObject* parent) { + QByteArray format_QByteArray(format.data, format.len); + return new QMovie(device, format_QByteArray, parent); } -QMovie* QMovie_new7(struct miqt_string* fileName, QByteArray* format) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); - return new QMovie(fileName_QString, *format); +QMovie* QMovie_new7(struct miqt_string fileName, struct miqt_string format) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); + QByteArray format_QByteArray(format.data, format.len); + return new QMovie(fileName_QString, format_QByteArray); } -QMovie* QMovie_new8(struct miqt_string* fileName, QByteArray* format, QObject* parent) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); - return new QMovie(fileName_QString, *format, parent); +QMovie* QMovie_new8(struct miqt_string fileName, struct miqt_string format, QObject* parent) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); + QByteArray format_QByteArray(format.data, format.len); + return new QMovie(fileName_QString, format_QByteArray, parent); } QMetaObject* QMovie_MetaObject(const QMovie* self) { @@ -59,26 +63,39 @@ void* QMovie_Metacast(QMovie* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QMovie_Tr(const char* s) { +struct miqt_string QMovie_Tr(const char* s) { QString _ret = QMovie::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QMovie_TrUtf8(const char* s) { +struct miqt_string QMovie_TrUtf8(const char* s) { QString _ret = QMovie::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } struct miqt_array* QMovie_SupportedFormats() { QList _ret = QMovie::supportedFormats(); // Convert QList<> from C++ memory to manually-managed C memory - QByteArray** _arr = static_cast(malloc(sizeof(QByteArray*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { - _arr[i] = new QByteArray(_ret[i]); + QByteArray _lv_qb = _ret[i]; + struct miqt_string _lv_ms; + _lv_ms.len = _lv_qb.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_qb.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -94,24 +111,34 @@ QIODevice* QMovie_Device(const QMovie* self) { return self->device(); } -void QMovie_SetFileName(QMovie* self, struct miqt_string* fileName) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +void QMovie_SetFileName(QMovie* self, struct miqt_string fileName) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); self->setFileName(fileName_QString); } -struct miqt_string* QMovie_FileName(const QMovie* self) { +struct miqt_string QMovie_FileName(const QMovie* self) { QString _ret = self->fileName(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QMovie_SetFormat(QMovie* self, QByteArray* format) { - self->setFormat(*format); +void QMovie_SetFormat(QMovie* self, struct miqt_string format) { + QByteArray format_QByteArray(format.data, format.len); + self->setFormat(format_QByteArray); } -QByteArray* QMovie_Format(const QMovie* self) { - return new QByteArray(self->format()); +struct miqt_string QMovie_Format(const QMovie* self) { + QByteArray _qb = self->format(); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } void QMovie_SetBackgroundColor(QMovie* self, QColor* color) { @@ -148,11 +175,15 @@ int QMovie_LastError(const QMovie* self) { return static_cast(_ret); } -struct miqt_string* QMovie_LastErrorString(const QMovie* self) { +struct miqt_string QMovie_LastErrorString(const QMovie* self) { QString _ret = self->lastErrorString(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } bool QMovie_JumpToFrame(QMovie* self, int frameNumber) { @@ -297,32 +328,48 @@ void QMovie_SetSpeed(QMovie* self, int percentSpeed) { self->setSpeed(static_cast(percentSpeed)); } -struct miqt_string* QMovie_Tr2(const char* s, const char* c) { +struct miqt_string QMovie_Tr2(const char* s, const char* c) { QString _ret = QMovie::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QMovie_Tr3(const char* s, const char* c, int n) { +struct miqt_string QMovie_Tr3(const char* s, const char* c, int n) { QString _ret = QMovie::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QMovie_TrUtf82(const char* s, const char* c) { +struct miqt_string QMovie_TrUtf82(const char* s, const char* c) { QString _ret = QMovie::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QMovie_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QMovie_TrUtf83(const char* s, const char* c, int n) { QString _ret = QMovie::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QMovie_Delete(QMovie* self) { diff --git a/qt/gen_qmovie.go b/qt/gen_qmovie.go index ae8fdfb1..60847be8 100644 --- a/qt/gen_qmovie.go +++ b/qt/gen_qmovie.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "runtime/cgo" "unsafe" @@ -74,9 +73,11 @@ func NewQMovie2(device *QIODevice) *QMovie { // NewQMovie3 constructs a new QMovie object. func NewQMovie3(fileName string) *QMovie { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - ret := C.QMovie_new3((*C.struct_miqt_string)(fileName_ms)) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + ret := C.QMovie_new3(fileName_ms) return newQMovie(ret) } @@ -87,30 +88,46 @@ func NewQMovie4(parent *QObject) *QMovie { } // NewQMovie5 constructs a new QMovie object. -func NewQMovie5(device *QIODevice, format *QByteArray) *QMovie { - ret := C.QMovie_new5(device.cPointer(), format.cPointer()) +func NewQMovie5(device *QIODevice, format []byte) *QMovie { + format_alias := C.struct_miqt_string{} + format_alias.data = (*C.char)(unsafe.Pointer(&format[0])) + format_alias.len = C.size_t(len(format)) + ret := C.QMovie_new5(device.cPointer(), format_alias) return newQMovie(ret) } // NewQMovie6 constructs a new QMovie object. -func NewQMovie6(device *QIODevice, format *QByteArray, parent *QObject) *QMovie { - ret := C.QMovie_new6(device.cPointer(), format.cPointer(), parent.cPointer()) +func NewQMovie6(device *QIODevice, format []byte, parent *QObject) *QMovie { + format_alias := C.struct_miqt_string{} + format_alias.data = (*C.char)(unsafe.Pointer(&format[0])) + format_alias.len = C.size_t(len(format)) + ret := C.QMovie_new6(device.cPointer(), format_alias, parent.cPointer()) return newQMovie(ret) } // NewQMovie7 constructs a new QMovie object. -func NewQMovie7(fileName string, format *QByteArray) *QMovie { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - ret := C.QMovie_new7((*C.struct_miqt_string)(fileName_ms), format.cPointer()) +func NewQMovie7(fileName string, format []byte) *QMovie { + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + format_alias := C.struct_miqt_string{} + format_alias.data = (*C.char)(unsafe.Pointer(&format[0])) + format_alias.len = C.size_t(len(format)) + ret := C.QMovie_new7(fileName_ms, format_alias) return newQMovie(ret) } // NewQMovie8 constructs a new QMovie object. -func NewQMovie8(fileName string, format *QByteArray, parent *QObject) *QMovie { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - ret := C.QMovie_new8((*C.struct_miqt_string)(fileName_ms), format.cPointer(), parent.cPointer()) +func NewQMovie8(fileName string, format []byte, parent *QObject) *QMovie { + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + format_alias := C.struct_miqt_string{} + format_alias.data = (*C.char)(unsafe.Pointer(&format[0])) + format_alias.len = C.size_t(len(format)) + ret := C.QMovie_new8(fileName_ms, format_alias, parent.cPointer()) return newQMovie(ret) } @@ -121,36 +138,36 @@ func (this *QMovie) MetaObject() *QMetaObject { func (this *QMovie) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QMovie_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QMovie_Metacast(this.h, param1_Cstring)) } func QMovie_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QMovie_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMovie_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QMovie_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QMovie_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMovie_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } -func QMovie_SupportedFormats() []QByteArray { +func QMovie_SupportedFormats() [][]byte { var _ma *C.struct_miqt_array = C.QMovie_SupportedFormats() - _ret := make([]QByteArray, int(_ma.len)) - _outCast := (*[0xffff]*C.QByteArray)(unsafe.Pointer(_ma.data)) // hey ya + _ret := make([][]byte, int(_ma.len)) + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - _lv_ret := _outCast[i] - _lv_goptr := newQByteArray(_lv_ret) - _lv_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - _ret[i] = *_lv_goptr + var _lv_bytearray C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoBytes(unsafe.Pointer(_lv_bytearray.data), C.int(int64(_lv_bytearray.len))) + C.free(unsafe.Pointer(_lv_bytearray.data)) + _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) return _ret @@ -165,27 +182,32 @@ func (this *QMovie) Device() *QIODevice { } func (this *QMovie) SetFileName(fileName string) { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - C.QMovie_SetFileName(this.h, (*C.struct_miqt_string)(fileName_ms)) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + C.QMovie_SetFileName(this.h, fileName_ms) } func (this *QMovie) FileName() string { - var _ms *C.struct_miqt_string = C.QMovie_FileName(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMovie_FileName(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } -func (this *QMovie) SetFormat(format *QByteArray) { - C.QMovie_SetFormat(this.h, format.cPointer()) +func (this *QMovie) SetFormat(format []byte) { + format_alias := C.struct_miqt_string{} + format_alias.data = (*C.char)(unsafe.Pointer(&format[0])) + format_alias.len = C.size_t(len(format)) + C.QMovie_SetFormat(this.h, format_alias) } -func (this *QMovie) Format() *QByteArray { - _ret := C.QMovie_Format(this.h) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QMovie) Format() []byte { + var _bytearray C.struct_miqt_string = C.QMovie_Format(this.h) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } func (this *QMovie) SetBackgroundColor(color *QColor) { @@ -233,9 +255,9 @@ func (this *QMovie) LastError() QImageReader__ImageReaderError { } func (this *QMovie) LastErrorString() string { - var _ms *C.struct_miqt_string = C.QMovie_LastErrorString(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMovie_LastErrorString(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -441,9 +463,9 @@ func QMovie_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QMovie_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMovie_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -452,9 +474,9 @@ func QMovie_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QMovie_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMovie_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -463,9 +485,9 @@ func QMovie_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QMovie_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMovie_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -474,9 +496,9 @@ func QMovie_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QMovie_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMovie_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qmovie.h b/qt/gen_qmovie.h index 87121879..d48ecf24 100644 --- a/qt/gen_qmovie.h +++ b/qt/gen_qmovie.h @@ -39,23 +39,23 @@ typedef struct QSize QSize; QMovie* QMovie_new(); QMovie* QMovie_new2(QIODevice* device); -QMovie* QMovie_new3(struct miqt_string* fileName); +QMovie* QMovie_new3(struct miqt_string fileName); QMovie* QMovie_new4(QObject* parent); -QMovie* QMovie_new5(QIODevice* device, QByteArray* format); -QMovie* QMovie_new6(QIODevice* device, QByteArray* format, QObject* parent); -QMovie* QMovie_new7(struct miqt_string* fileName, QByteArray* format); -QMovie* QMovie_new8(struct miqt_string* fileName, QByteArray* format, QObject* parent); +QMovie* QMovie_new5(QIODevice* device, struct miqt_string format); +QMovie* QMovie_new6(QIODevice* device, struct miqt_string format, QObject* parent); +QMovie* QMovie_new7(struct miqt_string fileName, struct miqt_string format); +QMovie* QMovie_new8(struct miqt_string fileName, struct miqt_string format, QObject* parent); QMetaObject* QMovie_MetaObject(const QMovie* self); void* QMovie_Metacast(QMovie* self, const char* param1); -struct miqt_string* QMovie_Tr(const char* s); -struct miqt_string* QMovie_TrUtf8(const char* s); +struct miqt_string QMovie_Tr(const char* s); +struct miqt_string QMovie_TrUtf8(const char* s); struct miqt_array* QMovie_SupportedFormats(); void QMovie_SetDevice(QMovie* self, QIODevice* device); QIODevice* QMovie_Device(const QMovie* self); -void QMovie_SetFileName(QMovie* self, struct miqt_string* fileName); -struct miqt_string* QMovie_FileName(const QMovie* self); -void QMovie_SetFormat(QMovie* self, QByteArray* format); -QByteArray* QMovie_Format(const QMovie* self); +void QMovie_SetFileName(QMovie* self, struct miqt_string fileName); +struct miqt_string QMovie_FileName(const QMovie* self); +void QMovie_SetFormat(QMovie* self, struct miqt_string format); +struct miqt_string QMovie_Format(const QMovie* self); void QMovie_SetBackgroundColor(QMovie* self, QColor* color); QColor* QMovie_BackgroundColor(const QMovie* self); int QMovie_State(const QMovie* self); @@ -64,7 +64,7 @@ QImage* QMovie_CurrentImage(const QMovie* self); QPixmap* QMovie_CurrentPixmap(const QMovie* self); bool QMovie_IsValid(const QMovie* self); int QMovie_LastError(const QMovie* self); -struct miqt_string* QMovie_LastErrorString(const QMovie* self); +struct miqt_string QMovie_LastErrorString(const QMovie* self); bool QMovie_JumpToFrame(QMovie* self, int frameNumber); int QMovie_LoopCount(const QMovie* self); int QMovie_FrameCount(const QMovie* self); @@ -94,10 +94,10 @@ bool QMovie_JumpToNextFrame(QMovie* self); void QMovie_SetPaused(QMovie* self, bool paused); void QMovie_Stop(QMovie* self); void QMovie_SetSpeed(QMovie* self, int percentSpeed); -struct miqt_string* QMovie_Tr2(const char* s, const char* c); -struct miqt_string* QMovie_Tr3(const char* s, const char* c, int n); -struct miqt_string* QMovie_TrUtf82(const char* s, const char* c); -struct miqt_string* QMovie_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QMovie_Tr2(const char* s, const char* c); +struct miqt_string QMovie_Tr3(const char* s, const char* c, int n); +struct miqt_string QMovie_TrUtf82(const char* s, const char* c); +struct miqt_string QMovie_TrUtf83(const char* s, const char* c, int n); void QMovie_Delete(QMovie* self); #ifdef __cplusplus diff --git a/qt/gen_qnamespace.go b/qt/gen_qnamespace.go index f839b64c..4e12eb82 100644 --- a/qt/gen_qnamespace.go +++ b/qt/gen_qnamespace.go @@ -218,44 +218,44 @@ const ( type WindowType int const ( - WindowType__Widget WindowType = 0 - WindowType__Window WindowType = 1 - WindowType__Dialog WindowType = 3 - WindowType__Sheet WindowType = 5 - WindowType__Drawer WindowType = 7 - WindowType__Popup WindowType = 9 - WindowType__Tool WindowType = 11 - WindowType__ToolTip WindowType = 13 - WindowType__SplashScreen WindowType = 15 - WindowType__Desktop WindowType = 17 - WindowType__SubWindow WindowType = 18 - WindowType__ForeignWindow WindowType = 33 - WindowType__CoverWindow WindowType = 65 - WindowType__WindowType_Mask WindowType = 255 - WindowType__MSWindowsFixedSizeDialogHint WindowType = 256 - WindowType__MSWindowsOwnDC WindowType = 512 - WindowType__BypassWindowManagerHint WindowType = 1024 - WindowType__X11BypassWindowManagerHint WindowType = 1024 - WindowType__FramelessWindowHint WindowType = 2048 - WindowType__WindowTitleHint WindowType = 4096 - WindowType__WindowSystemMenuHint WindowType = 8192 - WindowType__WindowMinimizeButtonHint WindowType = 16384 - WindowType__WindowMaximizeButtonHint WindowType = 32768 - WindowType__WindowMinMaxButtonsHint WindowType = 49152 - WindowType__WindowContextHelpButtonHint WindowType = 65536 - WindowType__WindowShadeButtonHint WindowType = 131072 - WindowType__WindowStaysOnTopHint WindowType = 262144 - WindowType__WindowTransparentForInput WindowType = 524288 - WindowType__WindowOverridesSystemGestures WindowType = 1048576 - WindowType__WindowDoesNotAcceptFocus WindowType = 2097152 - WindowType__MaximizeUsingFullscreenGeometryHint WindowType = 4194304 - WindowType__CustomizeWindowHint WindowType = 33554432 - WindowType__WindowStaysOnBottomHint WindowType = 67108864 - WindowType__WindowCloseButtonHint WindowType = 134217728 - WindowType__MacWindowToolBarButtonHint WindowType = 268435456 - WindowType__BypassGraphicsProxyWidget WindowType = 536870912 - WindowType__NoDropShadowWindowHint WindowType = 1073741824 - WindowType__WindowFullscreenButtonHint WindowType = 2147483648 + Widget WindowType = 0 + Window WindowType = 1 + Dialog WindowType = 3 + Sheet WindowType = 5 + Drawer WindowType = 7 + Popup WindowType = 9 + Tool WindowType = 11 + ToolTip WindowType = 13 + SplashScreen WindowType = 15 + Desktop WindowType = 17 + SubWindow WindowType = 18 + ForeignWindow WindowType = 33 + CoverWindow WindowType = 65 + WindowType_Mask WindowType = 255 + MSWindowsFixedSizeDialogHint WindowType = 256 + MSWindowsOwnDC WindowType = 512 + BypassWindowManagerHint WindowType = 1024 + X11BypassWindowManagerHint WindowType = 1024 + FramelessWindowHint WindowType = 2048 + WindowTitleHint WindowType = 4096 + WindowSystemMenuHint WindowType = 8192 + WindowMinimizeButtonHint WindowType = 16384 + WindowMaximizeButtonHint WindowType = 32768 + WindowMinMaxButtonsHint WindowType = 49152 + WindowContextHelpButtonHint WindowType = 65536 + WindowShadeButtonHint WindowType = 131072 + WindowStaysOnTopHint WindowType = 262144 + WindowTransparentForInput WindowType = 524288 + WindowOverridesSystemGestures WindowType = 1048576 + WindowDoesNotAcceptFocus WindowType = 2097152 + MaximizeUsingFullscreenGeometryHint WindowType = 4194304 + CustomizeWindowHint WindowType = 33554432 + WindowStaysOnBottomHint WindowType = 67108864 + WindowCloseButtonHint WindowType = 134217728 + MacWindowToolBarButtonHint WindowType = 268435456 + BypassGraphicsProxyWidget WindowType = 536870912 + NoDropShadowWindowHint WindowType = 1073741824 + WindowFullscreenButtonHint WindowType = 2147483648 ) type WindowState int @@ -1662,18 +1662,18 @@ const ( type QInternal__PaintDeviceFlags int const ( - QInternal__PaintDeviceFlags__UnknownDevice QInternal__PaintDeviceFlags = 0 - QInternal__PaintDeviceFlags__Widget QInternal__PaintDeviceFlags = 1 - QInternal__PaintDeviceFlags__Pixmap QInternal__PaintDeviceFlags = 2 - QInternal__PaintDeviceFlags__Image QInternal__PaintDeviceFlags = 3 - QInternal__PaintDeviceFlags__Printer QInternal__PaintDeviceFlags = 4 - QInternal__PaintDeviceFlags__Picture QInternal__PaintDeviceFlags = 5 - QInternal__PaintDeviceFlags__Pbuffer QInternal__PaintDeviceFlags = 6 - QInternal__PaintDeviceFlags__FramebufferObject QInternal__PaintDeviceFlags = 7 - QInternal__PaintDeviceFlags__CustomRaster QInternal__PaintDeviceFlags = 8 - QInternal__PaintDeviceFlags__MacQuartz QInternal__PaintDeviceFlags = 9 - QInternal__PaintDeviceFlags__PaintBuffer QInternal__PaintDeviceFlags = 10 - QInternal__PaintDeviceFlags__OpenGL QInternal__PaintDeviceFlags = 11 + QInternal__UnknownDevice QInternal__PaintDeviceFlags = 0 + QInternal__Widget QInternal__PaintDeviceFlags = 1 + QInternal__Pixmap QInternal__PaintDeviceFlags = 2 + QInternal__Image QInternal__PaintDeviceFlags = 3 + QInternal__Printer QInternal__PaintDeviceFlags = 4 + QInternal__Picture QInternal__PaintDeviceFlags = 5 + QInternal__Pbuffer QInternal__PaintDeviceFlags = 6 + QInternal__FramebufferObject QInternal__PaintDeviceFlags = 7 + QInternal__CustomRaster QInternal__PaintDeviceFlags = 8 + QInternal__MacQuartz QInternal__PaintDeviceFlags = 9 + QInternal__PaintBuffer QInternal__PaintDeviceFlags = 10 + QInternal__OpenGL QInternal__PaintDeviceFlags = 11 ) type QInternal__RelayoutType int diff --git a/qt/gen_qobject.cpp b/qt/gen_qobject.cpp index 55654075..77c88cb3 100644 --- a/qt/gen_qobject.cpp +++ b/qt/gen_qobject.cpp @@ -41,18 +41,26 @@ void* QObject_Metacast(QObject* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QObject_Tr(const char* s) { +struct miqt_string QObject_Tr(const char* s) { QString _ret = QObject::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QObject_TrUtf8(const char* s) { +struct miqt_string QObject_TrUtf8(const char* s) { QString _ret = QObject::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } bool QObject_Event(QObject* self, QEvent* event) { @@ -63,15 +71,19 @@ bool QObject_EventFilter(QObject* self, QObject* watched, QEvent* event) { return self->eventFilter(watched, event); } -struct miqt_string* QObject_ObjectName(const QObject* self) { +struct miqt_string QObject_ObjectName(const QObject* self) { QString _ret = self->objectName(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QObject_SetObjectName(QObject* self, struct miqt_string* name) { - QString name_QString = QString::fromUtf8(&name->data, name->len); +void QObject_SetObjectName(QObject* self, struct miqt_string name) { + QString name_QString = QString::fromUtf8(name.data, name.len); self->setObjectName(name_QString); } @@ -175,9 +187,14 @@ QVariant* QObject_Property(const QObject* self, const char* name) { struct miqt_array* QObject_DynamicPropertyNames(const QObject* self) { QList _ret = self->dynamicPropertyNames(); // Convert QList<> from C++ memory to manually-managed C memory - QByteArray** _arr = static_cast(malloc(sizeof(QByteArray*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { - _arr[i] = new QByteArray(_ret[i]); + QByteArray _lv_qb = _ret[i]; + struct miqt_string _lv_ms; + _lv_ms.len = _lv_qb.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_qb.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -220,32 +237,48 @@ void QObject_DeleteLater(QObject* self) { self->deleteLater(); } -struct miqt_string* QObject_Tr2(const char* s, const char* c) { +struct miqt_string QObject_Tr2(const char* s, const char* c) { QString _ret = QObject::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QObject_Tr3(const char* s, const char* c, int n) { +struct miqt_string QObject_Tr3(const char* s, const char* c, int n) { QString _ret = QObject::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QObject_TrUtf82(const char* s, const char* c) { +struct miqt_string QObject_TrUtf82(const char* s, const char* c) { QString _ret = QObject::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QObject_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QObject_TrUtf83(const char* s, const char* c, int n) { QString _ret = QObject::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QObject_StartTimer2(QObject* self, int interval, int timerType) { diff --git a/qt/gen_qobject.go b/qt/gen_qobject.go index 4e9d9b1a..3070493c 100644 --- a/qt/gen_qobject.go +++ b/qt/gen_qobject.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "runtime/cgo" "unsafe" @@ -116,24 +115,24 @@ func (this *QObject) MetaObject() *QMetaObject { func (this *QObject) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QObject_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QObject_Metacast(this.h, param1_Cstring)) } func QObject_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QObject_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QObject_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QObject_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QObject_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QObject_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -146,16 +145,18 @@ func (this *QObject) EventFilter(watched *QObject, event *QEvent) bool { } func (this *QObject) ObjectName() string { - var _ms *C.struct_miqt_string = C.QObject_ObjectName(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QObject_ObjectName(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QObject) SetObjectName(name string) { - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - C.QObject_SetObjectName(this.h, (*C.struct_miqt_string)(name_ms)) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + C.QObject_SetObjectName(this.h, name_ms) } func (this *QObject) IsWidgetType() bool { @@ -270,15 +271,15 @@ func (this *QObject) Property(name string) *QVariant { return _goptr } -func (this *QObject) DynamicPropertyNames() []QByteArray { +func (this *QObject) DynamicPropertyNames() [][]byte { var _ma *C.struct_miqt_array = C.QObject_DynamicPropertyNames(this.h) - _ret := make([]QByteArray, int(_ma.len)) - _outCast := (*[0xffff]*C.QByteArray)(unsafe.Pointer(_ma.data)) // hey ya + _ret := make([][]byte, int(_ma.len)) + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - _lv_ret := _outCast[i] - _lv_goptr := newQByteArray(_lv_ret) - _lv_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - _ret[i] = *_lv_goptr + var _lv_bytearray C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoBytes(unsafe.Pointer(_lv_bytearray.data), C.int(int64(_lv_bytearray.len))) + C.free(unsafe.Pointer(_lv_bytearray.data)) + _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) return _ret @@ -332,9 +333,9 @@ func QObject_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QObject_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QObject_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -343,9 +344,9 @@ func QObject_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QObject_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QObject_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -354,9 +355,9 @@ func QObject_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QObject_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QObject_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -365,9 +366,9 @@ func QObject_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QObject_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QObject_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qobject.h b/qt/gen_qobject.h index 31b1fdec..25fd2d90 100644 --- a/qt/gen_qobject.h +++ b/qt/gen_qobject.h @@ -50,12 +50,12 @@ QObject* QObject_new(); QObject* QObject_new2(QObject* parent); QMetaObject* QObject_MetaObject(const QObject* self); void* QObject_Metacast(QObject* self, const char* param1); -struct miqt_string* QObject_Tr(const char* s); -struct miqt_string* QObject_TrUtf8(const char* s); +struct miqt_string QObject_Tr(const char* s); +struct miqt_string QObject_TrUtf8(const char* s); bool QObject_Event(QObject* self, QEvent* event); bool QObject_EventFilter(QObject* self, QObject* watched, QEvent* event); -struct miqt_string* QObject_ObjectName(const QObject* self); -void QObject_SetObjectName(QObject* self, struct miqt_string* name); +struct miqt_string QObject_ObjectName(const QObject* self); +void QObject_SetObjectName(QObject* self, struct miqt_string name); bool QObject_IsWidgetType(const QObject* self); bool QObject_IsWindowType(const QObject* self); bool QObject_SignalsBlocked(const QObject* self); @@ -87,10 +87,10 @@ void QObject_connect_Destroyed(QObject* self, intptr_t slot); QObject* QObject_Parent(const QObject* self); bool QObject_Inherits(const QObject* self, const char* classname); void QObject_DeleteLater(QObject* self); -struct miqt_string* QObject_Tr2(const char* s, const char* c); -struct miqt_string* QObject_Tr3(const char* s, const char* c, int n); -struct miqt_string* QObject_TrUtf82(const char* s, const char* c); -struct miqt_string* QObject_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QObject_Tr2(const char* s, const char* c); +struct miqt_string QObject_Tr3(const char* s, const char* c, int n); +struct miqt_string QObject_TrUtf82(const char* s, const char* c); +struct miqt_string QObject_TrUtf83(const char* s, const char* c, int n); int QObject_StartTimer2(QObject* self, int interval, int timerType); QMetaObject__Connection* QObject_Connect5(QObject* sender, QMetaMethod* signal, QObject* receiver, QMetaMethod* method, int typeVal); QMetaObject__Connection* QObject_Connect4(const QObject* self, QObject* sender, const char* signal, const char* member, int typeVal); diff --git a/qt/gen_qobjectcleanuphandler.cpp b/qt/gen_qobjectcleanuphandler.cpp index f557f08c..b8f55f44 100644 --- a/qt/gen_qobjectcleanuphandler.cpp +++ b/qt/gen_qobjectcleanuphandler.cpp @@ -20,18 +20,26 @@ void* QObjectCleanupHandler_Metacast(QObjectCleanupHandler* self, const char* pa return self->qt_metacast(param1); } -struct miqt_string* QObjectCleanupHandler_Tr(const char* s) { +struct miqt_string QObjectCleanupHandler_Tr(const char* s) { QString _ret = QObjectCleanupHandler::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QObjectCleanupHandler_TrUtf8(const char* s) { +struct miqt_string QObjectCleanupHandler_TrUtf8(const char* s) { QString _ret = QObjectCleanupHandler::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QObject* QObjectCleanupHandler_Add(QObjectCleanupHandler* self, QObject* object) { @@ -50,32 +58,48 @@ void QObjectCleanupHandler_Clear(QObjectCleanupHandler* self) { self->clear(); } -struct miqt_string* QObjectCleanupHandler_Tr2(const char* s, const char* c) { +struct miqt_string QObjectCleanupHandler_Tr2(const char* s, const char* c) { QString _ret = QObjectCleanupHandler::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QObjectCleanupHandler_Tr3(const char* s, const char* c, int n) { +struct miqt_string QObjectCleanupHandler_Tr3(const char* s, const char* c, int n) { QString _ret = QObjectCleanupHandler::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QObjectCleanupHandler_TrUtf82(const char* s, const char* c) { +struct miqt_string QObjectCleanupHandler_TrUtf82(const char* s, const char* c) { QString _ret = QObjectCleanupHandler::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QObjectCleanupHandler_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QObjectCleanupHandler_TrUtf83(const char* s, const char* c, int n) { QString _ret = QObjectCleanupHandler::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QObjectCleanupHandler_Delete(QObjectCleanupHandler* self) { diff --git a/qt/gen_qobjectcleanuphandler.go b/qt/gen_qobjectcleanuphandler.go index 9a78ea99..97ed3305 100644 --- a/qt/gen_qobjectcleanuphandler.go +++ b/qt/gen_qobjectcleanuphandler.go @@ -56,24 +56,24 @@ func (this *QObjectCleanupHandler) MetaObject() *QMetaObject { func (this *QObjectCleanupHandler) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QObjectCleanupHandler_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QObjectCleanupHandler_Metacast(this.h, param1_Cstring)) } func QObjectCleanupHandler_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QObjectCleanupHandler_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QObjectCleanupHandler_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QObjectCleanupHandler_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QObjectCleanupHandler_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QObjectCleanupHandler_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -98,9 +98,9 @@ func QObjectCleanupHandler_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QObjectCleanupHandler_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QObjectCleanupHandler_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -109,9 +109,9 @@ func QObjectCleanupHandler_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QObjectCleanupHandler_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QObjectCleanupHandler_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -120,9 +120,9 @@ func QObjectCleanupHandler_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QObjectCleanupHandler_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QObjectCleanupHandler_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -131,9 +131,9 @@ func QObjectCleanupHandler_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QObjectCleanupHandler_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QObjectCleanupHandler_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qobjectcleanuphandler.h b/qt/gen_qobjectcleanuphandler.h index 22853418..4bae73c6 100644 --- a/qt/gen_qobjectcleanuphandler.h +++ b/qt/gen_qobjectcleanuphandler.h @@ -26,16 +26,16 @@ typedef struct QObjectCleanupHandler QObjectCleanupHandler; QObjectCleanupHandler* QObjectCleanupHandler_new(); QMetaObject* QObjectCleanupHandler_MetaObject(const QObjectCleanupHandler* self); void* QObjectCleanupHandler_Metacast(QObjectCleanupHandler* self, const char* param1); -struct miqt_string* QObjectCleanupHandler_Tr(const char* s); -struct miqt_string* QObjectCleanupHandler_TrUtf8(const char* s); +struct miqt_string QObjectCleanupHandler_Tr(const char* s); +struct miqt_string QObjectCleanupHandler_TrUtf8(const char* s); QObject* QObjectCleanupHandler_Add(QObjectCleanupHandler* self, QObject* object); void QObjectCleanupHandler_Remove(QObjectCleanupHandler* self, QObject* object); bool QObjectCleanupHandler_IsEmpty(const QObjectCleanupHandler* self); void QObjectCleanupHandler_Clear(QObjectCleanupHandler* self); -struct miqt_string* QObjectCleanupHandler_Tr2(const char* s, const char* c); -struct miqt_string* QObjectCleanupHandler_Tr3(const char* s, const char* c, int n); -struct miqt_string* QObjectCleanupHandler_TrUtf82(const char* s, const char* c); -struct miqt_string* QObjectCleanupHandler_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QObjectCleanupHandler_Tr2(const char* s, const char* c); +struct miqt_string QObjectCleanupHandler_Tr3(const char* s, const char* c, int n); +struct miqt_string QObjectCleanupHandler_TrUtf82(const char* s, const char* c); +struct miqt_string QObjectCleanupHandler_TrUtf83(const char* s, const char* c, int n); void QObjectCleanupHandler_Delete(QObjectCleanupHandler* self); #ifdef __cplusplus diff --git a/qt/gen_qobjectdefs.cpp b/qt/gen_qobjectdefs.cpp index a27ca360..7ee8aecb 100644 --- a/qt/gen_qobjectdefs.cpp +++ b/qt/gen_qobjectdefs.cpp @@ -92,11 +92,15 @@ QObject* QMetaObject_CastWithObj(const QMetaObject* self, QObject* obj) { return (QObject*) self->cast(obj); } -struct miqt_string* QMetaObject_Tr(const QMetaObject* self, const char* s, const char* c) { +struct miqt_string QMetaObject_Tr(const QMetaObject* self, const char* s, const char* c) { QString _ret = self->tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QMetaObject_MethodOffset(const QMetaObject* self) { @@ -195,12 +199,22 @@ bool QMetaObject_CheckConnectArgs2(QMetaMethod* signal, QMetaMethod* method) { return QMetaObject::checkConnectArgs(*signal, *method); } -QByteArray* QMetaObject_NormalizedSignature(const char* method) { - return new QByteArray(QMetaObject::normalizedSignature(method)); +struct miqt_string QMetaObject_NormalizedSignature(const char* method) { + QByteArray _qb = QMetaObject::normalizedSignature(method); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } -QByteArray* QMetaObject_NormalizedType(const char* typeVal) { - return new QByteArray(QMetaObject::normalizedType(typeVal)); +struct miqt_string QMetaObject_NormalizedType(const char* typeVal) { + QByteArray _qb = QMetaObject::normalizedType(typeVal); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } QMetaObject__Connection* QMetaObject_Connect(QObject* sender, int signal_index, QObject* receiver, int method_index) { @@ -239,11 +253,15 @@ QObject* QMetaObject_NewInstance(const QMetaObject* self) { return self->newInstance(); } -struct miqt_string* QMetaObject_Tr3(const QMetaObject* self, const char* s, const char* c, int n) { +struct miqt_string QMetaObject_Tr3(const QMetaObject* self, const char* s, const char* c, int n) { QString _ret = self->tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QMetaObject__Connection* QMetaObject_Connect5(QObject* sender, int signal_index, QObject* receiver, int method_index, int typeVal) { diff --git a/qt/gen_qobjectdefs.go b/qt/gen_qobjectdefs.go index ca6a1c2b..1610a94f 100644 --- a/qt/gen_qobjectdefs.go +++ b/qt/gen_qobjectdefs.go @@ -89,12 +89,12 @@ func NewQGenericArgument4(aName string, aData unsafe.Pointer) *QGenericArgument } func (this *QGenericArgument) Data() unsafe.Pointer { - return C.QGenericArgument_Data(this.h) + return (unsafe.Pointer)(C.QGenericArgument_Data(this.h)) } -func (this *QGenericArgument) Name() unsafe.Pointer { +func (this *QGenericArgument) Name() string { _ret := C.QGenericArgument_Name(this.h) - return (unsafe.Pointer)(_ret) + return C.GoString(_ret) } // Delete this object from C++ memory. @@ -224,9 +224,9 @@ func NewQMetaObject2(param1 *QMetaObject) *QMetaObject { return newQMetaObject(ret) } -func (this *QMetaObject) ClassName() unsafe.Pointer { +func (this *QMetaObject) ClassName() string { _ret := C.QMetaObject_ClassName(this.h) - return (unsafe.Pointer)(_ret) + return C.GoString(_ret) } func (this *QMetaObject) SuperClass() *QMetaObject { @@ -250,9 +250,9 @@ func (this *QMetaObject) Tr(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QMetaObject_Tr(this.h, s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMetaObject_Tr(this.h, s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -388,22 +388,22 @@ func QMetaObject_CheckConnectArgs2(signal *QMetaMethod, method *QMetaMethod) boo return (bool)(C.QMetaObject_CheckConnectArgs2(signal.cPointer(), method.cPointer())) } -func QMetaObject_NormalizedSignature(method string) *QByteArray { +func QMetaObject_NormalizedSignature(method string) []byte { method_Cstring := C.CString(method) defer C.free(unsafe.Pointer(method_Cstring)) - _ret := C.QMetaObject_NormalizedSignature(method_Cstring) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr + var _bytearray C.struct_miqt_string = C.QMetaObject_NormalizedSignature(method_Cstring) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } -func QMetaObject_NormalizedType(typeVal string) *QByteArray { +func QMetaObject_NormalizedType(typeVal string) []byte { typeVal_Cstring := C.CString(typeVal) defer C.free(unsafe.Pointer(typeVal_Cstring)) - _ret := C.QMetaObject_NormalizedType(typeVal_Cstring) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr + var _bytearray C.struct_miqt_string = C.QMetaObject_NormalizedType(typeVal_Cstring) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } func QMetaObject_Connect(sender *QObject, signal_index int, receiver *QObject, method_index int) *QMetaObject__Connection { @@ -458,9 +458,9 @@ func (this *QMetaObject) Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QMetaObject_Tr3(this.h, s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QMetaObject_Tr3(this.h, s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qobjectdefs.h b/qt/gen_qobjectdefs.h index 4c01bee7..f9935002 100644 --- a/qt/gen_qobjectdefs.h +++ b/qt/gen_qobjectdefs.h @@ -68,7 +68,7 @@ QMetaObject* QMetaObject_SuperClass(const QMetaObject* self); bool QMetaObject_Inherits(const QMetaObject* self, QMetaObject* metaObject); QObject* QMetaObject_Cast(const QMetaObject* self, QObject* obj); QObject* QMetaObject_CastWithObj(const QMetaObject* self, QObject* obj); -struct miqt_string* QMetaObject_Tr(const QMetaObject* self, const char* s, const char* c); +struct miqt_string QMetaObject_Tr(const QMetaObject* self, const char* s, const char* c); int QMetaObject_MethodOffset(const QMetaObject* self); int QMetaObject_EnumeratorOffset(const QMetaObject* self); int QMetaObject_PropertyOffset(const QMetaObject* self); @@ -93,8 +93,8 @@ QMetaClassInfo* QMetaObject_ClassInfo(const QMetaObject* self, int index); QMetaProperty* QMetaObject_UserProperty(const QMetaObject* self); bool QMetaObject_CheckConnectArgs(const char* signal, const char* method); bool QMetaObject_CheckConnectArgs2(QMetaMethod* signal, QMetaMethod* method); -QByteArray* QMetaObject_NormalizedSignature(const char* method); -QByteArray* QMetaObject_NormalizedType(const char* typeVal); +struct miqt_string QMetaObject_NormalizedSignature(const char* method); +struct miqt_string QMetaObject_NormalizedType(const char* typeVal); QMetaObject__Connection* QMetaObject_Connect(QObject* sender, int signal_index, QObject* receiver, int method_index); bool QMetaObject_Disconnect(QObject* sender, int signal_index, QObject* receiver, int method_index); bool QMetaObject_DisconnectOne(QObject* sender, int signal_index, QObject* receiver, int method_index); @@ -104,7 +104,7 @@ bool QMetaObject_InvokeMethod2(QObject* obj, const char* member, QGenericReturnA bool QMetaObject_InvokeMethod3(QObject* obj, const char* member, int typeVal); bool QMetaObject_InvokeMethod4(QObject* obj, const char* member); QObject* QMetaObject_NewInstance(const QMetaObject* self); -struct miqt_string* QMetaObject_Tr3(const QMetaObject* self, const char* s, const char* c, int n); +struct miqt_string QMetaObject_Tr3(const QMetaObject* self, const char* s, const char* c, int n); QMetaObject__Connection* QMetaObject_Connect5(QObject* sender, int signal_index, QObject* receiver, int method_index, int typeVal); QMetaObject__Connection* QMetaObject_Connect6(QObject* sender, int signal_index, QObject* receiver, int method_index, int typeVal, int* types); bool QMetaObject_InvokeMethod5(QObject* obj, const char* member, int param3, QGenericReturnArgument* retVal, QGenericArgument* val0); diff --git a/qt/gen_qoffscreensurface.cpp b/qt/gen_qoffscreensurface.cpp index ff4314a9..513e0726 100644 --- a/qt/gen_qoffscreensurface.cpp +++ b/qt/gen_qoffscreensurface.cpp @@ -31,18 +31,26 @@ void* QOffscreenSurface_Metacast(QOffscreenSurface* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QOffscreenSurface_Tr(const char* s) { +struct miqt_string QOffscreenSurface_Tr(const char* s) { QString _ret = QOffscreenSurface::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QOffscreenSurface_TrUtf8(const char* s) { +struct miqt_string QOffscreenSurface_TrUtf8(const char* s) { QString _ret = QOffscreenSurface::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QOffscreenSurface_SurfaceType(const QOffscreenSurface* self) { @@ -105,32 +113,48 @@ void QOffscreenSurface_connect_ScreenChanged(QOffscreenSurface* self, intptr_t s }); } -struct miqt_string* QOffscreenSurface_Tr2(const char* s, const char* c) { +struct miqt_string QOffscreenSurface_Tr2(const char* s, const char* c) { QString _ret = QOffscreenSurface::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QOffscreenSurface_Tr3(const char* s, const char* c, int n) { +struct miqt_string QOffscreenSurface_Tr3(const char* s, const char* c, int n) { QString _ret = QOffscreenSurface::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QOffscreenSurface_TrUtf82(const char* s, const char* c) { +struct miqt_string QOffscreenSurface_TrUtf82(const char* s, const char* c) { QString _ret = QOffscreenSurface::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QOffscreenSurface_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QOffscreenSurface_TrUtf83(const char* s, const char* c, int n) { QString _ret = QOffscreenSurface::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QOffscreenSurface_Delete(QOffscreenSurface* self) { diff --git a/qt/gen_qoffscreensurface.go b/qt/gen_qoffscreensurface.go index 97e4f7e6..66ec7f2b 100644 --- a/qt/gen_qoffscreensurface.go +++ b/qt/gen_qoffscreensurface.go @@ -70,24 +70,24 @@ func (this *QOffscreenSurface) MetaObject() *QMetaObject { func (this *QOffscreenSurface) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QOffscreenSurface_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QOffscreenSurface_Metacast(this.h, param1_Cstring)) } func QOffscreenSurface_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QOffscreenSurface_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QOffscreenSurface_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QOffscreenSurface_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QOffscreenSurface_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QOffscreenSurface_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -141,7 +141,7 @@ func (this *QOffscreenSurface) SetScreen(screen *QScreen) { } func (this *QOffscreenSurface) NativeHandle() unsafe.Pointer { - return C.QOffscreenSurface_NativeHandle(this.h) + return (unsafe.Pointer)(C.QOffscreenSurface_NativeHandle(this.h)) } func (this *QOffscreenSurface) SetNativeHandle(handle unsafe.Pointer) { @@ -173,9 +173,9 @@ func QOffscreenSurface_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QOffscreenSurface_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QOffscreenSurface_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -184,9 +184,9 @@ func QOffscreenSurface_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QOffscreenSurface_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QOffscreenSurface_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -195,9 +195,9 @@ func QOffscreenSurface_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QOffscreenSurface_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QOffscreenSurface_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -206,9 +206,9 @@ func QOffscreenSurface_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QOffscreenSurface_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QOffscreenSurface_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qoffscreensurface.h b/qt/gen_qoffscreensurface.h index c70cb2a3..32ac2e8a 100644 --- a/qt/gen_qoffscreensurface.h +++ b/qt/gen_qoffscreensurface.h @@ -34,8 +34,8 @@ QOffscreenSurface* QOffscreenSurface_new2(); QOffscreenSurface* QOffscreenSurface_new3(QScreen* screen); QMetaObject* QOffscreenSurface_MetaObject(const QOffscreenSurface* self); void* QOffscreenSurface_Metacast(QOffscreenSurface* self, const char* param1); -struct miqt_string* QOffscreenSurface_Tr(const char* s); -struct miqt_string* QOffscreenSurface_TrUtf8(const char* s); +struct miqt_string QOffscreenSurface_Tr(const char* s); +struct miqt_string QOffscreenSurface_TrUtf8(const char* s); int QOffscreenSurface_SurfaceType(const QOffscreenSurface* self); void QOffscreenSurface_Create(QOffscreenSurface* self); void QOffscreenSurface_Destroy(QOffscreenSurface* self); @@ -50,10 +50,10 @@ void* QOffscreenSurface_NativeHandle(const QOffscreenSurface* self); void QOffscreenSurface_SetNativeHandle(QOffscreenSurface* self, void* handle); void QOffscreenSurface_ScreenChanged(QOffscreenSurface* self, QScreen* screen); void QOffscreenSurface_connect_ScreenChanged(QOffscreenSurface* self, intptr_t slot); -struct miqt_string* QOffscreenSurface_Tr2(const char* s, const char* c); -struct miqt_string* QOffscreenSurface_Tr3(const char* s, const char* c, int n); -struct miqt_string* QOffscreenSurface_TrUtf82(const char* s, const char* c); -struct miqt_string* QOffscreenSurface_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QOffscreenSurface_Tr2(const char* s, const char* c); +struct miqt_string QOffscreenSurface_Tr3(const char* s, const char* c, int n); +struct miqt_string QOffscreenSurface_TrUtf82(const char* s, const char* c); +struct miqt_string QOffscreenSurface_TrUtf83(const char* s, const char* c, int n); void QOffscreenSurface_Delete(QOffscreenSurface* self); #ifdef __cplusplus diff --git a/qt/gen_qoperatingsystemversion.cpp b/qt/gen_qoperatingsystemversion.cpp index d6200591..849a3b50 100644 --- a/qt/gen_qoperatingsystemversion.cpp +++ b/qt/gen_qoperatingsystemversion.cpp @@ -48,11 +48,15 @@ int QOperatingSystemVersion_Type(const QOperatingSystemVersion* self) { return static_cast(_ret); } -struct miqt_string* QOperatingSystemVersion_Name(const QOperatingSystemVersion* self) { +struct miqt_string QOperatingSystemVersion_Name(const QOperatingSystemVersion* self) { QString _ret = self->name(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QOperatingSystemVersion_Delete(QOperatingSystemVersion* self) { diff --git a/qt/gen_qoperatingsystemversion.go b/qt/gen_qoperatingsystemversion.go index 48f99e81..588d2578 100644 --- a/qt/gen_qoperatingsystemversion.go +++ b/qt/gen_qoperatingsystemversion.go @@ -104,9 +104,9 @@ func (this *QOperatingSystemVersion) Type() QOperatingSystemVersion__OSType { } func (this *QOperatingSystemVersion) Name() string { - var _ms *C.struct_miqt_string = C.QOperatingSystemVersion_Name(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QOperatingSystemVersion_Name(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qoperatingsystemversion.h b/qt/gen_qoperatingsystemversion.h index e3f951ca..a86d2f70 100644 --- a/qt/gen_qoperatingsystemversion.h +++ b/qt/gen_qoperatingsystemversion.h @@ -29,7 +29,7 @@ int QOperatingSystemVersion_MinorVersion(const QOperatingSystemVersion* self); int QOperatingSystemVersion_MicroVersion(const QOperatingSystemVersion* self); int QOperatingSystemVersion_SegmentCount(const QOperatingSystemVersion* self); int QOperatingSystemVersion_Type(const QOperatingSystemVersion* self); -struct miqt_string* QOperatingSystemVersion_Name(const QOperatingSystemVersion* self); +struct miqt_string QOperatingSystemVersion_Name(const QOperatingSystemVersion* self); void QOperatingSystemVersion_Delete(QOperatingSystemVersion* self); #ifdef __cplusplus diff --git a/qt/gen_qpagesize.cpp b/qt/gen_qpagesize.cpp index 198a734e..706d6005 100644 --- a/qt/gen_qpagesize.cpp +++ b/qt/gen_qpagesize.cpp @@ -30,23 +30,23 @@ QPageSize* QPageSize_new5(QPageSize* other) { return new QPageSize(*other); } -QPageSize* QPageSize_new6(QSize* pointSize, struct miqt_string* name) { - QString name_QString = QString::fromUtf8(&name->data, name->len); +QPageSize* QPageSize_new6(QSize* pointSize, struct miqt_string name) { + QString name_QString = QString::fromUtf8(name.data, name.len); return new QPageSize(*pointSize, name_QString); } -QPageSize* QPageSize_new7(QSize* pointSize, struct miqt_string* name, int matchPolicy) { - QString name_QString = QString::fromUtf8(&name->data, name->len); +QPageSize* QPageSize_new7(QSize* pointSize, struct miqt_string name, int matchPolicy) { + QString name_QString = QString::fromUtf8(name.data, name.len); return new QPageSize(*pointSize, name_QString, static_cast(matchPolicy)); } -QPageSize* QPageSize_new8(QSizeF* size, int units, struct miqt_string* name) { - QString name_QString = QString::fromUtf8(&name->data, name->len); +QPageSize* QPageSize_new8(QSizeF* size, int units, struct miqt_string name) { + QString name_QString = QString::fromUtf8(name.data, name.len); return new QPageSize(*size, static_cast(units), name_QString); } -QPageSize* QPageSize_new9(QSizeF* size, int units, struct miqt_string* name, int matchPolicy) { - QString name_QString = QString::fromUtf8(&name->data, name->len); +QPageSize* QPageSize_new9(QSizeF* size, int units, struct miqt_string name, int matchPolicy) { + QString name_QString = QString::fromUtf8(name.data, name.len); return new QPageSize(*size, static_cast(units), name_QString, static_cast(matchPolicy)); } @@ -66,18 +66,26 @@ bool QPageSize_IsValid(const QPageSize* self) { return self->isValid(); } -struct miqt_string* QPageSize_Key(const QPageSize* self) { +struct miqt_string QPageSize_Key(const QPageSize* self) { QString _ret = self->key(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPageSize_Name(const QPageSize* self) { +struct miqt_string QPageSize_Name(const QPageSize* self) { QString _ret = self->name(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QPageSize_Id(const QPageSize* self) { @@ -122,18 +130,26 @@ QRect* QPageSize_RectPixels(const QPageSize* self, int resolution) { return new QRect(self->rectPixels(static_cast(resolution))); } -struct miqt_string* QPageSize_KeyWithPageSizeId(int pageSizeId) { +struct miqt_string QPageSize_KeyWithPageSizeId(int pageSizeId) { QString _ret = QPageSize::key(static_cast(pageSizeId)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPageSize_NameWithPageSizeId(int pageSizeId) { +struct miqt_string QPageSize_NameWithPageSizeId(int pageSizeId) { QString _ret = QPageSize::name(static_cast(pageSizeId)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QPageSize_IdWithPointSize(QSize* pointSize) { diff --git a/qt/gen_qpagesize.go b/qt/gen_qpagesize.go index 9db1a5b7..07e6f51d 100644 --- a/qt/gen_qpagesize.go +++ b/qt/gen_qpagesize.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -226,33 +225,41 @@ func NewQPageSize5(other *QPageSize) *QPageSize { // NewQPageSize6 constructs a new QPageSize object. func NewQPageSize6(pointSize *QSize, name string) *QPageSize { - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - ret := C.QPageSize_new6(pointSize.cPointer(), (*C.struct_miqt_string)(name_ms)) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + ret := C.QPageSize_new6(pointSize.cPointer(), name_ms) return newQPageSize(ret) } // NewQPageSize7 constructs a new QPageSize object. func NewQPageSize7(pointSize *QSize, name string, matchPolicy QPageSize__SizeMatchPolicy) *QPageSize { - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - ret := C.QPageSize_new7(pointSize.cPointer(), (*C.struct_miqt_string)(name_ms), (C.int)(matchPolicy)) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + ret := C.QPageSize_new7(pointSize.cPointer(), name_ms, (C.int)(matchPolicy)) return newQPageSize(ret) } // NewQPageSize8 constructs a new QPageSize object. func NewQPageSize8(size *QSizeF, units QPageSize__Unit, name string) *QPageSize { - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - ret := C.QPageSize_new8(size.cPointer(), (C.int)(units), (*C.struct_miqt_string)(name_ms)) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + ret := C.QPageSize_new8(size.cPointer(), (C.int)(units), name_ms) return newQPageSize(ret) } // NewQPageSize9 constructs a new QPageSize object. func NewQPageSize9(size *QSizeF, units QPageSize__Unit, name string, matchPolicy QPageSize__SizeMatchPolicy) *QPageSize { - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - ret := C.QPageSize_new9(size.cPointer(), (C.int)(units), (*C.struct_miqt_string)(name_ms), (C.int)(matchPolicy)) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + ret := C.QPageSize_new9(size.cPointer(), (C.int)(units), name_ms, (C.int)(matchPolicy)) return newQPageSize(ret) } @@ -273,16 +280,16 @@ func (this *QPageSize) IsValid() bool { } func (this *QPageSize) Key() string { - var _ms *C.struct_miqt_string = C.QPageSize_Key(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPageSize_Key(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QPageSize) Name() string { - var _ms *C.struct_miqt_string = C.QPageSize_Name(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPageSize_Name(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -348,16 +355,16 @@ func (this *QPageSize) RectPixels(resolution int) *QRect { } func QPageSize_KeyWithPageSizeId(pageSizeId QPageSize__PageSizeId) string { - var _ms *C.struct_miqt_string = C.QPageSize_KeyWithPageSizeId((C.int)(pageSizeId)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPageSize_KeyWithPageSizeId((C.int)(pageSizeId)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QPageSize_NameWithPageSizeId(pageSizeId QPageSize__PageSizeId) string { - var _ms *C.struct_miqt_string = C.QPageSize_NameWithPageSizeId((C.int)(pageSizeId)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPageSize_NameWithPageSizeId((C.int)(pageSizeId)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qpagesize.h b/qt/gen_qpagesize.h index aa3f9c33..13f067f3 100644 --- a/qt/gen_qpagesize.h +++ b/qt/gen_qpagesize.h @@ -32,16 +32,16 @@ QPageSize* QPageSize_new2(int pageSizeId); QPageSize* QPageSize_new3(QSize* pointSize); QPageSize* QPageSize_new4(QSizeF* size, int units); QPageSize* QPageSize_new5(QPageSize* other); -QPageSize* QPageSize_new6(QSize* pointSize, struct miqt_string* name); -QPageSize* QPageSize_new7(QSize* pointSize, struct miqt_string* name, int matchPolicy); -QPageSize* QPageSize_new8(QSizeF* size, int units, struct miqt_string* name); -QPageSize* QPageSize_new9(QSizeF* size, int units, struct miqt_string* name, int matchPolicy); +QPageSize* QPageSize_new6(QSize* pointSize, struct miqt_string name); +QPageSize* QPageSize_new7(QSize* pointSize, struct miqt_string name, int matchPolicy); +QPageSize* QPageSize_new8(QSizeF* size, int units, struct miqt_string name); +QPageSize* QPageSize_new9(QSizeF* size, int units, struct miqt_string name, int matchPolicy); void QPageSize_OperatorAssign(QPageSize* self, QPageSize* other); void QPageSize_Swap(QPageSize* self, QPageSize* other); bool QPageSize_IsEquivalentTo(const QPageSize* self, QPageSize* other); bool QPageSize_IsValid(const QPageSize* self); -struct miqt_string* QPageSize_Key(const QPageSize* self); -struct miqt_string* QPageSize_Name(const QPageSize* self); +struct miqt_string QPageSize_Key(const QPageSize* self); +struct miqt_string QPageSize_Name(const QPageSize* self); int QPageSize_Id(const QPageSize* self); int QPageSize_WindowsId(const QPageSize* self); QSizeF* QPageSize_DefinitionSize(const QPageSize* self); @@ -52,8 +52,8 @@ QSize* QPageSize_SizePixels(const QPageSize* self, int resolution); QRectF* QPageSize_Rect(const QPageSize* self, int units); QRect* QPageSize_RectPoints(const QPageSize* self); QRect* QPageSize_RectPixels(const QPageSize* self, int resolution); -struct miqt_string* QPageSize_KeyWithPageSizeId(int pageSizeId); -struct miqt_string* QPageSize_NameWithPageSizeId(int pageSizeId); +struct miqt_string QPageSize_KeyWithPageSizeId(int pageSizeId); +struct miqt_string QPageSize_NameWithPageSizeId(int pageSizeId); int QPageSize_IdWithPointSize(QSize* pointSize); int QPageSize_Id2(QSizeF* size, int units); int QPageSize_IdWithWindowsId(int windowsId); diff --git a/qt/gen_qpaintdevicewindow.cpp b/qt/gen_qpaintdevicewindow.cpp index 655233cb..0c222dbe 100644 --- a/qt/gen_qpaintdevicewindow.cpp +++ b/qt/gen_qpaintdevicewindow.cpp @@ -17,18 +17,26 @@ void* QPaintDeviceWindow_Metacast(QPaintDeviceWindow* self, const char* param1) return self->qt_metacast(param1); } -struct miqt_string* QPaintDeviceWindow_Tr(const char* s) { +struct miqt_string QPaintDeviceWindow_Tr(const char* s) { QString _ret = QPaintDeviceWindow::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPaintDeviceWindow_TrUtf8(const char* s) { +struct miqt_string QPaintDeviceWindow_TrUtf8(const char* s) { QString _ret = QPaintDeviceWindow::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QPaintDeviceWindow_Update(QPaintDeviceWindow* self, QRect* rect) { @@ -43,32 +51,48 @@ void QPaintDeviceWindow_Update2(QPaintDeviceWindow* self) { self->update(); } -struct miqt_string* QPaintDeviceWindow_Tr2(const char* s, const char* c) { +struct miqt_string QPaintDeviceWindow_Tr2(const char* s, const char* c) { QString _ret = QPaintDeviceWindow::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPaintDeviceWindow_Tr3(const char* s, const char* c, int n) { +struct miqt_string QPaintDeviceWindow_Tr3(const char* s, const char* c, int n) { QString _ret = QPaintDeviceWindow::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPaintDeviceWindow_TrUtf82(const char* s, const char* c) { +struct miqt_string QPaintDeviceWindow_TrUtf82(const char* s, const char* c) { QString _ret = QPaintDeviceWindow::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPaintDeviceWindow_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QPaintDeviceWindow_TrUtf83(const char* s, const char* c, int n) { QString _ret = QPaintDeviceWindow::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QPaintDeviceWindow_Delete(QPaintDeviceWindow* self) { diff --git a/qt/gen_qpaintdevicewindow.go b/qt/gen_qpaintdevicewindow.go index 2fd6e81d..699485a4 100644 --- a/qt/gen_qpaintdevicewindow.go +++ b/qt/gen_qpaintdevicewindow.go @@ -51,24 +51,24 @@ func (this *QPaintDeviceWindow) MetaObject() *QMetaObject { func (this *QPaintDeviceWindow) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QPaintDeviceWindow_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QPaintDeviceWindow_Metacast(this.h, param1_Cstring)) } func QPaintDeviceWindow_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QPaintDeviceWindow_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPaintDeviceWindow_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QPaintDeviceWindow_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QPaintDeviceWindow_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPaintDeviceWindow_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -89,9 +89,9 @@ func QPaintDeviceWindow_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPaintDeviceWindow_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPaintDeviceWindow_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -100,9 +100,9 @@ func QPaintDeviceWindow_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPaintDeviceWindow_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPaintDeviceWindow_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -111,9 +111,9 @@ func QPaintDeviceWindow_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPaintDeviceWindow_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPaintDeviceWindow_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -122,9 +122,9 @@ func QPaintDeviceWindow_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPaintDeviceWindow_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPaintDeviceWindow_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qpaintdevicewindow.h b/qt/gen_qpaintdevicewindow.h index 6edef6ff..7c9e4f57 100644 --- a/qt/gen_qpaintdevicewindow.h +++ b/qt/gen_qpaintdevicewindow.h @@ -27,15 +27,15 @@ typedef struct QRegion QRegion; QMetaObject* QPaintDeviceWindow_MetaObject(const QPaintDeviceWindow* self); void* QPaintDeviceWindow_Metacast(QPaintDeviceWindow* self, const char* param1); -struct miqt_string* QPaintDeviceWindow_Tr(const char* s); -struct miqt_string* QPaintDeviceWindow_TrUtf8(const char* s); +struct miqt_string QPaintDeviceWindow_Tr(const char* s); +struct miqt_string QPaintDeviceWindow_TrUtf8(const char* s); void QPaintDeviceWindow_Update(QPaintDeviceWindow* self, QRect* rect); void QPaintDeviceWindow_UpdateWithRegion(QPaintDeviceWindow* self, QRegion* region); void QPaintDeviceWindow_Update2(QPaintDeviceWindow* self); -struct miqt_string* QPaintDeviceWindow_Tr2(const char* s, const char* c); -struct miqt_string* QPaintDeviceWindow_Tr3(const char* s, const char* c, int n); -struct miqt_string* QPaintDeviceWindow_TrUtf82(const char* s, const char* c); -struct miqt_string* QPaintDeviceWindow_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QPaintDeviceWindow_Tr2(const char* s, const char* c); +struct miqt_string QPaintDeviceWindow_Tr3(const char* s, const char* c, int n); +struct miqt_string QPaintDeviceWindow_TrUtf82(const char* s, const char* c); +struct miqt_string QPaintDeviceWindow_TrUtf83(const char* s, const char* c, int n); void QPaintDeviceWindow_Delete(QPaintDeviceWindow* self); #ifdef __cplusplus diff --git a/qt/gen_qpaintengine.cpp b/qt/gen_qpaintengine.cpp index 4e8dfdd0..08b549f6 100644 --- a/qt/gen_qpaintengine.cpp +++ b/qt/gen_qpaintengine.cpp @@ -45,11 +45,15 @@ int QTextItem_RenderFlags(const QTextItem* self) { return static_cast(_ret); } -struct miqt_string* QTextItem_Text(const QTextItem* self) { +struct miqt_string QTextItem_Text(const QTextItem* self) { QString _ret = self->text(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QFont* QTextItem_Font(const QTextItem* self) { diff --git a/qt/gen_qpaintengine.go b/qt/gen_qpaintengine.go index 877567a9..bb5377c1 100644 --- a/qt/gen_qpaintengine.go +++ b/qt/gen_qpaintengine.go @@ -147,9 +147,9 @@ func (this *QTextItem) RenderFlags() QTextItem__RenderFlag { } func (this *QTextItem) Text() string { - var _ms *C.struct_miqt_string = C.QTextItem_Text(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextItem_Text(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qpaintengine.h b/qt/gen_qpaintengine.h index 73fbf2b5..86b05ee5 100644 --- a/qt/gen_qpaintengine.h +++ b/qt/gen_qpaintengine.h @@ -61,7 +61,7 @@ double QTextItem_Descent(const QTextItem* self); double QTextItem_Ascent(const QTextItem* self); double QTextItem_Width(const QTextItem* self); int QTextItem_RenderFlags(const QTextItem* self); -struct miqt_string* QTextItem_Text(const QTextItem* self); +struct miqt_string QTextItem_Text(const QTextItem* self); QFont* QTextItem_Font(const QTextItem* self); void QTextItem_Delete(QTextItem* self); diff --git a/qt/gen_qpainter.cpp b/qt/gen_qpainter.cpp index b4e18d79..e9d49fbf 100644 --- a/qt/gen_qpainter.cpp +++ b/qt/gen_qpainter.cpp @@ -737,63 +737,63 @@ void QPainter_DrawStaticText3(QPainter* self, int left, int top, QStaticText* st self->drawStaticText(static_cast(left), static_cast(top), *staticText); } -void QPainter_DrawText(QPainter* self, QPointF* p, struct miqt_string* s) { - QString s_QString = QString::fromUtf8(&s->data, s->len); +void QPainter_DrawText(QPainter* self, QPointF* p, struct miqt_string s) { + QString s_QString = QString::fromUtf8(s.data, s.len); self->drawText(*p, s_QString); } -void QPainter_DrawText2(QPainter* self, QPoint* p, struct miqt_string* s) { - QString s_QString = QString::fromUtf8(&s->data, s->len); +void QPainter_DrawText2(QPainter* self, QPoint* p, struct miqt_string s) { + QString s_QString = QString::fromUtf8(s.data, s.len); self->drawText(*p, s_QString); } -void QPainter_DrawText3(QPainter* self, int x, int y, struct miqt_string* s) { - QString s_QString = QString::fromUtf8(&s->data, s->len); +void QPainter_DrawText3(QPainter* self, int x, int y, struct miqt_string s) { + QString s_QString = QString::fromUtf8(s.data, s.len); self->drawText(static_cast(x), static_cast(y), s_QString); } -void QPainter_DrawText4(QPainter* self, QPointF* p, struct miqt_string* str, int tf, int justificationPadding) { - QString str_QString = QString::fromUtf8(&str->data, str->len); +void QPainter_DrawText4(QPainter* self, QPointF* p, struct miqt_string str, int tf, int justificationPadding) { + QString str_QString = QString::fromUtf8(str.data, str.len); self->drawText(*p, str_QString, static_cast(tf), static_cast(justificationPadding)); } -void QPainter_DrawText5(QPainter* self, QRectF* r, int flags, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QPainter_DrawText5(QPainter* self, QRectF* r, int flags, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->drawText(*r, static_cast(flags), text_QString); } -void QPainter_DrawText6(QPainter* self, QRect* r, int flags, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QPainter_DrawText6(QPainter* self, QRect* r, int flags, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->drawText(*r, static_cast(flags), text_QString); } -void QPainter_DrawText7(QPainter* self, int x, int y, int w, int h, int flags, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QPainter_DrawText7(QPainter* self, int x, int y, int w, int h, int flags, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->drawText(static_cast(x), static_cast(y), static_cast(w), static_cast(h), static_cast(flags), text_QString); } -void QPainter_DrawText8(QPainter* self, QRectF* r, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QPainter_DrawText8(QPainter* self, QRectF* r, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->drawText(*r, text_QString); } -QRectF* QPainter_BoundingRect(QPainter* self, QRectF* rect, int flags, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QRectF* QPainter_BoundingRect(QPainter* self, QRectF* rect, int flags, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QRectF(self->boundingRect(*rect, static_cast(flags), text_QString)); } -QRect* QPainter_BoundingRect2(QPainter* self, QRect* rect, int flags, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QRect* QPainter_BoundingRect2(QPainter* self, QRect* rect, int flags, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QRect(self->boundingRect(*rect, static_cast(flags), text_QString)); } -QRect* QPainter_BoundingRect3(QPainter* self, int x, int y, int w, int h, int flags, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QRect* QPainter_BoundingRect3(QPainter* self, int x, int y, int w, int h, int flags, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QRect(self->boundingRect(static_cast(x), static_cast(y), static_cast(w), static_cast(h), static_cast(flags), text_QString)); } -QRectF* QPainter_BoundingRect4(QPainter* self, QRectF* rect, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QRectF* QPainter_BoundingRect4(QPainter* self, QRectF* rect, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QRectF(self->boundingRect(*rect, text_QString)); } @@ -1058,28 +1058,28 @@ void QPainter_DrawImage82(QPainter* self, int x, int y, QImage* image, int sx, i self->drawImage(static_cast(x), static_cast(y), *image, static_cast(sx), static_cast(sy), static_cast(sw), static_cast(sh), static_cast(flags)); } -void QPainter_DrawText42(QPainter* self, QRectF* r, int flags, struct miqt_string* text, QRectF* br) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QPainter_DrawText42(QPainter* self, QRectF* r, int flags, struct miqt_string text, QRectF* br) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->drawText(*r, static_cast(flags), text_QString, br); } -void QPainter_DrawText43(QPainter* self, QRect* r, int flags, struct miqt_string* text, QRect* br) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QPainter_DrawText43(QPainter* self, QRect* r, int flags, struct miqt_string text, QRect* br) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->drawText(*r, static_cast(flags), text_QString, br); } -void QPainter_DrawText72(QPainter* self, int x, int y, int w, int h, int flags, struct miqt_string* text, QRect* br) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QPainter_DrawText72(QPainter* self, int x, int y, int w, int h, int flags, struct miqt_string text, QRect* br) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->drawText(static_cast(x), static_cast(y), static_cast(w), static_cast(h), static_cast(flags), text_QString, br); } -void QPainter_DrawText32(QPainter* self, QRectF* r, struct miqt_string* text, QTextOption* o) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QPainter_DrawText32(QPainter* self, QRectF* r, struct miqt_string text, QTextOption* o) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->drawText(*r, text_QString, *o); } -QRectF* QPainter_BoundingRect32(QPainter* self, QRectF* rect, struct miqt_string* text, QTextOption* o) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QRectF* QPainter_BoundingRect32(QPainter* self, QRectF* rect, struct miqt_string text, QTextOption* o) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QRectF(self->boundingRect(*rect, text_QString, *o)); } diff --git a/qt/gen_qpainter.go b/qt/gen_qpainter.go index 8756ac14..61d1c4da 100644 --- a/qt/gen_qpainter.go +++ b/qt/gen_qpainter.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -831,84 +830,108 @@ func (this *QPainter) DrawStaticText3(left int, top int, staticText *QStaticText } func (this *QPainter) DrawText(p *QPointF, s string) { - s_ms := libmiqt.Strdupg(s) - defer C.free(s_ms) - C.QPainter_DrawText(this.h, p.cPointer(), (*C.struct_miqt_string)(s_ms)) + s_ms := C.struct_miqt_string{} + s_ms.data = C.CString(s) + s_ms.len = C.size_t(len(s)) + defer C.free(unsafe.Pointer(s_ms.data)) + C.QPainter_DrawText(this.h, p.cPointer(), s_ms) } func (this *QPainter) DrawText2(p *QPoint, s string) { - s_ms := libmiqt.Strdupg(s) - defer C.free(s_ms) - C.QPainter_DrawText2(this.h, p.cPointer(), (*C.struct_miqt_string)(s_ms)) + s_ms := C.struct_miqt_string{} + s_ms.data = C.CString(s) + s_ms.len = C.size_t(len(s)) + defer C.free(unsafe.Pointer(s_ms.data)) + C.QPainter_DrawText2(this.h, p.cPointer(), s_ms) } func (this *QPainter) DrawText3(x int, y int, s string) { - s_ms := libmiqt.Strdupg(s) - defer C.free(s_ms) - C.QPainter_DrawText3(this.h, (C.int)(x), (C.int)(y), (*C.struct_miqt_string)(s_ms)) + s_ms := C.struct_miqt_string{} + s_ms.data = C.CString(s) + s_ms.len = C.size_t(len(s)) + defer C.free(unsafe.Pointer(s_ms.data)) + C.QPainter_DrawText3(this.h, (C.int)(x), (C.int)(y), s_ms) } func (this *QPainter) DrawText4(p *QPointF, str string, tf int, justificationPadding int) { - str_ms := libmiqt.Strdupg(str) - defer C.free(str_ms) - C.QPainter_DrawText4(this.h, p.cPointer(), (*C.struct_miqt_string)(str_ms), (C.int)(tf), (C.int)(justificationPadding)) + str_ms := C.struct_miqt_string{} + str_ms.data = C.CString(str) + str_ms.len = C.size_t(len(str)) + defer C.free(unsafe.Pointer(str_ms.data)) + C.QPainter_DrawText4(this.h, p.cPointer(), str_ms, (C.int)(tf), (C.int)(justificationPadding)) } func (this *QPainter) DrawText5(r *QRectF, flags int, text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QPainter_DrawText5(this.h, r.cPointer(), (C.int)(flags), (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QPainter_DrawText5(this.h, r.cPointer(), (C.int)(flags), text_ms) } func (this *QPainter) DrawText6(r *QRect, flags int, text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QPainter_DrawText6(this.h, r.cPointer(), (C.int)(flags), (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QPainter_DrawText6(this.h, r.cPointer(), (C.int)(flags), text_ms) } func (this *QPainter) DrawText7(x int, y int, w int, h int, flags int, text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QPainter_DrawText7(this.h, (C.int)(x), (C.int)(y), (C.int)(w), (C.int)(h), (C.int)(flags), (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QPainter_DrawText7(this.h, (C.int)(x), (C.int)(y), (C.int)(w), (C.int)(h), (C.int)(flags), text_ms) } func (this *QPainter) DrawText8(r *QRectF, text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QPainter_DrawText8(this.h, r.cPointer(), (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QPainter_DrawText8(this.h, r.cPointer(), text_ms) } func (this *QPainter) BoundingRect(rect *QRectF, flags int, text string) *QRectF { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - _ret := C.QPainter_BoundingRect(this.h, rect.cPointer(), (C.int)(flags), (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + _ret := C.QPainter_BoundingRect(this.h, rect.cPointer(), (C.int)(flags), text_ms) _goptr := newQRectF(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QPainter) BoundingRect2(rect *QRect, flags int, text string) *QRect { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - _ret := C.QPainter_BoundingRect2(this.h, rect.cPointer(), (C.int)(flags), (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + _ret := C.QPainter_BoundingRect2(this.h, rect.cPointer(), (C.int)(flags), text_ms) _goptr := newQRect(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QPainter) BoundingRect3(x int, y int, w int, h int, flags int, text string) *QRect { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - _ret := C.QPainter_BoundingRect3(this.h, (C.int)(x), (C.int)(y), (C.int)(w), (C.int)(h), (C.int)(flags), (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + _ret := C.QPainter_BoundingRect3(this.h, (C.int)(x), (C.int)(y), (C.int)(w), (C.int)(h), (C.int)(flags), text_ms) _goptr := newQRect(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QPainter) BoundingRect4(rect *QRectF, text string) *QRectF { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - _ret := C.QPainter_BoundingRect4(this.h, rect.cPointer(), (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + _ret := C.QPainter_BoundingRect4(this.h, rect.cPointer(), text_ms) _goptr := newQRectF(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -1175,33 +1198,43 @@ func (this *QPainter) DrawImage82(x int, y int, image *QImage, sx int, sy int, s } func (this *QPainter) DrawText42(r *QRectF, flags int, text string, br *QRectF) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QPainter_DrawText42(this.h, r.cPointer(), (C.int)(flags), (*C.struct_miqt_string)(text_ms), br.cPointer()) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QPainter_DrawText42(this.h, r.cPointer(), (C.int)(flags), text_ms, br.cPointer()) } func (this *QPainter) DrawText43(r *QRect, flags int, text string, br *QRect) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QPainter_DrawText43(this.h, r.cPointer(), (C.int)(flags), (*C.struct_miqt_string)(text_ms), br.cPointer()) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QPainter_DrawText43(this.h, r.cPointer(), (C.int)(flags), text_ms, br.cPointer()) } func (this *QPainter) DrawText72(x int, y int, w int, h int, flags int, text string, br *QRect) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QPainter_DrawText72(this.h, (C.int)(x), (C.int)(y), (C.int)(w), (C.int)(h), (C.int)(flags), (*C.struct_miqt_string)(text_ms), br.cPointer()) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QPainter_DrawText72(this.h, (C.int)(x), (C.int)(y), (C.int)(w), (C.int)(h), (C.int)(flags), text_ms, br.cPointer()) } func (this *QPainter) DrawText32(r *QRectF, text string, o *QTextOption) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QPainter_DrawText32(this.h, r.cPointer(), (*C.struct_miqt_string)(text_ms), o.cPointer()) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QPainter_DrawText32(this.h, r.cPointer(), text_ms, o.cPointer()) } func (this *QPainter) BoundingRect32(rect *QRectF, text string, o *QTextOption) *QRectF { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - _ret := C.QPainter_BoundingRect32(this.h, rect.cPointer(), (*C.struct_miqt_string)(text_ms), o.cPointer()) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + _ret := C.QPainter_BoundingRect32(this.h, rect.cPointer(), text_ms, o.cPointer()) _goptr := newQRectF(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr diff --git a/qt/gen_qpainter.h b/qt/gen_qpainter.h index 91d2be7c..d3aae75d 100644 --- a/qt/gen_qpainter.h +++ b/qt/gen_qpainter.h @@ -236,18 +236,18 @@ void QPainter_DrawGlyphRun(QPainter* self, QPointF* position, QGlyphRun* glyphRu void QPainter_DrawStaticText(QPainter* self, QPointF* topLeftPosition, QStaticText* staticText); void QPainter_DrawStaticText2(QPainter* self, QPoint* topLeftPosition, QStaticText* staticText); void QPainter_DrawStaticText3(QPainter* self, int left, int top, QStaticText* staticText); -void QPainter_DrawText(QPainter* self, QPointF* p, struct miqt_string* s); -void QPainter_DrawText2(QPainter* self, QPoint* p, struct miqt_string* s); -void QPainter_DrawText3(QPainter* self, int x, int y, struct miqt_string* s); -void QPainter_DrawText4(QPainter* self, QPointF* p, struct miqt_string* str, int tf, int justificationPadding); -void QPainter_DrawText5(QPainter* self, QRectF* r, int flags, struct miqt_string* text); -void QPainter_DrawText6(QPainter* self, QRect* r, int flags, struct miqt_string* text); -void QPainter_DrawText7(QPainter* self, int x, int y, int w, int h, int flags, struct miqt_string* text); -void QPainter_DrawText8(QPainter* self, QRectF* r, struct miqt_string* text); -QRectF* QPainter_BoundingRect(QPainter* self, QRectF* rect, int flags, struct miqt_string* text); -QRect* QPainter_BoundingRect2(QPainter* self, QRect* rect, int flags, struct miqt_string* text); -QRect* QPainter_BoundingRect3(QPainter* self, int x, int y, int w, int h, int flags, struct miqt_string* text); -QRectF* QPainter_BoundingRect4(QPainter* self, QRectF* rect, struct miqt_string* text); +void QPainter_DrawText(QPainter* self, QPointF* p, struct miqt_string s); +void QPainter_DrawText2(QPainter* self, QPoint* p, struct miqt_string s); +void QPainter_DrawText3(QPainter* self, int x, int y, struct miqt_string s); +void QPainter_DrawText4(QPainter* self, QPointF* p, struct miqt_string str, int tf, int justificationPadding); +void QPainter_DrawText5(QPainter* self, QRectF* r, int flags, struct miqt_string text); +void QPainter_DrawText6(QPainter* self, QRect* r, int flags, struct miqt_string text); +void QPainter_DrawText7(QPainter* self, int x, int y, int w, int h, int flags, struct miqt_string text); +void QPainter_DrawText8(QPainter* self, QRectF* r, struct miqt_string text); +QRectF* QPainter_BoundingRect(QPainter* self, QRectF* rect, int flags, struct miqt_string text); +QRect* QPainter_BoundingRect2(QPainter* self, QRect* rect, int flags, struct miqt_string text); +QRect* QPainter_BoundingRect3(QPainter* self, int x, int y, int w, int h, int flags, struct miqt_string text); +QRectF* QPainter_BoundingRect4(QPainter* self, QRectF* rect, struct miqt_string text); void QPainter_DrawTextItem(QPainter* self, QPointF* p, QTextItem* ti); void QPainter_DrawTextItem2(QPainter* self, int x, int y, QTextItem* ti); void QPainter_DrawTextItem3(QPainter* self, QPoint* p, QTextItem* ti); @@ -313,11 +313,11 @@ void QPainter_DrawImage52(QPainter* self, int x, int y, QImage* image, int sx, i void QPainter_DrawImage62(QPainter* self, int x, int y, QImage* image, int sx, int sy, int sw); void QPainter_DrawImage72(QPainter* self, int x, int y, QImage* image, int sx, int sy, int sw, int sh); void QPainter_DrawImage82(QPainter* self, int x, int y, QImage* image, int sx, int sy, int sw, int sh, int flags); -void QPainter_DrawText42(QPainter* self, QRectF* r, int flags, struct miqt_string* text, QRectF* br); -void QPainter_DrawText43(QPainter* self, QRect* r, int flags, struct miqt_string* text, QRect* br); -void QPainter_DrawText72(QPainter* self, int x, int y, int w, int h, int flags, struct miqt_string* text, QRect* br); -void QPainter_DrawText32(QPainter* self, QRectF* r, struct miqt_string* text, QTextOption* o); -QRectF* QPainter_BoundingRect32(QPainter* self, QRectF* rect, struct miqt_string* text, QTextOption* o); +void QPainter_DrawText42(QPainter* self, QRectF* r, int flags, struct miqt_string text, QRectF* br); +void QPainter_DrawText43(QPainter* self, QRect* r, int flags, struct miqt_string text, QRect* br); +void QPainter_DrawText72(QPainter* self, int x, int y, int w, int h, int flags, struct miqt_string text, QRect* br); +void QPainter_DrawText32(QPainter* self, QRectF* r, struct miqt_string text, QTextOption* o); +QRectF* QPainter_BoundingRect32(QPainter* self, QRectF* rect, struct miqt_string text, QTextOption* o); void QPainter_SetRenderHint2(QPainter* self, int hint, bool on); void QPainter_SetRenderHints2(QPainter* self, int hints, bool on); void QPainter_SetRedirected3(QPaintDevice* device, QPaintDevice* replacement, QPoint* offset); diff --git a/qt/gen_qpainterpath.cpp b/qt/gen_qpainterpath.cpp index 3581173d..4fab7e8d 100644 --- a/qt/gen_qpainterpath.cpp +++ b/qt/gen_qpainterpath.cpp @@ -122,13 +122,13 @@ void QPainterPath_AddEllipse3(QPainterPath* self, QPointF* center, double rx, do self->addEllipse(*center, static_cast(rx), static_cast(ry)); } -void QPainterPath_AddText(QPainterPath* self, QPointF* point, QFont* f, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QPainterPath_AddText(QPainterPath* self, QPointF* point, QFont* f, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->addText(*point, *f, text_QString); } -void QPainterPath_AddText2(QPainterPath* self, double x, double y, QFont* f, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QPainterPath_AddText2(QPainterPath* self, double x, double y, QFont* f, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->addText(static_cast(x), static_cast(y), *f, text_QString); } diff --git a/qt/gen_qpainterpath.go b/qt/gen_qpainterpath.go index f6727456..f46a65ec 100644 --- a/qt/gen_qpainterpath.go +++ b/qt/gen_qpainterpath.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -170,15 +169,19 @@ func (this *QPainterPath) AddEllipse3(center *QPointF, rx float64, ry float64) { } func (this *QPainterPath) AddText(point *QPointF, f *QFont, text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QPainterPath_AddText(this.h, point.cPointer(), f.cPointer(), (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QPainterPath_AddText(this.h, point.cPointer(), f.cPointer(), text_ms) } func (this *QPainterPath) AddText2(x float64, y float64, f *QFont, text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QPainterPath_AddText2(this.h, (C.double)(x), (C.double)(y), f.cPointer(), (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QPainterPath_AddText2(this.h, (C.double)(x), (C.double)(y), f.cPointer(), text_ms) } func (this *QPainterPath) AddPath(path *QPainterPath) { diff --git a/qt/gen_qpainterpath.h b/qt/gen_qpainterpath.h index 112490ba..899831b4 100644 --- a/qt/gen_qpainterpath.h +++ b/qt/gen_qpainterpath.h @@ -64,8 +64,8 @@ void QPainterPath_AddRect2(QPainterPath* self, double x, double y, double w, dou void QPainterPath_AddEllipse(QPainterPath* self, QRectF* rect); void QPainterPath_AddEllipse2(QPainterPath* self, double x, double y, double w, double h); void QPainterPath_AddEllipse3(QPainterPath* self, QPointF* center, double rx, double ry); -void QPainterPath_AddText(QPainterPath* self, QPointF* point, QFont* f, struct miqt_string* text); -void QPainterPath_AddText2(QPainterPath* self, double x, double y, QFont* f, struct miqt_string* text); +void QPainterPath_AddText(QPainterPath* self, QPointF* point, QFont* f, struct miqt_string text); +void QPainterPath_AddText2(QPainterPath* self, double x, double y, QFont* f, struct miqt_string text); void QPainterPath_AddPath(QPainterPath* self, QPainterPath* path); void QPainterPath_AddRegion(QPainterPath* self, QRegion* region); void QPainterPath_AddRoundedRect(QPainterPath* self, QRectF* rect, double xRadius, double yRadius); diff --git a/qt/gen_qparallelanimationgroup.cpp b/qt/gen_qparallelanimationgroup.cpp index 21aeed49..87baeb37 100644 --- a/qt/gen_qparallelanimationgroup.cpp +++ b/qt/gen_qparallelanimationgroup.cpp @@ -24,50 +24,74 @@ void* QParallelAnimationGroup_Metacast(QParallelAnimationGroup* self, const char return self->qt_metacast(param1); } -struct miqt_string* QParallelAnimationGroup_Tr(const char* s) { +struct miqt_string QParallelAnimationGroup_Tr(const char* s) { QString _ret = QParallelAnimationGroup::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QParallelAnimationGroup_TrUtf8(const char* s) { +struct miqt_string QParallelAnimationGroup_TrUtf8(const char* s) { QString _ret = QParallelAnimationGroup::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QParallelAnimationGroup_Duration(const QParallelAnimationGroup* self) { return self->duration(); } -struct miqt_string* QParallelAnimationGroup_Tr2(const char* s, const char* c) { +struct miqt_string QParallelAnimationGroup_Tr2(const char* s, const char* c) { QString _ret = QParallelAnimationGroup::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QParallelAnimationGroup_Tr3(const char* s, const char* c, int n) { +struct miqt_string QParallelAnimationGroup_Tr3(const char* s, const char* c, int n) { QString _ret = QParallelAnimationGroup::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QParallelAnimationGroup_TrUtf82(const char* s, const char* c) { +struct miqt_string QParallelAnimationGroup_TrUtf82(const char* s, const char* c) { QString _ret = QParallelAnimationGroup::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QParallelAnimationGroup_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QParallelAnimationGroup_TrUtf83(const char* s, const char* c, int n) { QString _ret = QParallelAnimationGroup::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QParallelAnimationGroup_Delete(QParallelAnimationGroup* self) { diff --git a/qt/gen_qparallelanimationgroup.go b/qt/gen_qparallelanimationgroup.go index 1e01975c..bbeef8d4 100644 --- a/qt/gen_qparallelanimationgroup.go +++ b/qt/gen_qparallelanimationgroup.go @@ -62,24 +62,24 @@ func (this *QParallelAnimationGroup) MetaObject() *QMetaObject { func (this *QParallelAnimationGroup) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QParallelAnimationGroup_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QParallelAnimationGroup_Metacast(this.h, param1_Cstring)) } func QParallelAnimationGroup_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QParallelAnimationGroup_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QParallelAnimationGroup_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QParallelAnimationGroup_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QParallelAnimationGroup_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QParallelAnimationGroup_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -92,9 +92,9 @@ func QParallelAnimationGroup_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QParallelAnimationGroup_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QParallelAnimationGroup_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -103,9 +103,9 @@ func QParallelAnimationGroup_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QParallelAnimationGroup_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QParallelAnimationGroup_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -114,9 +114,9 @@ func QParallelAnimationGroup_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QParallelAnimationGroup_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QParallelAnimationGroup_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -125,9 +125,9 @@ func QParallelAnimationGroup_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QParallelAnimationGroup_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QParallelAnimationGroup_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qparallelanimationgroup.h b/qt/gen_qparallelanimationgroup.h index 6490cdf1..ffe18b73 100644 --- a/qt/gen_qparallelanimationgroup.h +++ b/qt/gen_qparallelanimationgroup.h @@ -27,13 +27,13 @@ QParallelAnimationGroup* QParallelAnimationGroup_new(); QParallelAnimationGroup* QParallelAnimationGroup_new2(QObject* parent); QMetaObject* QParallelAnimationGroup_MetaObject(const QParallelAnimationGroup* self); void* QParallelAnimationGroup_Metacast(QParallelAnimationGroup* self, const char* param1); -struct miqt_string* QParallelAnimationGroup_Tr(const char* s); -struct miqt_string* QParallelAnimationGroup_TrUtf8(const char* s); +struct miqt_string QParallelAnimationGroup_Tr(const char* s); +struct miqt_string QParallelAnimationGroup_TrUtf8(const char* s); int QParallelAnimationGroup_Duration(const QParallelAnimationGroup* self); -struct miqt_string* QParallelAnimationGroup_Tr2(const char* s, const char* c); -struct miqt_string* QParallelAnimationGroup_Tr3(const char* s, const char* c, int n); -struct miqt_string* QParallelAnimationGroup_TrUtf82(const char* s, const char* c); -struct miqt_string* QParallelAnimationGroup_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QParallelAnimationGroup_Tr2(const char* s, const char* c); +struct miqt_string QParallelAnimationGroup_Tr3(const char* s, const char* c, int n); +struct miqt_string QParallelAnimationGroup_TrUtf82(const char* s, const char* c); +struct miqt_string QParallelAnimationGroup_TrUtf83(const char* s, const char* c, int n); void QParallelAnimationGroup_Delete(QParallelAnimationGroup* self); #ifdef __cplusplus diff --git a/qt/gen_qpauseanimation.cpp b/qt/gen_qpauseanimation.cpp index 94e1b66e..c5a7079c 100644 --- a/qt/gen_qpauseanimation.cpp +++ b/qt/gen_qpauseanimation.cpp @@ -32,18 +32,26 @@ void* QPauseAnimation_Metacast(QPauseAnimation* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QPauseAnimation_Tr(const char* s) { +struct miqt_string QPauseAnimation_Tr(const char* s) { QString _ret = QPauseAnimation::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPauseAnimation_TrUtf8(const char* s) { +struct miqt_string QPauseAnimation_TrUtf8(const char* s) { QString _ret = QPauseAnimation::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QPauseAnimation_Duration(const QPauseAnimation* self) { @@ -54,32 +62,48 @@ void QPauseAnimation_SetDuration(QPauseAnimation* self, int msecs) { self->setDuration(static_cast(msecs)); } -struct miqt_string* QPauseAnimation_Tr2(const char* s, const char* c) { +struct miqt_string QPauseAnimation_Tr2(const char* s, const char* c) { QString _ret = QPauseAnimation::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPauseAnimation_Tr3(const char* s, const char* c, int n) { +struct miqt_string QPauseAnimation_Tr3(const char* s, const char* c, int n) { QString _ret = QPauseAnimation::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPauseAnimation_TrUtf82(const char* s, const char* c) { +struct miqt_string QPauseAnimation_TrUtf82(const char* s, const char* c) { QString _ret = QPauseAnimation::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPauseAnimation_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QPauseAnimation_TrUtf83(const char* s, const char* c, int n) { QString _ret = QPauseAnimation::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QPauseAnimation_Delete(QPauseAnimation* self) { diff --git a/qt/gen_qpauseanimation.go b/qt/gen_qpauseanimation.go index 93a2ab05..3ea227c7 100644 --- a/qt/gen_qpauseanimation.go +++ b/qt/gen_qpauseanimation.go @@ -74,24 +74,24 @@ func (this *QPauseAnimation) MetaObject() *QMetaObject { func (this *QPauseAnimation) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QPauseAnimation_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QPauseAnimation_Metacast(this.h, param1_Cstring)) } func QPauseAnimation_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QPauseAnimation_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPauseAnimation_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QPauseAnimation_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QPauseAnimation_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPauseAnimation_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -108,9 +108,9 @@ func QPauseAnimation_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPauseAnimation_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPauseAnimation_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -119,9 +119,9 @@ func QPauseAnimation_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPauseAnimation_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPauseAnimation_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -130,9 +130,9 @@ func QPauseAnimation_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPauseAnimation_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPauseAnimation_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -141,9 +141,9 @@ func QPauseAnimation_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPauseAnimation_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPauseAnimation_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qpauseanimation.h b/qt/gen_qpauseanimation.h index cd1ad0f3..9223ec62 100644 --- a/qt/gen_qpauseanimation.h +++ b/qt/gen_qpauseanimation.h @@ -29,14 +29,14 @@ QPauseAnimation* QPauseAnimation_new3(QObject* parent); QPauseAnimation* QPauseAnimation_new4(int msecs, QObject* parent); QMetaObject* QPauseAnimation_MetaObject(const QPauseAnimation* self); void* QPauseAnimation_Metacast(QPauseAnimation* self, const char* param1); -struct miqt_string* QPauseAnimation_Tr(const char* s); -struct miqt_string* QPauseAnimation_TrUtf8(const char* s); +struct miqt_string QPauseAnimation_Tr(const char* s); +struct miqt_string QPauseAnimation_TrUtf8(const char* s); int QPauseAnimation_Duration(const QPauseAnimation* self); void QPauseAnimation_SetDuration(QPauseAnimation* self, int msecs); -struct miqt_string* QPauseAnimation_Tr2(const char* s, const char* c); -struct miqt_string* QPauseAnimation_Tr3(const char* s, const char* c, int n); -struct miqt_string* QPauseAnimation_TrUtf82(const char* s, const char* c); -struct miqt_string* QPauseAnimation_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QPauseAnimation_Tr2(const char* s, const char* c); +struct miqt_string QPauseAnimation_Tr3(const char* s, const char* c, int n); +struct miqt_string QPauseAnimation_TrUtf82(const char* s, const char* c); +struct miqt_string QPauseAnimation_TrUtf83(const char* s, const char* c, int n); void QPauseAnimation_Delete(QPauseAnimation* self); #ifdef __cplusplus diff --git a/qt/gen_qpdfwriter.cpp b/qt/gen_qpdfwriter.cpp index cd277433..a477153d 100644 --- a/qt/gen_qpdfwriter.cpp +++ b/qt/gen_qpdfwriter.cpp @@ -11,8 +11,8 @@ #include "gen_qpdfwriter.h" #include "_cgo_export.h" -QPdfWriter* QPdfWriter_new(struct miqt_string* filename) { - QString filename_QString = QString::fromUtf8(&filename->data, filename->len); +QPdfWriter* QPdfWriter_new(struct miqt_string filename) { + QString filename_QString = QString::fromUtf8(filename.data, filename.len); return new QPdfWriter(filename_QString); } @@ -28,18 +28,26 @@ void* QPdfWriter_Metacast(QPdfWriter* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QPdfWriter_Tr(const char* s) { +struct miqt_string QPdfWriter_Tr(const char* s) { QString _ret = QPdfWriter::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPdfWriter_TrUtf8(const char* s) { +struct miqt_string QPdfWriter_TrUtf8(const char* s) { QString _ret = QPdfWriter::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QPdfWriter_SetPdfVersion(QPdfWriter* self, int version) { @@ -51,27 +59,35 @@ int QPdfWriter_PdfVersion(const QPdfWriter* self) { return static_cast(_ret); } -struct miqt_string* QPdfWriter_Title(const QPdfWriter* self) { +struct miqt_string QPdfWriter_Title(const QPdfWriter* self) { QString _ret = self->title(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QPdfWriter_SetTitle(QPdfWriter* self, struct miqt_string* title) { - QString title_QString = QString::fromUtf8(&title->data, title->len); +void QPdfWriter_SetTitle(QPdfWriter* self, struct miqt_string title) { + QString title_QString = QString::fromUtf8(title.data, title.len); self->setTitle(title_QString); } -struct miqt_string* QPdfWriter_Creator(const QPdfWriter* self) { +struct miqt_string QPdfWriter_Creator(const QPdfWriter* self) { QString _ret = self->creator(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QPdfWriter_SetCreator(QPdfWriter* self, struct miqt_string* creator) { - QString creator_QString = QString::fromUtf8(&creator->data, creator->len); +void QPdfWriter_SetCreator(QPdfWriter* self, struct miqt_string creator) { + QString creator_QString = QString::fromUtf8(creator.data, creator.len); self->setCreator(creator_QString); } @@ -87,17 +103,24 @@ int QPdfWriter_Resolution(const QPdfWriter* self) { return self->resolution(); } -void QPdfWriter_SetDocumentXmpMetadata(QPdfWriter* self, QByteArray* xmpMetadata) { - self->setDocumentXmpMetadata(*xmpMetadata); +void QPdfWriter_SetDocumentXmpMetadata(QPdfWriter* self, struct miqt_string xmpMetadata) { + QByteArray xmpMetadata_QByteArray(xmpMetadata.data, xmpMetadata.len); + self->setDocumentXmpMetadata(xmpMetadata_QByteArray); } -QByteArray* QPdfWriter_DocumentXmpMetadata(const QPdfWriter* self) { - return new QByteArray(self->documentXmpMetadata()); +struct miqt_string QPdfWriter_DocumentXmpMetadata(const QPdfWriter* self) { + QByteArray _qb = self->documentXmpMetadata(); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } -void QPdfWriter_AddFileAttachment(QPdfWriter* self, struct miqt_string* fileName, QByteArray* data) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); - self->addFileAttachment(fileName_QString, *data); +void QPdfWriter_AddFileAttachment(QPdfWriter* self, struct miqt_string fileName, struct miqt_string data) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); + QByteArray data_QByteArray(data.data, data.len); + self->addFileAttachment(fileName_QString, data_QByteArray); } void QPdfWriter_SetPageSize(QPdfWriter* self, int size) { @@ -112,38 +135,55 @@ void QPdfWriter_SetMargins(QPdfWriter* self, QPagedPaintDevice__Margins* m) { self->setMargins(*m); } -struct miqt_string* QPdfWriter_Tr2(const char* s, const char* c) { +struct miqt_string QPdfWriter_Tr2(const char* s, const char* c) { QString _ret = QPdfWriter::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPdfWriter_Tr3(const char* s, const char* c, int n) { +struct miqt_string QPdfWriter_Tr3(const char* s, const char* c, int n) { QString _ret = QPdfWriter::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPdfWriter_TrUtf82(const char* s, const char* c) { +struct miqt_string QPdfWriter_TrUtf82(const char* s, const char* c) { QString _ret = QPdfWriter::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPdfWriter_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QPdfWriter_TrUtf83(const char* s, const char* c, int n) { QString _ret = QPdfWriter::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QPdfWriter_AddFileAttachment3(QPdfWriter* self, struct miqt_string* fileName, QByteArray* data, struct miqt_string* mimeType) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); - QString mimeType_QString = QString::fromUtf8(&mimeType->data, mimeType->len); - self->addFileAttachment(fileName_QString, *data, mimeType_QString); +void QPdfWriter_AddFileAttachment3(QPdfWriter* self, struct miqt_string fileName, struct miqt_string data, struct miqt_string mimeType) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); + QByteArray data_QByteArray(data.data, data.len); + QString mimeType_QString = QString::fromUtf8(mimeType.data, mimeType.len); + self->addFileAttachment(fileName_QString, data_QByteArray, mimeType_QString); } void QPdfWriter_Delete(QPdfWriter* self) { diff --git a/qt/gen_qpdfwriter.go b/qt/gen_qpdfwriter.go index 41acce34..81418b1f 100644 --- a/qt/gen_qpdfwriter.go +++ b/qt/gen_qpdfwriter.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -47,9 +46,11 @@ func UnsafeNewQPdfWriter(h unsafe.Pointer) *QPdfWriter { // NewQPdfWriter constructs a new QPdfWriter object. func NewQPdfWriter(filename string) *QPdfWriter { - filename_ms := libmiqt.Strdupg(filename) - defer C.free(filename_ms) - ret := C.QPdfWriter_new((*C.struct_miqt_string)(filename_ms)) + filename_ms := C.struct_miqt_string{} + filename_ms.data = C.CString(filename) + filename_ms.len = C.size_t(len(filename)) + defer C.free(unsafe.Pointer(filename_ms.data)) + ret := C.QPdfWriter_new(filename_ms) return newQPdfWriter(ret) } @@ -66,24 +67,24 @@ func (this *QPdfWriter) MetaObject() *QMetaObject { func (this *QPdfWriter) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QPdfWriter_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QPdfWriter_Metacast(this.h, param1_Cstring)) } func QPdfWriter_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QPdfWriter_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPdfWriter_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QPdfWriter_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QPdfWriter_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPdfWriter_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -96,29 +97,33 @@ func (this *QPdfWriter) PdfVersion() QPagedPaintDevice__PdfVersion { } func (this *QPdfWriter) Title() string { - var _ms *C.struct_miqt_string = C.QPdfWriter_Title(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPdfWriter_Title(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QPdfWriter) SetTitle(title string) { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - C.QPdfWriter_SetTitle(this.h, (*C.struct_miqt_string)(title_ms)) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + C.QPdfWriter_SetTitle(this.h, title_ms) } func (this *QPdfWriter) Creator() string { - var _ms *C.struct_miqt_string = C.QPdfWriter_Creator(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPdfWriter_Creator(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QPdfWriter) SetCreator(creator string) { - creator_ms := libmiqt.Strdupg(creator) - defer C.free(creator_ms) - C.QPdfWriter_SetCreator(this.h, (*C.struct_miqt_string)(creator_ms)) + creator_ms := C.struct_miqt_string{} + creator_ms.data = C.CString(creator) + creator_ms.len = C.size_t(len(creator)) + defer C.free(unsafe.Pointer(creator_ms.data)) + C.QPdfWriter_SetCreator(this.h, creator_ms) } func (this *QPdfWriter) NewPage() bool { @@ -133,21 +138,29 @@ func (this *QPdfWriter) Resolution() int { return (int)(C.QPdfWriter_Resolution(this.h)) } -func (this *QPdfWriter) SetDocumentXmpMetadata(xmpMetadata *QByteArray) { - C.QPdfWriter_SetDocumentXmpMetadata(this.h, xmpMetadata.cPointer()) +func (this *QPdfWriter) SetDocumentXmpMetadata(xmpMetadata []byte) { + xmpMetadata_alias := C.struct_miqt_string{} + xmpMetadata_alias.data = (*C.char)(unsafe.Pointer(&xmpMetadata[0])) + xmpMetadata_alias.len = C.size_t(len(xmpMetadata)) + C.QPdfWriter_SetDocumentXmpMetadata(this.h, xmpMetadata_alias) } -func (this *QPdfWriter) DocumentXmpMetadata() *QByteArray { - _ret := C.QPdfWriter_DocumentXmpMetadata(this.h) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QPdfWriter) DocumentXmpMetadata() []byte { + var _bytearray C.struct_miqt_string = C.QPdfWriter_DocumentXmpMetadata(this.h) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } -func (this *QPdfWriter) AddFileAttachment(fileName string, data *QByteArray) { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - C.QPdfWriter_AddFileAttachment(this.h, (*C.struct_miqt_string)(fileName_ms), data.cPointer()) +func (this *QPdfWriter) AddFileAttachment(fileName string, data []byte) { + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + data_alias := C.struct_miqt_string{} + data_alias.data = (*C.char)(unsafe.Pointer(&data[0])) + data_alias.len = C.size_t(len(data)) + C.QPdfWriter_AddFileAttachment(this.h, fileName_ms, data_alias) } func (this *QPdfWriter) SetPageSize(size QPagedPaintDevice__PageSize) { @@ -167,9 +180,9 @@ func QPdfWriter_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPdfWriter_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPdfWriter_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -178,9 +191,9 @@ func QPdfWriter_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPdfWriter_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPdfWriter_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -189,9 +202,9 @@ func QPdfWriter_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPdfWriter_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPdfWriter_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -200,18 +213,25 @@ func QPdfWriter_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPdfWriter_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPdfWriter_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } -func (this *QPdfWriter) AddFileAttachment3(fileName string, data *QByteArray, mimeType string) { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - mimeType_ms := libmiqt.Strdupg(mimeType) - defer C.free(mimeType_ms) - C.QPdfWriter_AddFileAttachment3(this.h, (*C.struct_miqt_string)(fileName_ms), data.cPointer(), (*C.struct_miqt_string)(mimeType_ms)) +func (this *QPdfWriter) AddFileAttachment3(fileName string, data []byte, mimeType string) { + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + data_alias := C.struct_miqt_string{} + data_alias.data = (*C.char)(unsafe.Pointer(&data[0])) + data_alias.len = C.size_t(len(data)) + mimeType_ms := C.struct_miqt_string{} + mimeType_ms.data = C.CString(mimeType) + mimeType_ms.len = C.size_t(len(mimeType)) + defer C.free(unsafe.Pointer(mimeType_ms.data)) + C.QPdfWriter_AddFileAttachment3(this.h, fileName_ms, data_alias, mimeType_ms) } // Delete this object from C++ memory. diff --git a/qt/gen_qpdfwriter.h b/qt/gen_qpdfwriter.h index 8684dd00..76e48292 100644 --- a/qt/gen_qpdfwriter.h +++ b/qt/gen_qpdfwriter.h @@ -33,32 +33,32 @@ typedef struct QPdfWriter QPdfWriter; typedef struct QSizeF QSizeF; #endif -QPdfWriter* QPdfWriter_new(struct miqt_string* filename); +QPdfWriter* QPdfWriter_new(struct miqt_string filename); QPdfWriter* QPdfWriter_new2(QIODevice* device); QMetaObject* QPdfWriter_MetaObject(const QPdfWriter* self); void* QPdfWriter_Metacast(QPdfWriter* self, const char* param1); -struct miqt_string* QPdfWriter_Tr(const char* s); -struct miqt_string* QPdfWriter_TrUtf8(const char* s); +struct miqt_string QPdfWriter_Tr(const char* s); +struct miqt_string QPdfWriter_TrUtf8(const char* s); void QPdfWriter_SetPdfVersion(QPdfWriter* self, int version); int QPdfWriter_PdfVersion(const QPdfWriter* self); -struct miqt_string* QPdfWriter_Title(const QPdfWriter* self); -void QPdfWriter_SetTitle(QPdfWriter* self, struct miqt_string* title); -struct miqt_string* QPdfWriter_Creator(const QPdfWriter* self); -void QPdfWriter_SetCreator(QPdfWriter* self, struct miqt_string* creator); +struct miqt_string QPdfWriter_Title(const QPdfWriter* self); +void QPdfWriter_SetTitle(QPdfWriter* self, struct miqt_string title); +struct miqt_string QPdfWriter_Creator(const QPdfWriter* self); +void QPdfWriter_SetCreator(QPdfWriter* self, struct miqt_string creator); bool QPdfWriter_NewPage(QPdfWriter* self); void QPdfWriter_SetResolution(QPdfWriter* self, int resolution); int QPdfWriter_Resolution(const QPdfWriter* self); -void QPdfWriter_SetDocumentXmpMetadata(QPdfWriter* self, QByteArray* xmpMetadata); -QByteArray* QPdfWriter_DocumentXmpMetadata(const QPdfWriter* self); -void QPdfWriter_AddFileAttachment(QPdfWriter* self, struct miqt_string* fileName, QByteArray* data); +void QPdfWriter_SetDocumentXmpMetadata(QPdfWriter* self, struct miqt_string xmpMetadata); +struct miqt_string QPdfWriter_DocumentXmpMetadata(const QPdfWriter* self); +void QPdfWriter_AddFileAttachment(QPdfWriter* self, struct miqt_string fileName, struct miqt_string data); void QPdfWriter_SetPageSize(QPdfWriter* self, int size); void QPdfWriter_SetPageSizeMM(QPdfWriter* self, QSizeF* size); void QPdfWriter_SetMargins(QPdfWriter* self, QPagedPaintDevice__Margins* m); -struct miqt_string* QPdfWriter_Tr2(const char* s, const char* c); -struct miqt_string* QPdfWriter_Tr3(const char* s, const char* c, int n); -struct miqt_string* QPdfWriter_TrUtf82(const char* s, const char* c); -struct miqt_string* QPdfWriter_TrUtf83(const char* s, const char* c, int n); -void QPdfWriter_AddFileAttachment3(QPdfWriter* self, struct miqt_string* fileName, QByteArray* data, struct miqt_string* mimeType); +struct miqt_string QPdfWriter_Tr2(const char* s, const char* c); +struct miqt_string QPdfWriter_Tr3(const char* s, const char* c, int n); +struct miqt_string QPdfWriter_TrUtf82(const char* s, const char* c); +struct miqt_string QPdfWriter_TrUtf83(const char* s, const char* c, int n); +void QPdfWriter_AddFileAttachment3(QPdfWriter* self, struct miqt_string fileName, struct miqt_string data, struct miqt_string mimeType); void QPdfWriter_Delete(QPdfWriter* self); #ifdef __cplusplus diff --git a/qt/gen_qpicture.cpp b/qt/gen_qpicture.cpp index 3e818386..c824fc7a 100644 --- a/qt/gen_qpicture.cpp +++ b/qt/gen_qpicture.cpp @@ -54,8 +54,8 @@ bool QPicture_Load(QPicture* self, QIODevice* dev) { return self->load(dev); } -bool QPicture_LoadWithFileName(QPicture* self, struct miqt_string* fileName) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +bool QPicture_LoadWithFileName(QPicture* self, struct miqt_string fileName) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); return self->load(fileName_QString); } @@ -63,8 +63,8 @@ bool QPicture_Save(QPicture* self, QIODevice* dev) { return self->save(dev); } -bool QPicture_SaveWithFileName(QPicture* self, struct miqt_string* fileName) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +bool QPicture_SaveWithFileName(QPicture* self, struct miqt_string fileName) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); return self->save(fileName_QString); } @@ -92,17 +92,22 @@ bool QPicture_IsDetached(const QPicture* self) { return self->isDetached(); } -const char* QPicture_PictureFormat(struct miqt_string* fileName) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +const char* QPicture_PictureFormat(struct miqt_string fileName) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); return (const char*) QPicture::pictureFormat(fileName_QString); } struct miqt_array* QPicture_InputFormats() { QList _ret = QPicture::inputFormats(); // Convert QList<> from C++ memory to manually-managed C memory - QByteArray** _arr = static_cast(malloc(sizeof(QByteArray*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { - _arr[i] = new QByteArray(_ret[i]); + QByteArray _lv_qb = _ret[i]; + struct miqt_string _lv_ms; + _lv_ms.len = _lv_qb.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_qb.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -113,9 +118,14 @@ struct miqt_array* QPicture_InputFormats() { struct miqt_array* QPicture_OutputFormats() { QList _ret = QPicture::outputFormats(); // Convert QList<> from C++ memory to manually-managed C memory - QByteArray** _arr = static_cast(malloc(sizeof(QByteArray*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { - _arr[i] = new QByteArray(_ret[i]); + QByteArray _lv_qb = _ret[i]; + struct miqt_string _lv_ms; + _lv_ms.len = _lv_qb.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_qb.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -126,12 +136,16 @@ struct miqt_array* QPicture_OutputFormats() { struct miqt_array* QPicture_InputFormatList() { QStringList _ret = QPicture::inputFormatList(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -142,12 +156,16 @@ struct miqt_array* QPicture_InputFormatList() { struct miqt_array* QPicture_OutputFormatList() { QStringList _ret = QPicture::outputFormatList(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -163,8 +181,8 @@ bool QPicture_Load2(QPicture* self, QIODevice* dev, const char* format) { return self->load(dev, format); } -bool QPicture_Load22(QPicture* self, struct miqt_string* fileName, const char* format) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +bool QPicture_Load22(QPicture* self, struct miqt_string fileName, const char* format) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); return self->load(fileName_QString, format); } @@ -172,8 +190,8 @@ bool QPicture_Save2(QPicture* self, QIODevice* dev, const char* format) { return self->save(dev, format); } -bool QPicture_Save22(QPicture* self, struct miqt_string* fileName, const char* format) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +bool QPicture_Save22(QPicture* self, struct miqt_string fileName, const char* format) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); return self->save(fileName_QString, format); } @@ -189,8 +207,8 @@ QPictureIO* QPictureIO_new2(QIODevice* ioDevice, const char* format) { return new QPictureIO(ioDevice, format); } -QPictureIO* QPictureIO_new3(struct miqt_string* fileName, const char* format) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +QPictureIO* QPictureIO_new3(struct miqt_string fileName, const char* format) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); return new QPictureIO(fileName_QString, format); } @@ -212,22 +230,30 @@ QIODevice* QPictureIO_IoDevice(const QPictureIO* self) { return self->ioDevice(); } -struct miqt_string* QPictureIO_FileName(const QPictureIO* self) { +struct miqt_string QPictureIO_FileName(const QPictureIO* self) { QString _ret = self->fileName(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QPictureIO_Quality(const QPictureIO* self) { return self->quality(); } -struct miqt_string* QPictureIO_Description(const QPictureIO* self) { +struct miqt_string QPictureIO_Description(const QPictureIO* self) { QString _ret = self->description(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } const char* QPictureIO_Parameters(const QPictureIO* self) { @@ -254,8 +280,8 @@ void QPictureIO_SetIODevice(QPictureIO* self, QIODevice* iODevice) { self->setIODevice(iODevice); } -void QPictureIO_SetFileName(QPictureIO* self, struct miqt_string* fileName) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +void QPictureIO_SetFileName(QPictureIO* self, struct miqt_string fileName) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); self->setFileName(fileName_QString); } @@ -263,8 +289,8 @@ void QPictureIO_SetQuality(QPictureIO* self, int quality) { self->setQuality(static_cast(quality)); } -void QPictureIO_SetDescription(QPictureIO* self, struct miqt_string* description) { - QString description_QString = QString::fromUtf8(&description->data, description->len); +void QPictureIO_SetDescription(QPictureIO* self, struct miqt_string description) { + QString description_QString = QString::fromUtf8(description.data, description.len); self->setDescription(description_QString); } @@ -284,21 +310,36 @@ bool QPictureIO_Write(QPictureIO* self) { return self->write(); } -QByteArray* QPictureIO_PictureFormat(struct miqt_string* fileName) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); - return new QByteArray(QPictureIO::pictureFormat(fileName_QString)); +struct miqt_string QPictureIO_PictureFormat(struct miqt_string fileName) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); + QByteArray _qb = QPictureIO::pictureFormat(fileName_QString); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } -QByteArray* QPictureIO_PictureFormatWithQIODevice(QIODevice* param1) { - return new QByteArray(QPictureIO::pictureFormat(param1)); +struct miqt_string QPictureIO_PictureFormatWithQIODevice(QIODevice* param1) { + QByteArray _qb = QPictureIO::pictureFormat(param1); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } struct miqt_array* QPictureIO_InputFormats() { QList _ret = QPictureIO::inputFormats(); // Convert QList<> from C++ memory to manually-managed C memory - QByteArray** _arr = static_cast(malloc(sizeof(QByteArray*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { - _arr[i] = new QByteArray(_ret[i]); + QByteArray _lv_qb = _ret[i]; + struct miqt_string _lv_ms; + _lv_ms.len = _lv_qb.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_qb.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -309,9 +350,14 @@ struct miqt_array* QPictureIO_InputFormats() { struct miqt_array* QPictureIO_OutputFormats() { QList _ret = QPictureIO::outputFormats(); // Convert QList<> from C++ memory to manually-managed C memory - QByteArray** _arr = static_cast(malloc(sizeof(QByteArray*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { - _arr[i] = new QByteArray(_ret[i]); + QByteArray _lv_qb = _ret[i]; + struct miqt_string _lv_ms; + _lv_ms.len = _lv_qb.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_qb.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); diff --git a/qt/gen_qpicture.go b/qt/gen_qpicture.go index fa1c73ea..85f1546d 100644 --- a/qt/gen_qpicture.go +++ b/qt/gen_qpicture.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -74,9 +73,9 @@ func (this *QPicture) Size() uint { return (uint)(C.QPicture_Size(this.h)) } -func (this *QPicture) Data() unsafe.Pointer { +func (this *QPicture) Data() string { _ret := C.QPicture_Data(this.h) - return (unsafe.Pointer)(_ret) + return C.GoString(_ret) } func (this *QPicture) SetData(data string, size uint) { @@ -94,9 +93,11 @@ func (this *QPicture) Load(dev *QIODevice) bool { } func (this *QPicture) LoadWithFileName(fileName string) bool { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - return (bool)(C.QPicture_LoadWithFileName(this.h, (*C.struct_miqt_string)(fileName_ms))) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + return (bool)(C.QPicture_LoadWithFileName(this.h, fileName_ms)) } func (this *QPicture) Save(dev *QIODevice) bool { @@ -104,9 +105,11 @@ func (this *QPicture) Save(dev *QIODevice) bool { } func (this *QPicture) SaveWithFileName(fileName string) bool { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - return (bool)(C.QPicture_SaveWithFileName(this.h, (*C.struct_miqt_string)(fileName_ms))) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + return (bool)(C.QPicture_SaveWithFileName(this.h, fileName_ms)) } func (this *QPicture) BoundingRect() *QRect { @@ -136,36 +139,38 @@ func (this *QPicture) IsDetached() bool { return (bool)(C.QPicture_IsDetached(this.h)) } -func QPicture_PictureFormat(fileName string) unsafe.Pointer { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - _ret := C.QPicture_PictureFormat((*C.struct_miqt_string)(fileName_ms)) - return (unsafe.Pointer)(_ret) +func QPicture_PictureFormat(fileName string) string { + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + _ret := C.QPicture_PictureFormat(fileName_ms) + return C.GoString(_ret) } -func QPicture_InputFormats() []QByteArray { +func QPicture_InputFormats() [][]byte { var _ma *C.struct_miqt_array = C.QPicture_InputFormats() - _ret := make([]QByteArray, int(_ma.len)) - _outCast := (*[0xffff]*C.QByteArray)(unsafe.Pointer(_ma.data)) // hey ya + _ret := make([][]byte, int(_ma.len)) + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - _lv_ret := _outCast[i] - _lv_goptr := newQByteArray(_lv_ret) - _lv_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - _ret[i] = *_lv_goptr + var _lv_bytearray C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoBytes(unsafe.Pointer(_lv_bytearray.data), C.int(int64(_lv_bytearray.len))) + C.free(unsafe.Pointer(_lv_bytearray.data)) + _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) return _ret } -func QPicture_OutputFormats() []QByteArray { +func QPicture_OutputFormats() [][]byte { var _ma *C.struct_miqt_array = C.QPicture_OutputFormats() - _ret := make([]QByteArray, int(_ma.len)) - _outCast := (*[0xffff]*C.QByteArray)(unsafe.Pointer(_ma.data)) // hey ya + _ret := make([][]byte, int(_ma.len)) + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - _lv_ret := _outCast[i] - _lv_goptr := newQByteArray(_lv_ret) - _lv_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - _ret[i] = *_lv_goptr + var _lv_bytearray C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoBytes(unsafe.Pointer(_lv_bytearray.data), C.int(int64(_lv_bytearray.len))) + C.free(unsafe.Pointer(_lv_bytearray.data)) + _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) return _ret @@ -174,11 +179,11 @@ func QPicture_OutputFormats() []QByteArray { func QPicture_InputFormatList() []string { var _ma *C.struct_miqt_array = C.QPicture_InputFormatList() _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -188,11 +193,11 @@ func QPicture_InputFormatList() []string { func QPicture_OutputFormatList() []string { var _ma *C.struct_miqt_array = C.QPicture_OutputFormatList() _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -210,11 +215,13 @@ func (this *QPicture) Load2(dev *QIODevice, format string) bool { } func (this *QPicture) Load22(fileName string, format string) bool { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) format_Cstring := C.CString(format) defer C.free(unsafe.Pointer(format_Cstring)) - return (bool)(C.QPicture_Load22(this.h, (*C.struct_miqt_string)(fileName_ms), format_Cstring)) + return (bool)(C.QPicture_Load22(this.h, fileName_ms, format_Cstring)) } func (this *QPicture) Save2(dev *QIODevice, format string) bool { @@ -224,11 +231,13 @@ func (this *QPicture) Save2(dev *QIODevice, format string) bool { } func (this *QPicture) Save22(fileName string, format string) bool { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) format_Cstring := C.CString(format) defer C.free(unsafe.Pointer(format_Cstring)) - return (bool)(C.QPicture_Save22(this.h, (*C.struct_miqt_string)(fileName_ms), format_Cstring)) + return (bool)(C.QPicture_Save22(this.h, fileName_ms, format_Cstring)) } // Delete this object from C++ memory. @@ -290,11 +299,13 @@ func NewQPictureIO2(ioDevice *QIODevice, format string) *QPictureIO { // NewQPictureIO3 constructs a new QPictureIO object. func NewQPictureIO3(fileName string, format string) *QPictureIO { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) format_Cstring := C.CString(format) defer C.free(unsafe.Pointer(format_Cstring)) - ret := C.QPictureIO_new3((*C.struct_miqt_string)(fileName_ms), format_Cstring) + ret := C.QPictureIO_new3(fileName_ms, format_Cstring) return newQPictureIO(ret) } @@ -306,9 +317,9 @@ func (this *QPictureIO) Status() int { return (int)(C.QPictureIO_Status(this.h)) } -func (this *QPictureIO) Format() unsafe.Pointer { +func (this *QPictureIO) Format() string { _ret := C.QPictureIO_Format(this.h) - return (unsafe.Pointer)(_ret) + return C.GoString(_ret) } func (this *QPictureIO) IoDevice() *QIODevice { @@ -316,9 +327,9 @@ func (this *QPictureIO) IoDevice() *QIODevice { } func (this *QPictureIO) FileName() string { - var _ms *C.struct_miqt_string = C.QPictureIO_FileName(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPictureIO_FileName(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -327,15 +338,15 @@ func (this *QPictureIO) Quality() int { } func (this *QPictureIO) Description() string { - var _ms *C.struct_miqt_string = C.QPictureIO_Description(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPictureIO_Description(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } -func (this *QPictureIO) Parameters() unsafe.Pointer { +func (this *QPictureIO) Parameters() string { _ret := C.QPictureIO_Parameters(this.h) - return (unsafe.Pointer)(_ret) + return C.GoString(_ret) } func (this *QPictureIO) Gamma() float32 { @@ -361,9 +372,11 @@ func (this *QPictureIO) SetIODevice(iODevice *QIODevice) { } func (this *QPictureIO) SetFileName(fileName string) { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - C.QPictureIO_SetFileName(this.h, (*C.struct_miqt_string)(fileName_ms)) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + C.QPictureIO_SetFileName(this.h, fileName_ms) } func (this *QPictureIO) SetQuality(quality int) { @@ -371,9 +384,11 @@ func (this *QPictureIO) SetQuality(quality int) { } func (this *QPictureIO) SetDescription(description string) { - description_ms := libmiqt.Strdupg(description) - defer C.free(description_ms) - C.QPictureIO_SetDescription(this.h, (*C.struct_miqt_string)(description_ms)) + description_ms := C.struct_miqt_string{} + description_ms.data = C.CString(description) + description_ms.len = C.size_t(len(description)) + defer C.free(unsafe.Pointer(description_ms.data)) + C.QPictureIO_SetDescription(this.h, description_ms) } func (this *QPictureIO) SetParameters(parameters string) { @@ -394,45 +409,47 @@ func (this *QPictureIO) Write() bool { return (bool)(C.QPictureIO_Write(this.h)) } -func QPictureIO_PictureFormat(fileName string) *QByteArray { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - _ret := C.QPictureIO_PictureFormat((*C.struct_miqt_string)(fileName_ms)) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func QPictureIO_PictureFormat(fileName string) []byte { + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + var _bytearray C.struct_miqt_string = C.QPictureIO_PictureFormat(fileName_ms) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } -func QPictureIO_PictureFormatWithQIODevice(param1 *QIODevice) *QByteArray { - _ret := C.QPictureIO_PictureFormatWithQIODevice(param1.cPointer()) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func QPictureIO_PictureFormatWithQIODevice(param1 *QIODevice) []byte { + var _bytearray C.struct_miqt_string = C.QPictureIO_PictureFormatWithQIODevice(param1.cPointer()) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } -func QPictureIO_InputFormats() []QByteArray { +func QPictureIO_InputFormats() [][]byte { var _ma *C.struct_miqt_array = C.QPictureIO_InputFormats() - _ret := make([]QByteArray, int(_ma.len)) - _outCast := (*[0xffff]*C.QByteArray)(unsafe.Pointer(_ma.data)) // hey ya + _ret := make([][]byte, int(_ma.len)) + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - _lv_ret := _outCast[i] - _lv_goptr := newQByteArray(_lv_ret) - _lv_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - _ret[i] = *_lv_goptr + var _lv_bytearray C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoBytes(unsafe.Pointer(_lv_bytearray.data), C.int(int64(_lv_bytearray.len))) + C.free(unsafe.Pointer(_lv_bytearray.data)) + _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) return _ret } -func QPictureIO_OutputFormats() []QByteArray { +func QPictureIO_OutputFormats() [][]byte { var _ma *C.struct_miqt_array = C.QPictureIO_OutputFormats() - _ret := make([]QByteArray, int(_ma.len)) - _outCast := (*[0xffff]*C.QByteArray)(unsafe.Pointer(_ma.data)) // hey ya + _ret := make([][]byte, int(_ma.len)) + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - _lv_ret := _outCast[i] - _lv_goptr := newQByteArray(_lv_ret) - _lv_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - _ret[i] = *_lv_goptr + var _lv_bytearray C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoBytes(unsafe.Pointer(_lv_bytearray.data), C.int(int64(_lv_bytearray.len))) + C.free(unsafe.Pointer(_lv_bytearray.data)) + _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) return _ret diff --git a/qt/gen_qpicture.h b/qt/gen_qpicture.h index f1664f79..14489d53 100644 --- a/qt/gen_qpicture.h +++ b/qt/gen_qpicture.h @@ -41,52 +41,52 @@ const char* QPicture_Data(const QPicture* self); void QPicture_SetData(QPicture* self, const char* data, unsigned int size); bool QPicture_Play(QPicture* self, QPainter* p); bool QPicture_Load(QPicture* self, QIODevice* dev); -bool QPicture_LoadWithFileName(QPicture* self, struct miqt_string* fileName); +bool QPicture_LoadWithFileName(QPicture* self, struct miqt_string fileName); bool QPicture_Save(QPicture* self, QIODevice* dev); -bool QPicture_SaveWithFileName(QPicture* self, struct miqt_string* fileName); +bool QPicture_SaveWithFileName(QPicture* self, struct miqt_string fileName); QRect* QPicture_BoundingRect(const QPicture* self); void QPicture_SetBoundingRect(QPicture* self, QRect* r); void QPicture_OperatorAssign(QPicture* self, QPicture* p); void QPicture_Swap(QPicture* self, QPicture* other); void QPicture_Detach(QPicture* self); bool QPicture_IsDetached(const QPicture* self); -const char* QPicture_PictureFormat(struct miqt_string* fileName); +const char* QPicture_PictureFormat(struct miqt_string fileName); struct miqt_array* QPicture_InputFormats(); struct miqt_array* QPicture_OutputFormats(); struct miqt_array* QPicture_InputFormatList(); struct miqt_array* QPicture_OutputFormatList(); QPaintEngine* QPicture_PaintEngine(const QPicture* self); bool QPicture_Load2(QPicture* self, QIODevice* dev, const char* format); -bool QPicture_Load22(QPicture* self, struct miqt_string* fileName, const char* format); +bool QPicture_Load22(QPicture* self, struct miqt_string fileName, const char* format); bool QPicture_Save2(QPicture* self, QIODevice* dev, const char* format); -bool QPicture_Save22(QPicture* self, struct miqt_string* fileName, const char* format); +bool QPicture_Save22(QPicture* self, struct miqt_string fileName, const char* format); void QPicture_Delete(QPicture* self); QPictureIO* QPictureIO_new(); QPictureIO* QPictureIO_new2(QIODevice* ioDevice, const char* format); -QPictureIO* QPictureIO_new3(struct miqt_string* fileName, const char* format); +QPictureIO* QPictureIO_new3(struct miqt_string fileName, const char* format); QPicture* QPictureIO_Picture(const QPictureIO* self); int QPictureIO_Status(const QPictureIO* self); const char* QPictureIO_Format(const QPictureIO* self); QIODevice* QPictureIO_IoDevice(const QPictureIO* self); -struct miqt_string* QPictureIO_FileName(const QPictureIO* self); +struct miqt_string QPictureIO_FileName(const QPictureIO* self); int QPictureIO_Quality(const QPictureIO* self); -struct miqt_string* QPictureIO_Description(const QPictureIO* self); +struct miqt_string QPictureIO_Description(const QPictureIO* self); const char* QPictureIO_Parameters(const QPictureIO* self); float QPictureIO_Gamma(const QPictureIO* self); void QPictureIO_SetPicture(QPictureIO* self, QPicture* picture); void QPictureIO_SetStatus(QPictureIO* self, int status); void QPictureIO_SetFormat(QPictureIO* self, const char* format); void QPictureIO_SetIODevice(QPictureIO* self, QIODevice* iODevice); -void QPictureIO_SetFileName(QPictureIO* self, struct miqt_string* fileName); +void QPictureIO_SetFileName(QPictureIO* self, struct miqt_string fileName); void QPictureIO_SetQuality(QPictureIO* self, int quality); -void QPictureIO_SetDescription(QPictureIO* self, struct miqt_string* description); +void QPictureIO_SetDescription(QPictureIO* self, struct miqt_string description); void QPictureIO_SetParameters(QPictureIO* self, const char* parameters); void QPictureIO_SetGamma(QPictureIO* self, float gamma); bool QPictureIO_Read(QPictureIO* self); bool QPictureIO_Write(QPictureIO* self); -QByteArray* QPictureIO_PictureFormat(struct miqt_string* fileName); -QByteArray* QPictureIO_PictureFormatWithQIODevice(QIODevice* param1); +struct miqt_string QPictureIO_PictureFormat(struct miqt_string fileName); +struct miqt_string QPictureIO_PictureFormatWithQIODevice(QIODevice* param1); struct miqt_array* QPictureIO_InputFormats(); struct miqt_array* QPictureIO_OutputFormats(); void QPictureIO_Delete(QPictureIO* self); diff --git a/qt/gen_qpictureformatplugin.cpp b/qt/gen_qpictureformatplugin.cpp index 02c48cc1..58846cda 100644 --- a/qt/gen_qpictureformatplugin.cpp +++ b/qt/gen_qpictureformatplugin.cpp @@ -16,63 +16,87 @@ void* QPictureFormatPlugin_Metacast(QPictureFormatPlugin* self, const char* para return self->qt_metacast(param1); } -struct miqt_string* QPictureFormatPlugin_Tr(const char* s) { +struct miqt_string QPictureFormatPlugin_Tr(const char* s) { QString _ret = QPictureFormatPlugin::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPictureFormatPlugin_TrUtf8(const char* s) { +struct miqt_string QPictureFormatPlugin_TrUtf8(const char* s) { QString _ret = QPictureFormatPlugin::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -bool QPictureFormatPlugin_LoadPicture(QPictureFormatPlugin* self, struct miqt_string* format, struct miqt_string* filename, QPicture* pic) { - QString format_QString = QString::fromUtf8(&format->data, format->len); - QString filename_QString = QString::fromUtf8(&filename->data, filename->len); +bool QPictureFormatPlugin_LoadPicture(QPictureFormatPlugin* self, struct miqt_string format, struct miqt_string filename, QPicture* pic) { + QString format_QString = QString::fromUtf8(format.data, format.len); + QString filename_QString = QString::fromUtf8(filename.data, filename.len); return self->loadPicture(format_QString, filename_QString, pic); } -bool QPictureFormatPlugin_SavePicture(QPictureFormatPlugin* self, struct miqt_string* format, struct miqt_string* filename, QPicture* pic) { - QString format_QString = QString::fromUtf8(&format->data, format->len); - QString filename_QString = QString::fromUtf8(&filename->data, filename->len); +bool QPictureFormatPlugin_SavePicture(QPictureFormatPlugin* self, struct miqt_string format, struct miqt_string filename, QPicture* pic) { + QString format_QString = QString::fromUtf8(format.data, format.len); + QString filename_QString = QString::fromUtf8(filename.data, filename.len); return self->savePicture(format_QString, filename_QString, *pic); } -bool QPictureFormatPlugin_InstallIOHandler(QPictureFormatPlugin* self, struct miqt_string* format) { - QString format_QString = QString::fromUtf8(&format->data, format->len); +bool QPictureFormatPlugin_InstallIOHandler(QPictureFormatPlugin* self, struct miqt_string format) { + QString format_QString = QString::fromUtf8(format.data, format.len); return self->installIOHandler(format_QString); } -struct miqt_string* QPictureFormatPlugin_Tr2(const char* s, const char* c) { +struct miqt_string QPictureFormatPlugin_Tr2(const char* s, const char* c) { QString _ret = QPictureFormatPlugin::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPictureFormatPlugin_Tr3(const char* s, const char* c, int n) { +struct miqt_string QPictureFormatPlugin_Tr3(const char* s, const char* c, int n) { QString _ret = QPictureFormatPlugin::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPictureFormatPlugin_TrUtf82(const char* s, const char* c) { +struct miqt_string QPictureFormatPlugin_TrUtf82(const char* s, const char* c) { QString _ret = QPictureFormatPlugin::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPictureFormatPlugin_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QPictureFormatPlugin_TrUtf83(const char* s, const char* c, int n) { QString _ret = QPictureFormatPlugin::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QPictureFormatPlugin_Delete(QPictureFormatPlugin* self) { diff --git a/qt/gen_qpictureformatplugin.go b/qt/gen_qpictureformatplugin.go index fbaad83b..b7ef8526 100644 --- a/qt/gen_qpictureformatplugin.go +++ b/qt/gen_qpictureformatplugin.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -51,47 +50,57 @@ func (this *QPictureFormatPlugin) MetaObject() *QMetaObject { func (this *QPictureFormatPlugin) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QPictureFormatPlugin_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QPictureFormatPlugin_Metacast(this.h, param1_Cstring)) } func QPictureFormatPlugin_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QPictureFormatPlugin_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPictureFormatPlugin_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QPictureFormatPlugin_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QPictureFormatPlugin_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPictureFormatPlugin_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QPictureFormatPlugin) LoadPicture(format string, filename string, pic *QPicture) bool { - format_ms := libmiqt.Strdupg(format) - defer C.free(format_ms) - filename_ms := libmiqt.Strdupg(filename) - defer C.free(filename_ms) - return (bool)(C.QPictureFormatPlugin_LoadPicture(this.h, (*C.struct_miqt_string)(format_ms), (*C.struct_miqt_string)(filename_ms), pic.cPointer())) + format_ms := C.struct_miqt_string{} + format_ms.data = C.CString(format) + format_ms.len = C.size_t(len(format)) + defer C.free(unsafe.Pointer(format_ms.data)) + filename_ms := C.struct_miqt_string{} + filename_ms.data = C.CString(filename) + filename_ms.len = C.size_t(len(filename)) + defer C.free(unsafe.Pointer(filename_ms.data)) + return (bool)(C.QPictureFormatPlugin_LoadPicture(this.h, format_ms, filename_ms, pic.cPointer())) } func (this *QPictureFormatPlugin) SavePicture(format string, filename string, pic *QPicture) bool { - format_ms := libmiqt.Strdupg(format) - defer C.free(format_ms) - filename_ms := libmiqt.Strdupg(filename) - defer C.free(filename_ms) - return (bool)(C.QPictureFormatPlugin_SavePicture(this.h, (*C.struct_miqt_string)(format_ms), (*C.struct_miqt_string)(filename_ms), pic.cPointer())) + format_ms := C.struct_miqt_string{} + format_ms.data = C.CString(format) + format_ms.len = C.size_t(len(format)) + defer C.free(unsafe.Pointer(format_ms.data)) + filename_ms := C.struct_miqt_string{} + filename_ms.data = C.CString(filename) + filename_ms.len = C.size_t(len(filename)) + defer C.free(unsafe.Pointer(filename_ms.data)) + return (bool)(C.QPictureFormatPlugin_SavePicture(this.h, format_ms, filename_ms, pic.cPointer())) } func (this *QPictureFormatPlugin) InstallIOHandler(format string) bool { - format_ms := libmiqt.Strdupg(format) - defer C.free(format_ms) - return (bool)(C.QPictureFormatPlugin_InstallIOHandler(this.h, (*C.struct_miqt_string)(format_ms))) + format_ms := C.struct_miqt_string{} + format_ms.data = C.CString(format) + format_ms.len = C.size_t(len(format)) + defer C.free(unsafe.Pointer(format_ms.data)) + return (bool)(C.QPictureFormatPlugin_InstallIOHandler(this.h, format_ms)) } func QPictureFormatPlugin_Tr2(s string, c string) string { @@ -99,9 +108,9 @@ func QPictureFormatPlugin_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPictureFormatPlugin_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPictureFormatPlugin_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -110,9 +119,9 @@ func QPictureFormatPlugin_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPictureFormatPlugin_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPictureFormatPlugin_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -121,9 +130,9 @@ func QPictureFormatPlugin_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPictureFormatPlugin_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPictureFormatPlugin_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -132,9 +141,9 @@ func QPictureFormatPlugin_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPictureFormatPlugin_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPictureFormatPlugin_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qpictureformatplugin.h b/qt/gen_qpictureformatplugin.h index 70215040..ab41dbb9 100644 --- a/qt/gen_qpictureformatplugin.h +++ b/qt/gen_qpictureformatplugin.h @@ -25,15 +25,15 @@ typedef struct QPictureFormatPlugin QPictureFormatPlugin; QMetaObject* QPictureFormatPlugin_MetaObject(const QPictureFormatPlugin* self); void* QPictureFormatPlugin_Metacast(QPictureFormatPlugin* self, const char* param1); -struct miqt_string* QPictureFormatPlugin_Tr(const char* s); -struct miqt_string* QPictureFormatPlugin_TrUtf8(const char* s); -bool QPictureFormatPlugin_LoadPicture(QPictureFormatPlugin* self, struct miqt_string* format, struct miqt_string* filename, QPicture* pic); -bool QPictureFormatPlugin_SavePicture(QPictureFormatPlugin* self, struct miqt_string* format, struct miqt_string* filename, QPicture* pic); -bool QPictureFormatPlugin_InstallIOHandler(QPictureFormatPlugin* self, struct miqt_string* format); -struct miqt_string* QPictureFormatPlugin_Tr2(const char* s, const char* c); -struct miqt_string* QPictureFormatPlugin_Tr3(const char* s, const char* c, int n); -struct miqt_string* QPictureFormatPlugin_TrUtf82(const char* s, const char* c); -struct miqt_string* QPictureFormatPlugin_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QPictureFormatPlugin_Tr(const char* s); +struct miqt_string QPictureFormatPlugin_TrUtf8(const char* s); +bool QPictureFormatPlugin_LoadPicture(QPictureFormatPlugin* self, struct miqt_string format, struct miqt_string filename, QPicture* pic); +bool QPictureFormatPlugin_SavePicture(QPictureFormatPlugin* self, struct miqt_string format, struct miqt_string filename, QPicture* pic); +bool QPictureFormatPlugin_InstallIOHandler(QPictureFormatPlugin* self, struct miqt_string format); +struct miqt_string QPictureFormatPlugin_Tr2(const char* s, const char* c); +struct miqt_string QPictureFormatPlugin_Tr3(const char* s, const char* c, int n); +struct miqt_string QPictureFormatPlugin_TrUtf82(const char* s, const char* c); +struct miqt_string QPictureFormatPlugin_TrUtf83(const char* s, const char* c, int n); void QPictureFormatPlugin_Delete(QPictureFormatPlugin* self); #ifdef __cplusplus diff --git a/qt/gen_qpixmap.cpp b/qt/gen_qpixmap.cpp index 07c6127b..c98bc5b5 100644 --- a/qt/gen_qpixmap.cpp +++ b/qt/gen_qpixmap.cpp @@ -33,8 +33,8 @@ QPixmap* QPixmap_new3(QSize* param1) { return new QPixmap(*param1); } -QPixmap* QPixmap_new4(struct miqt_string* fileName) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +QPixmap* QPixmap_new4(struct miqt_string fileName) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); return new QPixmap(fileName_QString); } @@ -42,13 +42,13 @@ QPixmap* QPixmap_new5(QPixmap* param1) { return new QPixmap(*param1); } -QPixmap* QPixmap_new6(struct miqt_string* fileName, const char* format) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +QPixmap* QPixmap_new6(struct miqt_string fileName, const char* format) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); return new QPixmap(fileName_QString, format); } -QPixmap* QPixmap_new7(struct miqt_string* fileName, const char* format, int flags) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +QPixmap* QPixmap_new7(struct miqt_string fileName, const char* format, int flags) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); return new QPixmap(fileName_QString, format, static_cast(flags)); } @@ -193,8 +193,8 @@ QPixmap* QPixmap_FromImageReader(QImageReader* imageReader) { return new QPixmap(QPixmap::fromImageReader(imageReader)); } -bool QPixmap_Load(QPixmap* self, struct miqt_string* fileName) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +bool QPixmap_Load(QPixmap* self, struct miqt_string fileName) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); return self->load(fileName_QString); } @@ -202,12 +202,13 @@ bool QPixmap_LoadFromData(QPixmap* self, const unsigned char* buf, unsigned int return self->loadFromData(static_cast(buf), static_cast(lenVal)); } -bool QPixmap_LoadFromDataWithData(QPixmap* self, QByteArray* data) { - return self->loadFromData(*data); +bool QPixmap_LoadFromDataWithData(QPixmap* self, struct miqt_string data) { + QByteArray data_QByteArray(data.data, data.len); + return self->loadFromData(data_QByteArray); } -bool QPixmap_Save(const QPixmap* self, struct miqt_string* fileName) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +bool QPixmap_Save(const QPixmap* self, struct miqt_string fileName) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); return self->save(fileName_QString); } @@ -344,13 +345,13 @@ QPixmap* QPixmap_FromImageReader2(QImageReader* imageReader, int flags) { return new QPixmap(QPixmap::fromImageReader(imageReader, static_cast(flags))); } -bool QPixmap_Load2(QPixmap* self, struct miqt_string* fileName, const char* format) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +bool QPixmap_Load2(QPixmap* self, struct miqt_string fileName, const char* format) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); return self->load(fileName_QString, format); } -bool QPixmap_Load3(QPixmap* self, struct miqt_string* fileName, const char* format, int flags) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +bool QPixmap_Load3(QPixmap* self, struct miqt_string fileName, const char* format, int flags) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); return self->load(fileName_QString, format, static_cast(flags)); } @@ -362,21 +363,23 @@ bool QPixmap_LoadFromData4(QPixmap* self, const unsigned char* buf, unsigned int return self->loadFromData(static_cast(buf), static_cast(lenVal), format, static_cast(flags)); } -bool QPixmap_LoadFromData2(QPixmap* self, QByteArray* data, const char* format) { - return self->loadFromData(*data, format); +bool QPixmap_LoadFromData2(QPixmap* self, struct miqt_string data, const char* format) { + QByteArray data_QByteArray(data.data, data.len); + return self->loadFromData(data_QByteArray, format); } -bool QPixmap_LoadFromData32(QPixmap* self, QByteArray* data, const char* format, int flags) { - return self->loadFromData(*data, format, static_cast(flags)); +bool QPixmap_LoadFromData32(QPixmap* self, struct miqt_string data, const char* format, int flags) { + QByteArray data_QByteArray(data.data, data.len); + return self->loadFromData(data_QByteArray, format, static_cast(flags)); } -bool QPixmap_Save2(const QPixmap* self, struct miqt_string* fileName, const char* format) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +bool QPixmap_Save2(const QPixmap* self, struct miqt_string fileName, const char* format) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); return self->save(fileName_QString, format); } -bool QPixmap_Save3(const QPixmap* self, struct miqt_string* fileName, const char* format, int quality) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +bool QPixmap_Save3(const QPixmap* self, struct miqt_string fileName, const char* format, int quality) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); return self->save(fileName_QString, format, static_cast(quality)); } diff --git a/qt/gen_qpixmap.go b/qt/gen_qpixmap.go index 43082bed..2ac6a581 100644 --- a/qt/gen_qpixmap.go +++ b/qt/gen_qpixmap.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -64,9 +63,11 @@ func NewQPixmap3(param1 *QSize) *QPixmap { // NewQPixmap4 constructs a new QPixmap object. func NewQPixmap4(fileName string) *QPixmap { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - ret := C.QPixmap_new4((*C.struct_miqt_string)(fileName_ms)) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + ret := C.QPixmap_new4(fileName_ms) return newQPixmap(ret) } @@ -78,21 +79,25 @@ func NewQPixmap5(param1 *QPixmap) *QPixmap { // NewQPixmap6 constructs a new QPixmap object. func NewQPixmap6(fileName string, format string) *QPixmap { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) format_Cstring := C.CString(format) defer C.free(unsafe.Pointer(format_Cstring)) - ret := C.QPixmap_new6((*C.struct_miqt_string)(fileName_ms), format_Cstring) + ret := C.QPixmap_new6(fileName_ms, format_Cstring) return newQPixmap(ret) } // NewQPixmap7 constructs a new QPixmap object. func NewQPixmap7(fileName string, format string, flags ImageConversionFlag) *QPixmap { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) format_Cstring := C.CString(format) defer C.free(unsafe.Pointer(format_Cstring)) - ret := C.QPixmap_new7((*C.struct_miqt_string)(fileName_ms), format_Cstring, (C.int)(flags)) + ret := C.QPixmap_new7(fileName_ms, format_Cstring, (C.int)(flags)) return newQPixmap(ret) } @@ -294,23 +299,30 @@ func QPixmap_FromImageReader(imageReader *QImageReader) *QPixmap { } func (this *QPixmap) Load(fileName string) bool { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - return (bool)(C.QPixmap_Load(this.h, (*C.struct_miqt_string)(fileName_ms))) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + return (bool)(C.QPixmap_Load(this.h, fileName_ms)) } func (this *QPixmap) LoadFromData(buf *byte, lenVal uint) bool { return (bool)(C.QPixmap_LoadFromData(this.h, (*C.uchar)(unsafe.Pointer(buf)), (C.uint)(lenVal))) } -func (this *QPixmap) LoadFromDataWithData(data *QByteArray) bool { - return (bool)(C.QPixmap_LoadFromDataWithData(this.h, data.cPointer())) +func (this *QPixmap) LoadFromDataWithData(data []byte) bool { + data_alias := C.struct_miqt_string{} + data_alias.data = (*C.char)(unsafe.Pointer(&data[0])) + data_alias.len = C.size_t(len(data)) + return (bool)(C.QPixmap_LoadFromDataWithData(this.h, data_alias)) } func (this *QPixmap) Save(fileName string) bool { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - return (bool)(C.QPixmap_Save(this.h, (*C.struct_miqt_string)(fileName_ms))) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + return (bool)(C.QPixmap_Save(this.h, fileName_ms)) } func (this *QPixmap) SaveWithDevice(device *QIODevice) bool { @@ -512,19 +524,23 @@ func QPixmap_FromImageReader2(imageReader *QImageReader, flags ImageConversionFl } func (this *QPixmap) Load2(fileName string, format string) bool { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) format_Cstring := C.CString(format) defer C.free(unsafe.Pointer(format_Cstring)) - return (bool)(C.QPixmap_Load2(this.h, (*C.struct_miqt_string)(fileName_ms), format_Cstring)) + return (bool)(C.QPixmap_Load2(this.h, fileName_ms, format_Cstring)) } func (this *QPixmap) Load3(fileName string, format string, flags ImageConversionFlag) bool { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) format_Cstring := C.CString(format) defer C.free(unsafe.Pointer(format_Cstring)) - return (bool)(C.QPixmap_Load3(this.h, (*C.struct_miqt_string)(fileName_ms), format_Cstring, (C.int)(flags))) + return (bool)(C.QPixmap_Load3(this.h, fileName_ms, format_Cstring, (C.int)(flags))) } func (this *QPixmap) LoadFromData3(buf *byte, lenVal uint, format string) bool { @@ -539,32 +555,42 @@ func (this *QPixmap) LoadFromData4(buf *byte, lenVal uint, format string, flags return (bool)(C.QPixmap_LoadFromData4(this.h, (*C.uchar)(unsafe.Pointer(buf)), (C.uint)(lenVal), format_Cstring, (C.int)(flags))) } -func (this *QPixmap) LoadFromData2(data *QByteArray, format string) bool { +func (this *QPixmap) LoadFromData2(data []byte, format string) bool { + data_alias := C.struct_miqt_string{} + data_alias.data = (*C.char)(unsafe.Pointer(&data[0])) + data_alias.len = C.size_t(len(data)) format_Cstring := C.CString(format) defer C.free(unsafe.Pointer(format_Cstring)) - return (bool)(C.QPixmap_LoadFromData2(this.h, data.cPointer(), format_Cstring)) + return (bool)(C.QPixmap_LoadFromData2(this.h, data_alias, format_Cstring)) } -func (this *QPixmap) LoadFromData32(data *QByteArray, format string, flags ImageConversionFlag) bool { +func (this *QPixmap) LoadFromData32(data []byte, format string, flags ImageConversionFlag) bool { + data_alias := C.struct_miqt_string{} + data_alias.data = (*C.char)(unsafe.Pointer(&data[0])) + data_alias.len = C.size_t(len(data)) format_Cstring := C.CString(format) defer C.free(unsafe.Pointer(format_Cstring)) - return (bool)(C.QPixmap_LoadFromData32(this.h, data.cPointer(), format_Cstring, (C.int)(flags))) + return (bool)(C.QPixmap_LoadFromData32(this.h, data_alias, format_Cstring, (C.int)(flags))) } func (this *QPixmap) Save2(fileName string, format string) bool { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) format_Cstring := C.CString(format) defer C.free(unsafe.Pointer(format_Cstring)) - return (bool)(C.QPixmap_Save2(this.h, (*C.struct_miqt_string)(fileName_ms), format_Cstring)) + return (bool)(C.QPixmap_Save2(this.h, fileName_ms, format_Cstring)) } func (this *QPixmap) Save3(fileName string, format string, quality int) bool { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) format_Cstring := C.CString(format) defer C.free(unsafe.Pointer(format_Cstring)) - return (bool)(C.QPixmap_Save3(this.h, (*C.struct_miqt_string)(fileName_ms), format_Cstring, (C.int)(quality))) + return (bool)(C.QPixmap_Save3(this.h, fileName_ms, format_Cstring, (C.int)(quality))) } func (this *QPixmap) Save22(device *QIODevice, format string) bool { diff --git a/qt/gen_qpixmap.h b/qt/gen_qpixmap.h index 874f9fbf..2faee706 100644 --- a/qt/gen_qpixmap.h +++ b/qt/gen_qpixmap.h @@ -52,10 +52,10 @@ typedef struct QTransform QTransform; QPixmap* QPixmap_new(); QPixmap* QPixmap_new2(int w, int h); QPixmap* QPixmap_new3(QSize* param1); -QPixmap* QPixmap_new4(struct miqt_string* fileName); +QPixmap* QPixmap_new4(struct miqt_string fileName); QPixmap* QPixmap_new5(QPixmap* param1); -QPixmap* QPixmap_new6(struct miqt_string* fileName, const char* format); -QPixmap* QPixmap_new7(struct miqt_string* fileName, const char* format, int flags); +QPixmap* QPixmap_new6(struct miqt_string fileName, const char* format); +QPixmap* QPixmap_new7(struct miqt_string fileName, const char* format, int flags); void QPixmap_OperatorAssign(QPixmap* self, QPixmap* param1); void QPixmap_Swap(QPixmap* self, QPixmap* other); bool QPixmap_IsNull(const QPixmap* self); @@ -91,10 +91,10 @@ QTransform* QPixmap_TrueMatrix2(QTransform* m, int w, int h); QImage* QPixmap_ToImage(const QPixmap* self); QPixmap* QPixmap_FromImage(QImage* image); QPixmap* QPixmap_FromImageReader(QImageReader* imageReader); -bool QPixmap_Load(QPixmap* self, struct miqt_string* fileName); +bool QPixmap_Load(QPixmap* self, struct miqt_string fileName); bool QPixmap_LoadFromData(QPixmap* self, const unsigned char* buf, unsigned int lenVal); -bool QPixmap_LoadFromDataWithData(QPixmap* self, QByteArray* data); -bool QPixmap_Save(const QPixmap* self, struct miqt_string* fileName); +bool QPixmap_LoadFromDataWithData(QPixmap* self, struct miqt_string data); +bool QPixmap_Save(const QPixmap* self, struct miqt_string fileName); bool QPixmap_SaveWithDevice(const QPixmap* self, QIODevice* device); bool QPixmap_ConvertFromImage(QPixmap* self, QImage* img); QPixmap* QPixmap_Copy(const QPixmap* self, int x, int y, int width, int height); @@ -128,14 +128,14 @@ QPixmap* QPixmap_Transformed2(const QPixmap* self, QMatrix* param1, int mode); QPixmap* QPixmap_Transformed22(const QPixmap* self, QTransform* param1, int mode); QPixmap* QPixmap_FromImage2(QImage* image, int flags); QPixmap* QPixmap_FromImageReader2(QImageReader* imageReader, int flags); -bool QPixmap_Load2(QPixmap* self, struct miqt_string* fileName, const char* format); -bool QPixmap_Load3(QPixmap* self, struct miqt_string* fileName, const char* format, int flags); +bool QPixmap_Load2(QPixmap* self, struct miqt_string fileName, const char* format); +bool QPixmap_Load3(QPixmap* self, struct miqt_string fileName, const char* format, int flags); bool QPixmap_LoadFromData3(QPixmap* self, const unsigned char* buf, unsigned int lenVal, const char* format); bool QPixmap_LoadFromData4(QPixmap* self, const unsigned char* buf, unsigned int lenVal, const char* format, int flags); -bool QPixmap_LoadFromData2(QPixmap* self, QByteArray* data, const char* format); -bool QPixmap_LoadFromData32(QPixmap* self, QByteArray* data, const char* format, int flags); -bool QPixmap_Save2(const QPixmap* self, struct miqt_string* fileName, const char* format); -bool QPixmap_Save3(const QPixmap* self, struct miqt_string* fileName, const char* format, int quality); +bool QPixmap_LoadFromData2(QPixmap* self, struct miqt_string data, const char* format); +bool QPixmap_LoadFromData32(QPixmap* self, struct miqt_string data, const char* format, int flags); +bool QPixmap_Save2(const QPixmap* self, struct miqt_string fileName, const char* format); +bool QPixmap_Save3(const QPixmap* self, struct miqt_string fileName, const char* format, int quality); bool QPixmap_Save22(const QPixmap* self, QIODevice* device, const char* format); bool QPixmap_Save32(const QPixmap* self, QIODevice* device, const char* format, int quality); bool QPixmap_ConvertFromImage2(QPixmap* self, QImage* img, int flags); diff --git a/qt/gen_qpixmapcache.cpp b/qt/gen_qpixmapcache.cpp index 64054d98..e1c17fab 100644 --- a/qt/gen_qpixmapcache.cpp +++ b/qt/gen_qpixmapcache.cpp @@ -16,18 +16,18 @@ void QPixmapCache_SetCacheLimit(int cacheLimit) { QPixmapCache::setCacheLimit(static_cast(cacheLimit)); } -QPixmap* QPixmapCache_Find(struct miqt_string* key) { - QString key_QString = QString::fromUtf8(&key->data, key->len); +QPixmap* QPixmapCache_Find(struct miqt_string key) { + QString key_QString = QString::fromUtf8(key.data, key.len); return QPixmapCache::find(key_QString); } -bool QPixmapCache_Find2(struct miqt_string* key, QPixmap* pixmap) { - QString key_QString = QString::fromUtf8(&key->data, key->len); +bool QPixmapCache_Find2(struct miqt_string key, QPixmap* pixmap) { + QString key_QString = QString::fromUtf8(key.data, key.len); return QPixmapCache::find(key_QString, *pixmap); } -bool QPixmapCache_Find3(struct miqt_string* key, QPixmap* pixmap) { - QString key_QString = QString::fromUtf8(&key->data, key->len); +bool QPixmapCache_Find3(struct miqt_string key, QPixmap* pixmap) { + QString key_QString = QString::fromUtf8(key.data, key.len); return QPixmapCache::find(key_QString, pixmap); } @@ -35,8 +35,8 @@ bool QPixmapCache_Find4(QPixmapCache__Key* key, QPixmap* pixmap) { return QPixmapCache::find(*key, pixmap); } -bool QPixmapCache_Insert(struct miqt_string* key, QPixmap* pixmap) { - QString key_QString = QString::fromUtf8(&key->data, key->len); +bool QPixmapCache_Insert(struct miqt_string key, QPixmap* pixmap) { + QString key_QString = QString::fromUtf8(key.data, key.len); return QPixmapCache::insert(key_QString, *pixmap); } @@ -48,8 +48,8 @@ bool QPixmapCache_Replace(QPixmapCache__Key* key, QPixmap* pixmap) { return QPixmapCache::replace(*key, *pixmap); } -void QPixmapCache_Remove(struct miqt_string* key) { - QString key_QString = QString::fromUtf8(&key->data, key->len); +void QPixmapCache_Remove(struct miqt_string key) { + QString key_QString = QString::fromUtf8(key.data, key.len); QPixmapCache::remove(key_QString); } diff --git a/qt/gen_qpixmapcache.go b/qt/gen_qpixmapcache.go index db309d36..13f6311c 100644 --- a/qt/gen_qpixmapcache.go +++ b/qt/gen_qpixmapcache.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -52,21 +51,27 @@ func QPixmapCache_SetCacheLimit(cacheLimit int) { } func QPixmapCache_Find(key string) *QPixmap { - key_ms := libmiqt.Strdupg(key) - defer C.free(key_ms) - return UnsafeNewQPixmap(unsafe.Pointer(C.QPixmapCache_Find((*C.struct_miqt_string)(key_ms)))) + key_ms := C.struct_miqt_string{} + key_ms.data = C.CString(key) + key_ms.len = C.size_t(len(key)) + defer C.free(unsafe.Pointer(key_ms.data)) + return UnsafeNewQPixmap(unsafe.Pointer(C.QPixmapCache_Find(key_ms))) } func QPixmapCache_Find2(key string, pixmap *QPixmap) bool { - key_ms := libmiqt.Strdupg(key) - defer C.free(key_ms) - return (bool)(C.QPixmapCache_Find2((*C.struct_miqt_string)(key_ms), pixmap.cPointer())) + key_ms := C.struct_miqt_string{} + key_ms.data = C.CString(key) + key_ms.len = C.size_t(len(key)) + defer C.free(unsafe.Pointer(key_ms.data)) + return (bool)(C.QPixmapCache_Find2(key_ms, pixmap.cPointer())) } func QPixmapCache_Find3(key string, pixmap *QPixmap) bool { - key_ms := libmiqt.Strdupg(key) - defer C.free(key_ms) - return (bool)(C.QPixmapCache_Find3((*C.struct_miqt_string)(key_ms), pixmap.cPointer())) + key_ms := C.struct_miqt_string{} + key_ms.data = C.CString(key) + key_ms.len = C.size_t(len(key)) + defer C.free(unsafe.Pointer(key_ms.data)) + return (bool)(C.QPixmapCache_Find3(key_ms, pixmap.cPointer())) } func QPixmapCache_Find4(key *QPixmapCache__Key, pixmap *QPixmap) bool { @@ -74,9 +79,11 @@ func QPixmapCache_Find4(key *QPixmapCache__Key, pixmap *QPixmap) bool { } func QPixmapCache_Insert(key string, pixmap *QPixmap) bool { - key_ms := libmiqt.Strdupg(key) - defer C.free(key_ms) - return (bool)(C.QPixmapCache_Insert((*C.struct_miqt_string)(key_ms), pixmap.cPointer())) + key_ms := C.struct_miqt_string{} + key_ms.data = C.CString(key) + key_ms.len = C.size_t(len(key)) + defer C.free(unsafe.Pointer(key_ms.data)) + return (bool)(C.QPixmapCache_Insert(key_ms, pixmap.cPointer())) } func QPixmapCache_InsertWithPixmap(pixmap *QPixmap) *QPixmapCache__Key { @@ -91,9 +98,11 @@ func QPixmapCache_Replace(key *QPixmapCache__Key, pixmap *QPixmap) bool { } func QPixmapCache_Remove(key string) { - key_ms := libmiqt.Strdupg(key) - defer C.free(key_ms) - C.QPixmapCache_Remove((*C.struct_miqt_string)(key_ms)) + key_ms := C.struct_miqt_string{} + key_ms.data = C.CString(key) + key_ms.len = C.size_t(len(key)) + defer C.free(unsafe.Pointer(key_ms.data)) + C.QPixmapCache_Remove(key_ms) } func QPixmapCache_RemoveWithKey(key *QPixmapCache__Key) { diff --git a/qt/gen_qpixmapcache.h b/qt/gen_qpixmapcache.h index 8b9e2e34..4ff6c898 100644 --- a/qt/gen_qpixmapcache.h +++ b/qt/gen_qpixmapcache.h @@ -29,14 +29,14 @@ typedef struct QPixmapCache__Key QPixmapCache__Key; int QPixmapCache_CacheLimit(); void QPixmapCache_SetCacheLimit(int cacheLimit); -QPixmap* QPixmapCache_Find(struct miqt_string* key); -bool QPixmapCache_Find2(struct miqt_string* key, QPixmap* pixmap); -bool QPixmapCache_Find3(struct miqt_string* key, QPixmap* pixmap); +QPixmap* QPixmapCache_Find(struct miqt_string key); +bool QPixmapCache_Find2(struct miqt_string key, QPixmap* pixmap); +bool QPixmapCache_Find3(struct miqt_string key, QPixmap* pixmap); bool QPixmapCache_Find4(QPixmapCache__Key* key, QPixmap* pixmap); -bool QPixmapCache_Insert(struct miqt_string* key, QPixmap* pixmap); +bool QPixmapCache_Insert(struct miqt_string key, QPixmap* pixmap); QPixmapCache__Key* QPixmapCache_InsertWithPixmap(QPixmap* pixmap); bool QPixmapCache_Replace(QPixmapCache__Key* key, QPixmap* pixmap); -void QPixmapCache_Remove(struct miqt_string* key); +void QPixmapCache_Remove(struct miqt_string key); void QPixmapCache_RemoveWithKey(QPixmapCache__Key* key); void QPixmapCache_Clear(); void QPixmapCache_Delete(QPixmapCache* self); diff --git a/qt/gen_qplaintextedit.cpp b/qt/gen_qplaintextedit.cpp index a163c022..47c567bf 100644 --- a/qt/gen_qplaintextedit.cpp +++ b/qt/gen_qplaintextedit.cpp @@ -33,8 +33,8 @@ QPlainTextEdit* QPlainTextEdit_new() { return new QPlainTextEdit(); } -QPlainTextEdit* QPlainTextEdit_new2(struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QPlainTextEdit* QPlainTextEdit_new2(struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QPlainTextEdit(text_QString); } @@ -42,8 +42,8 @@ QPlainTextEdit* QPlainTextEdit_new3(QWidget* parent) { return new QPlainTextEdit(parent); } -QPlainTextEdit* QPlainTextEdit_new4(struct miqt_string* text, QWidget* parent) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QPlainTextEdit* QPlainTextEdit_new4(struct miqt_string text, QWidget* parent) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QPlainTextEdit(text_QString, parent); } @@ -55,18 +55,26 @@ void* QPlainTextEdit_Metacast(QPlainTextEdit* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QPlainTextEdit_Tr(const char* s) { +struct miqt_string QPlainTextEdit_Tr(const char* s) { QString _ret = QPlainTextEdit::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPlainTextEdit_TrUtf8(const char* s) { +struct miqt_string QPlainTextEdit_TrUtf8(const char* s) { QString _ret = QPlainTextEdit::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QPlainTextEdit_SetDocument(QPlainTextEdit* self, QTextDocument* document) { @@ -77,16 +85,20 @@ QTextDocument* QPlainTextEdit_Document(const QPlainTextEdit* self) { return self->document(); } -void QPlainTextEdit_SetPlaceholderText(QPlainTextEdit* self, struct miqt_string* placeholderText) { - QString placeholderText_QString = QString::fromUtf8(&placeholderText->data, placeholderText->len); +void QPlainTextEdit_SetPlaceholderText(QPlainTextEdit* self, struct miqt_string placeholderText) { + QString placeholderText_QString = QString::fromUtf8(placeholderText.data, placeholderText.len); self->setPlaceholderText(placeholderText_QString); } -struct miqt_string* QPlainTextEdit_PlaceholderText(const QPlainTextEdit* self) { +struct miqt_string QPlainTextEdit_PlaceholderText(const QPlainTextEdit* self) { QString _ret = self->placeholderText(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QPlainTextEdit_SetTextCursor(QPlainTextEdit* self, QTextCursor* cursor) { @@ -134,16 +146,20 @@ void QPlainTextEdit_SetTabChangesFocus(QPlainTextEdit* self, bool b) { self->setTabChangesFocus(b); } -void QPlainTextEdit_SetDocumentTitle(QPlainTextEdit* self, struct miqt_string* title) { - QString title_QString = QString::fromUtf8(&title->data, title->len); +void QPlainTextEdit_SetDocumentTitle(QPlainTextEdit* self, struct miqt_string title) { + QString title_QString = QString::fromUtf8(title.data, title.len); self->setDocumentTitle(title_QString); } -struct miqt_string* QPlainTextEdit_DocumentTitle(const QPlainTextEdit* self) { +struct miqt_string QPlainTextEdit_DocumentTitle(const QPlainTextEdit* self) { QString _ret = self->documentTitle(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } bool QPlainTextEdit_IsUndoRedoEnabled(const QPlainTextEdit* self) { @@ -196,8 +212,8 @@ bool QPlainTextEdit_CenterOnScroll(const QPlainTextEdit* self) { return self->centerOnScroll(); } -bool QPlainTextEdit_Find(QPlainTextEdit* self, struct miqt_string* exp) { - QString exp_QString = QString::fromUtf8(&exp->data, exp->len); +bool QPlainTextEdit_Find(QPlainTextEdit* self, struct miqt_string exp) { + QString exp_QString = QString::fromUtf8(exp.data, exp.len); return self->find(exp_QString); } @@ -209,11 +225,15 @@ bool QPlainTextEdit_Find2(QPlainTextEdit* self, QRegularExpression* exp) { return self->find(*exp); } -struct miqt_string* QPlainTextEdit_ToPlainText(const QPlainTextEdit* self) { +struct miqt_string QPlainTextEdit_ToPlainText(const QPlainTextEdit* self) { QString _ret = self->toPlainText(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QPlainTextEdit_EnsureCursorVisible(QPlainTextEdit* self) { @@ -244,11 +264,15 @@ QRect* QPlainTextEdit_CursorRect2(const QPlainTextEdit* self) { return new QRect(self->cursorRect()); } -struct miqt_string* QPlainTextEdit_AnchorAt(const QPlainTextEdit* self, QPoint* pos) { +struct miqt_string QPlainTextEdit_AnchorAt(const QPlainTextEdit* self, QPoint* pos) { QString _ret = self->anchorAt(*pos); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } bool QPlainTextEdit_OverwriteMode(const QPlainTextEdit* self) { @@ -331,8 +355,8 @@ QVariant* QPlainTextEdit_InputMethodQuery2(const QPlainTextEdit* self, int query return new QVariant(self->inputMethodQuery(static_cast(query), *argument)); } -void QPlainTextEdit_SetPlainText(QPlainTextEdit* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QPlainTextEdit_SetPlainText(QPlainTextEdit* self, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->setPlainText(text_QString); } @@ -364,18 +388,18 @@ void QPlainTextEdit_SelectAll(QPlainTextEdit* self) { self->selectAll(); } -void QPlainTextEdit_InsertPlainText(QPlainTextEdit* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QPlainTextEdit_InsertPlainText(QPlainTextEdit* self, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->insertPlainText(text_QString); } -void QPlainTextEdit_AppendPlainText(QPlainTextEdit* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QPlainTextEdit_AppendPlainText(QPlainTextEdit* self, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->appendPlainText(text_QString); } -void QPlainTextEdit_AppendHtml(QPlainTextEdit* self, struct miqt_string* html) { - QString html_QString = QString::fromUtf8(&html->data, html->len); +void QPlainTextEdit_AppendHtml(QPlainTextEdit* self, struct miqt_string html) { + QString html_QString = QString::fromUtf8(html.data, html.len); self->appendHtml(html_QString); } @@ -490,36 +514,52 @@ void QPlainTextEdit_connect_ModificationChanged(QPlainTextEdit* self, intptr_t s }); } -struct miqt_string* QPlainTextEdit_Tr2(const char* s, const char* c) { +struct miqt_string QPlainTextEdit_Tr2(const char* s, const char* c) { QString _ret = QPlainTextEdit::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPlainTextEdit_Tr3(const char* s, const char* c, int n) { +struct miqt_string QPlainTextEdit_Tr3(const char* s, const char* c, int n) { QString _ret = QPlainTextEdit::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPlainTextEdit_TrUtf82(const char* s, const char* c) { +struct miqt_string QPlainTextEdit_TrUtf82(const char* s, const char* c) { QString _ret = QPlainTextEdit::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPlainTextEdit_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QPlainTextEdit_TrUtf83(const char* s, const char* c, int n) { QString _ret = QPlainTextEdit::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -bool QPlainTextEdit_Find22(QPlainTextEdit* self, struct miqt_string* exp, int options) { - QString exp_QString = QString::fromUtf8(&exp->data, exp->len); +bool QPlainTextEdit_Find22(QPlainTextEdit* self, struct miqt_string exp, int options) { + QString exp_QString = QString::fromUtf8(exp.data, exp.len); return self->find(exp_QString, static_cast(options)); } @@ -559,18 +599,26 @@ void* QPlainTextDocumentLayout_Metacast(QPlainTextDocumentLayout* self, const ch return self->qt_metacast(param1); } -struct miqt_string* QPlainTextDocumentLayout_Tr(const char* s) { +struct miqt_string QPlainTextDocumentLayout_Tr(const char* s) { QString _ret = QPlainTextDocumentLayout::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPlainTextDocumentLayout_TrUtf8(const char* s) { +struct miqt_string QPlainTextDocumentLayout_TrUtf8(const char* s) { QString _ret = QPlainTextDocumentLayout::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QPlainTextDocumentLayout_Draw(QPlainTextDocumentLayout* self, QPainter* param1, QAbstractTextDocumentLayout__PaintContext* param2) { @@ -613,32 +661,48 @@ void QPlainTextDocumentLayout_RequestUpdate(QPlainTextDocumentLayout* self) { self->requestUpdate(); } -struct miqt_string* QPlainTextDocumentLayout_Tr2(const char* s, const char* c) { +struct miqt_string QPlainTextDocumentLayout_Tr2(const char* s, const char* c) { QString _ret = QPlainTextDocumentLayout::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPlainTextDocumentLayout_Tr3(const char* s, const char* c, int n) { +struct miqt_string QPlainTextDocumentLayout_Tr3(const char* s, const char* c, int n) { QString _ret = QPlainTextDocumentLayout::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPlainTextDocumentLayout_TrUtf82(const char* s, const char* c) { +struct miqt_string QPlainTextDocumentLayout_TrUtf82(const char* s, const char* c) { QString _ret = QPlainTextDocumentLayout::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPlainTextDocumentLayout_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QPlainTextDocumentLayout_TrUtf83(const char* s, const char* c, int n) { QString _ret = QPlainTextDocumentLayout::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QPlainTextDocumentLayout_Delete(QPlainTextDocumentLayout* self) { diff --git a/qt/gen_qplaintextedit.go b/qt/gen_qplaintextedit.go index 8f740967..5fbaf02f 100644 --- a/qt/gen_qplaintextedit.go +++ b/qt/gen_qplaintextedit.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "runtime/cgo" "unsafe" @@ -60,9 +59,11 @@ func NewQPlainTextEdit() *QPlainTextEdit { // NewQPlainTextEdit2 constructs a new QPlainTextEdit object. func NewQPlainTextEdit2(text string) *QPlainTextEdit { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - ret := C.QPlainTextEdit_new2((*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + ret := C.QPlainTextEdit_new2(text_ms) return newQPlainTextEdit(ret) } @@ -74,9 +75,11 @@ func NewQPlainTextEdit3(parent *QWidget) *QPlainTextEdit { // NewQPlainTextEdit4 constructs a new QPlainTextEdit object. func NewQPlainTextEdit4(text string, parent *QWidget) *QPlainTextEdit { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - ret := C.QPlainTextEdit_new4((*C.struct_miqt_string)(text_ms), parent.cPointer()) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + ret := C.QPlainTextEdit_new4(text_ms, parent.cPointer()) return newQPlainTextEdit(ret) } @@ -87,24 +90,24 @@ func (this *QPlainTextEdit) MetaObject() *QMetaObject { func (this *QPlainTextEdit) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QPlainTextEdit_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QPlainTextEdit_Metacast(this.h, param1_Cstring)) } func QPlainTextEdit_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QPlainTextEdit_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPlainTextEdit_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QPlainTextEdit_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QPlainTextEdit_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPlainTextEdit_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -117,15 +120,17 @@ func (this *QPlainTextEdit) Document() *QTextDocument { } func (this *QPlainTextEdit) SetPlaceholderText(placeholderText string) { - placeholderText_ms := libmiqt.Strdupg(placeholderText) - defer C.free(placeholderText_ms) - C.QPlainTextEdit_SetPlaceholderText(this.h, (*C.struct_miqt_string)(placeholderText_ms)) + placeholderText_ms := C.struct_miqt_string{} + placeholderText_ms.data = C.CString(placeholderText) + placeholderText_ms.len = C.size_t(len(placeholderText)) + defer C.free(unsafe.Pointer(placeholderText_ms.data)) + C.QPlainTextEdit_SetPlaceholderText(this.h, placeholderText_ms) } func (this *QPlainTextEdit) PlaceholderText() string { - var _ms *C.struct_miqt_string = C.QPlainTextEdit_PlaceholderText(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPlainTextEdit_PlaceholderText(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -180,15 +185,17 @@ func (this *QPlainTextEdit) SetTabChangesFocus(b bool) { } func (this *QPlainTextEdit) SetDocumentTitle(title string) { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - C.QPlainTextEdit_SetDocumentTitle(this.h, (*C.struct_miqt_string)(title_ms)) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + C.QPlainTextEdit_SetDocumentTitle(this.h, title_ms) } func (this *QPlainTextEdit) DocumentTitle() string { - var _ms *C.struct_miqt_string = C.QPlainTextEdit_DocumentTitle(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPlainTextEdit_DocumentTitle(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -241,9 +248,11 @@ func (this *QPlainTextEdit) CenterOnScroll() bool { } func (this *QPlainTextEdit) Find(exp string) bool { - exp_ms := libmiqt.Strdupg(exp) - defer C.free(exp_ms) - return (bool)(C.QPlainTextEdit_Find(this.h, (*C.struct_miqt_string)(exp_ms))) + exp_ms := C.struct_miqt_string{} + exp_ms.data = C.CString(exp) + exp_ms.len = C.size_t(len(exp)) + defer C.free(unsafe.Pointer(exp_ms.data)) + return (bool)(C.QPlainTextEdit_Find(this.h, exp_ms)) } func (this *QPlainTextEdit) FindWithExp(exp *QRegExp) bool { @@ -255,9 +264,9 @@ func (this *QPlainTextEdit) Find2(exp *QRegularExpression) bool { } func (this *QPlainTextEdit) ToPlainText() string { - var _ms *C.struct_miqt_string = C.QPlainTextEdit_ToPlainText(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPlainTextEdit_ToPlainText(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -302,9 +311,9 @@ func (this *QPlainTextEdit) CursorRect2() *QRect { } func (this *QPlainTextEdit) AnchorAt(pos *QPoint) string { - var _ms *C.struct_miqt_string = C.QPlainTextEdit_AnchorAt(this.h, pos.cPointer()) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPlainTextEdit_AnchorAt(this.h, pos.cPointer()) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -397,9 +406,11 @@ func (this *QPlainTextEdit) InputMethodQuery2(query InputMethodQuery, argument Q } func (this *QPlainTextEdit) SetPlainText(text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QPlainTextEdit_SetPlainText(this.h, (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QPlainTextEdit_SetPlainText(this.h, text_ms) } func (this *QPlainTextEdit) Cut() { @@ -431,21 +442,27 @@ func (this *QPlainTextEdit) SelectAll() { } func (this *QPlainTextEdit) InsertPlainText(text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QPlainTextEdit_InsertPlainText(this.h, (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QPlainTextEdit_InsertPlainText(this.h, text_ms) } func (this *QPlainTextEdit) AppendPlainText(text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QPlainTextEdit_AppendPlainText(this.h, (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QPlainTextEdit_AppendPlainText(this.h, text_ms) } func (this *QPlainTextEdit) AppendHtml(html string) { - html_ms := libmiqt.Strdupg(html) - defer C.free(html_ms) - C.QPlainTextEdit_AppendHtml(this.h, (*C.struct_miqt_string)(html_ms)) + html_ms := C.struct_miqt_string{} + html_ms.data = C.CString(html) + html_ms.len = C.size_t(len(html)) + defer C.free(unsafe.Pointer(html_ms.data)) + C.QPlainTextEdit_AppendHtml(this.h, html_ms) } func (this *QPlainTextEdit) CenterCursor() { @@ -637,9 +654,9 @@ func QPlainTextEdit_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPlainTextEdit_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPlainTextEdit_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -648,9 +665,9 @@ func QPlainTextEdit_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPlainTextEdit_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPlainTextEdit_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -659,9 +676,9 @@ func QPlainTextEdit_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPlainTextEdit_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPlainTextEdit_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -670,16 +687,18 @@ func QPlainTextEdit_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPlainTextEdit_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPlainTextEdit_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QPlainTextEdit) Find22(exp string, options QTextDocument__FindFlag) bool { - exp_ms := libmiqt.Strdupg(exp) - defer C.free(exp_ms) - return (bool)(C.QPlainTextEdit_Find22(this.h, (*C.struct_miqt_string)(exp_ms), (C.int)(options))) + exp_ms := C.struct_miqt_string{} + exp_ms.data = C.CString(exp) + exp_ms.len = C.size_t(len(exp)) + defer C.free(unsafe.Pointer(exp_ms.data)) + return (bool)(C.QPlainTextEdit_Find22(this.h, exp_ms, (C.int)(options))) } func (this *QPlainTextEdit) Find23(exp *QRegExp, options QTextDocument__FindFlag) bool { @@ -759,24 +778,24 @@ func (this *QPlainTextDocumentLayout) MetaObject() *QMetaObject { func (this *QPlainTextDocumentLayout) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QPlainTextDocumentLayout_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QPlainTextDocumentLayout_Metacast(this.h, param1_Cstring)) } func QPlainTextDocumentLayout_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QPlainTextDocumentLayout_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPlainTextDocumentLayout_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QPlainTextDocumentLayout_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QPlainTextDocumentLayout_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPlainTextDocumentLayout_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -834,9 +853,9 @@ func QPlainTextDocumentLayout_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPlainTextDocumentLayout_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPlainTextDocumentLayout_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -845,9 +864,9 @@ func QPlainTextDocumentLayout_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPlainTextDocumentLayout_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPlainTextDocumentLayout_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -856,9 +875,9 @@ func QPlainTextDocumentLayout_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPlainTextDocumentLayout_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPlainTextDocumentLayout_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -867,9 +886,9 @@ func QPlainTextDocumentLayout_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPlainTextDocumentLayout_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPlainTextDocumentLayout_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qplaintextedit.h b/qt/gen_qplaintextedit.h index 5612e168..b5eeb5fb 100644 --- a/qt/gen_qplaintextedit.h +++ b/qt/gen_qplaintextedit.h @@ -72,17 +72,17 @@ typedef struct QWidget QWidget; #endif QPlainTextEdit* QPlainTextEdit_new(); -QPlainTextEdit* QPlainTextEdit_new2(struct miqt_string* text); +QPlainTextEdit* QPlainTextEdit_new2(struct miqt_string text); QPlainTextEdit* QPlainTextEdit_new3(QWidget* parent); -QPlainTextEdit* QPlainTextEdit_new4(struct miqt_string* text, QWidget* parent); +QPlainTextEdit* QPlainTextEdit_new4(struct miqt_string text, QWidget* parent); QMetaObject* QPlainTextEdit_MetaObject(const QPlainTextEdit* self); void* QPlainTextEdit_Metacast(QPlainTextEdit* self, const char* param1); -struct miqt_string* QPlainTextEdit_Tr(const char* s); -struct miqt_string* QPlainTextEdit_TrUtf8(const char* s); +struct miqt_string QPlainTextEdit_Tr(const char* s); +struct miqt_string QPlainTextEdit_TrUtf8(const char* s); void QPlainTextEdit_SetDocument(QPlainTextEdit* self, QTextDocument* document); QTextDocument* QPlainTextEdit_Document(const QPlainTextEdit* self); -void QPlainTextEdit_SetPlaceholderText(QPlainTextEdit* self, struct miqt_string* placeholderText); -struct miqt_string* QPlainTextEdit_PlaceholderText(const QPlainTextEdit* self); +void QPlainTextEdit_SetPlaceholderText(QPlainTextEdit* self, struct miqt_string placeholderText); +struct miqt_string QPlainTextEdit_PlaceholderText(const QPlainTextEdit* self); void QPlainTextEdit_SetTextCursor(QPlainTextEdit* self, QTextCursor* cursor); QTextCursor* QPlainTextEdit_TextCursor(const QPlainTextEdit* self); bool QPlainTextEdit_IsReadOnly(const QPlainTextEdit* self); @@ -94,8 +94,8 @@ void QPlainTextEdit_SetCurrentCharFormat(QPlainTextEdit* self, QTextCharFormat* QTextCharFormat* QPlainTextEdit_CurrentCharFormat(const QPlainTextEdit* self); bool QPlainTextEdit_TabChangesFocus(const QPlainTextEdit* self); void QPlainTextEdit_SetTabChangesFocus(QPlainTextEdit* self, bool b); -void QPlainTextEdit_SetDocumentTitle(QPlainTextEdit* self, struct miqt_string* title); -struct miqt_string* QPlainTextEdit_DocumentTitle(const QPlainTextEdit* self); +void QPlainTextEdit_SetDocumentTitle(QPlainTextEdit* self, struct miqt_string title); +struct miqt_string QPlainTextEdit_DocumentTitle(const QPlainTextEdit* self); bool QPlainTextEdit_IsUndoRedoEnabled(const QPlainTextEdit* self); void QPlainTextEdit_SetUndoRedoEnabled(QPlainTextEdit* self, bool enable); void QPlainTextEdit_SetMaximumBlockCount(QPlainTextEdit* self, int maximum); @@ -108,10 +108,10 @@ void QPlainTextEdit_SetBackgroundVisible(QPlainTextEdit* self, bool visible); bool QPlainTextEdit_BackgroundVisible(const QPlainTextEdit* self); void QPlainTextEdit_SetCenterOnScroll(QPlainTextEdit* self, bool enabled); bool QPlainTextEdit_CenterOnScroll(const QPlainTextEdit* self); -bool QPlainTextEdit_Find(QPlainTextEdit* self, struct miqt_string* exp); +bool QPlainTextEdit_Find(QPlainTextEdit* self, struct miqt_string exp); bool QPlainTextEdit_FindWithExp(QPlainTextEdit* self, QRegExp* exp); bool QPlainTextEdit_Find2(QPlainTextEdit* self, QRegularExpression* exp); -struct miqt_string* QPlainTextEdit_ToPlainText(const QPlainTextEdit* self); +struct miqt_string QPlainTextEdit_ToPlainText(const QPlainTextEdit* self); void QPlainTextEdit_EnsureCursorVisible(QPlainTextEdit* self); QVariant* QPlainTextEdit_LoadResource(QPlainTextEdit* self, int typeVal, QUrl* name); QMenu* QPlainTextEdit_CreateStandardContextMenu(QPlainTextEdit* self); @@ -119,7 +119,7 @@ QMenu* QPlainTextEdit_CreateStandardContextMenuWithPosition(QPlainTextEdit* self QTextCursor* QPlainTextEdit_CursorForPosition(const QPlainTextEdit* self, QPoint* pos); QRect* QPlainTextEdit_CursorRect(const QPlainTextEdit* self, QTextCursor* cursor); QRect* QPlainTextEdit_CursorRect2(const QPlainTextEdit* self); -struct miqt_string* QPlainTextEdit_AnchorAt(const QPlainTextEdit* self, QPoint* pos); +struct miqt_string QPlainTextEdit_AnchorAt(const QPlainTextEdit* self, QPoint* pos); bool QPlainTextEdit_OverwriteMode(const QPlainTextEdit* self); void QPlainTextEdit_SetOverwriteMode(QPlainTextEdit* self, bool overwrite); int QPlainTextEdit_TabStopWidth(const QPlainTextEdit* self); @@ -136,7 +136,7 @@ void QPlainTextEdit_Print(const QPlainTextEdit* self, QPagedPaintDevice* printer int QPlainTextEdit_BlockCount(const QPlainTextEdit* self); QVariant* QPlainTextEdit_InputMethodQuery(const QPlainTextEdit* self, int property); QVariant* QPlainTextEdit_InputMethodQuery2(const QPlainTextEdit* self, int query, QVariant* argument); -void QPlainTextEdit_SetPlainText(QPlainTextEdit* self, struct miqt_string* text); +void QPlainTextEdit_SetPlainText(QPlainTextEdit* self, struct miqt_string text); void QPlainTextEdit_Cut(QPlainTextEdit* self); void QPlainTextEdit_Copy(QPlainTextEdit* self); void QPlainTextEdit_Paste(QPlainTextEdit* self); @@ -144,9 +144,9 @@ void QPlainTextEdit_Undo(QPlainTextEdit* self); void QPlainTextEdit_Redo(QPlainTextEdit* self); void QPlainTextEdit_Clear(QPlainTextEdit* self); void QPlainTextEdit_SelectAll(QPlainTextEdit* self); -void QPlainTextEdit_InsertPlainText(QPlainTextEdit* self, struct miqt_string* text); -void QPlainTextEdit_AppendPlainText(QPlainTextEdit* self, struct miqt_string* text); -void QPlainTextEdit_AppendHtml(QPlainTextEdit* self, struct miqt_string* html); +void QPlainTextEdit_InsertPlainText(QPlainTextEdit* self, struct miqt_string text); +void QPlainTextEdit_AppendPlainText(QPlainTextEdit* self, struct miqt_string text); +void QPlainTextEdit_AppendHtml(QPlainTextEdit* self, struct miqt_string html); void QPlainTextEdit_CenterCursor(QPlainTextEdit* self); void QPlainTextEdit_ZoomIn(QPlainTextEdit* self); void QPlainTextEdit_ZoomOut(QPlainTextEdit* self); @@ -168,11 +168,11 @@ void QPlainTextEdit_BlockCountChanged(QPlainTextEdit* self, int newBlockCount); void QPlainTextEdit_connect_BlockCountChanged(QPlainTextEdit* self, intptr_t slot); void QPlainTextEdit_ModificationChanged(QPlainTextEdit* self, bool param1); void QPlainTextEdit_connect_ModificationChanged(QPlainTextEdit* self, intptr_t slot); -struct miqt_string* QPlainTextEdit_Tr2(const char* s, const char* c); -struct miqt_string* QPlainTextEdit_Tr3(const char* s, const char* c, int n); -struct miqt_string* QPlainTextEdit_TrUtf82(const char* s, const char* c); -struct miqt_string* QPlainTextEdit_TrUtf83(const char* s, const char* c, int n); -bool QPlainTextEdit_Find22(QPlainTextEdit* self, struct miqt_string* exp, int options); +struct miqt_string QPlainTextEdit_Tr2(const char* s, const char* c); +struct miqt_string QPlainTextEdit_Tr3(const char* s, const char* c, int n); +struct miqt_string QPlainTextEdit_TrUtf82(const char* s, const char* c); +struct miqt_string QPlainTextEdit_TrUtf83(const char* s, const char* c, int n); +bool QPlainTextEdit_Find22(QPlainTextEdit* self, struct miqt_string exp, int options); bool QPlainTextEdit_Find23(QPlainTextEdit* self, QRegExp* exp, int options); bool QPlainTextEdit_Find24(QPlainTextEdit* self, QRegularExpression* exp, int options); void QPlainTextEdit_MoveCursor2(QPlainTextEdit* self, int operation, int mode); @@ -183,8 +183,8 @@ void QPlainTextEdit_Delete(QPlainTextEdit* self); QPlainTextDocumentLayout* QPlainTextDocumentLayout_new(QTextDocument* document); QMetaObject* QPlainTextDocumentLayout_MetaObject(const QPlainTextDocumentLayout* self); void* QPlainTextDocumentLayout_Metacast(QPlainTextDocumentLayout* self, const char* param1); -struct miqt_string* QPlainTextDocumentLayout_Tr(const char* s); -struct miqt_string* QPlainTextDocumentLayout_TrUtf8(const char* s); +struct miqt_string QPlainTextDocumentLayout_Tr(const char* s); +struct miqt_string QPlainTextDocumentLayout_TrUtf8(const char* s); void QPlainTextDocumentLayout_Draw(QPlainTextDocumentLayout* self, QPainter* param1, QAbstractTextDocumentLayout__PaintContext* param2); int QPlainTextDocumentLayout_HitTest(const QPlainTextDocumentLayout* self, QPointF* param1, int param2); int QPlainTextDocumentLayout_PageCount(const QPlainTextDocumentLayout* self); @@ -195,10 +195,10 @@ void QPlainTextDocumentLayout_EnsureBlockLayout(const QPlainTextDocumentLayout* void QPlainTextDocumentLayout_SetCursorWidth(QPlainTextDocumentLayout* self, int width); int QPlainTextDocumentLayout_CursorWidth(const QPlainTextDocumentLayout* self); void QPlainTextDocumentLayout_RequestUpdate(QPlainTextDocumentLayout* self); -struct miqt_string* QPlainTextDocumentLayout_Tr2(const char* s, const char* c); -struct miqt_string* QPlainTextDocumentLayout_Tr3(const char* s, const char* c, int n); -struct miqt_string* QPlainTextDocumentLayout_TrUtf82(const char* s, const char* c); -struct miqt_string* QPlainTextDocumentLayout_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QPlainTextDocumentLayout_Tr2(const char* s, const char* c); +struct miqt_string QPlainTextDocumentLayout_Tr3(const char* s, const char* c, int n); +struct miqt_string QPlainTextDocumentLayout_TrUtf82(const char* s, const char* c); +struct miqt_string QPlainTextDocumentLayout_TrUtf83(const char* s, const char* c, int n); void QPlainTextDocumentLayout_Delete(QPlainTextDocumentLayout* self); #ifdef __cplusplus diff --git a/qt/gen_qpluginloader.cpp b/qt/gen_qpluginloader.cpp index 01df2667..ba2af9bb 100644 --- a/qt/gen_qpluginloader.cpp +++ b/qt/gen_qpluginloader.cpp @@ -15,8 +15,8 @@ QPluginLoader* QPluginLoader_new() { return new QPluginLoader(); } -QPluginLoader* QPluginLoader_new2(struct miqt_string* fileName) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +QPluginLoader* QPluginLoader_new2(struct miqt_string fileName) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); return new QPluginLoader(fileName_QString); } @@ -24,8 +24,8 @@ QPluginLoader* QPluginLoader_new3(QObject* parent) { return new QPluginLoader(parent); } -QPluginLoader* QPluginLoader_new4(struct miqt_string* fileName, QObject* parent) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +QPluginLoader* QPluginLoader_new4(struct miqt_string fileName, QObject* parent) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); return new QPluginLoader(fileName_QString, parent); } @@ -37,18 +37,26 @@ void* QPluginLoader_Metacast(QPluginLoader* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QPluginLoader_Tr(const char* s) { +struct miqt_string QPluginLoader_Tr(const char* s) { QString _ret = QPluginLoader::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPluginLoader_TrUtf8(const char* s) { +struct miqt_string QPluginLoader_TrUtf8(const char* s) { QString _ret = QPluginLoader::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QObject* QPluginLoader_Instance(QPluginLoader* self) { @@ -97,23 +105,31 @@ bool QPluginLoader_IsLoaded(const QPluginLoader* self) { return self->isLoaded(); } -void QPluginLoader_SetFileName(QPluginLoader* self, struct miqt_string* fileName) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +void QPluginLoader_SetFileName(QPluginLoader* self, struct miqt_string fileName) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); self->setFileName(fileName_QString); } -struct miqt_string* QPluginLoader_FileName(const QPluginLoader* self) { +struct miqt_string QPluginLoader_FileName(const QPluginLoader* self) { QString _ret = self->fileName(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPluginLoader_ErrorString(const QPluginLoader* self) { +struct miqt_string QPluginLoader_ErrorString(const QPluginLoader* self) { QString _ret = self->errorString(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QPluginLoader_SetLoadHints(QPluginLoader* self, int loadHints) { @@ -125,32 +141,48 @@ int QPluginLoader_LoadHints(const QPluginLoader* self) { return static_cast(_ret); } -struct miqt_string* QPluginLoader_Tr2(const char* s, const char* c) { +struct miqt_string QPluginLoader_Tr2(const char* s, const char* c) { QString _ret = QPluginLoader::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPluginLoader_Tr3(const char* s, const char* c, int n) { +struct miqt_string QPluginLoader_Tr3(const char* s, const char* c, int n) { QString _ret = QPluginLoader::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPluginLoader_TrUtf82(const char* s, const char* c) { +struct miqt_string QPluginLoader_TrUtf82(const char* s, const char* c) { QString _ret = QPluginLoader::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPluginLoader_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QPluginLoader_TrUtf83(const char* s, const char* c, int n) { QString _ret = QPluginLoader::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QPluginLoader_Delete(QPluginLoader* self) { diff --git a/qt/gen_qpluginloader.go b/qt/gen_qpluginloader.go index c576fc56..25d79d92 100644 --- a/qt/gen_qpluginloader.go +++ b/qt/gen_qpluginloader.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -52,9 +51,11 @@ func NewQPluginLoader() *QPluginLoader { // NewQPluginLoader2 constructs a new QPluginLoader object. func NewQPluginLoader2(fileName string) *QPluginLoader { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - ret := C.QPluginLoader_new2((*C.struct_miqt_string)(fileName_ms)) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + ret := C.QPluginLoader_new2(fileName_ms) return newQPluginLoader(ret) } @@ -66,9 +67,11 @@ func NewQPluginLoader3(parent *QObject) *QPluginLoader { // NewQPluginLoader4 constructs a new QPluginLoader object. func NewQPluginLoader4(fileName string, parent *QObject) *QPluginLoader { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - ret := C.QPluginLoader_new4((*C.struct_miqt_string)(fileName_ms), parent.cPointer()) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + ret := C.QPluginLoader_new4(fileName_ms, parent.cPointer()) return newQPluginLoader(ret) } @@ -79,24 +82,24 @@ func (this *QPluginLoader) MetaObject() *QMetaObject { func (this *QPluginLoader) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QPluginLoader_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QPluginLoader_Metacast(this.h, param1_Cstring)) } func QPluginLoader_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QPluginLoader_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPluginLoader_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QPluginLoader_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QPluginLoader_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPluginLoader_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -149,22 +152,24 @@ func (this *QPluginLoader) IsLoaded() bool { } func (this *QPluginLoader) SetFileName(fileName string) { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - C.QPluginLoader_SetFileName(this.h, (*C.struct_miqt_string)(fileName_ms)) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + C.QPluginLoader_SetFileName(this.h, fileName_ms) } func (this *QPluginLoader) FileName() string { - var _ms *C.struct_miqt_string = C.QPluginLoader_FileName(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPluginLoader_FileName(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QPluginLoader) ErrorString() string { - var _ms *C.struct_miqt_string = C.QPluginLoader_ErrorString(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPluginLoader_ErrorString(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -181,9 +186,9 @@ func QPluginLoader_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPluginLoader_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPluginLoader_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -192,9 +197,9 @@ func QPluginLoader_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPluginLoader_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPluginLoader_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -203,9 +208,9 @@ func QPluginLoader_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPluginLoader_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPluginLoader_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -214,9 +219,9 @@ func QPluginLoader_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPluginLoader_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPluginLoader_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qpluginloader.h b/qt/gen_qpluginloader.h index c5613fbc..0a7d2db7 100644 --- a/qt/gen_qpluginloader.h +++ b/qt/gen_qpluginloader.h @@ -28,13 +28,13 @@ typedef struct QStaticPlugin QStaticPlugin; #endif QPluginLoader* QPluginLoader_new(); -QPluginLoader* QPluginLoader_new2(struct miqt_string* fileName); +QPluginLoader* QPluginLoader_new2(struct miqt_string fileName); QPluginLoader* QPluginLoader_new3(QObject* parent); -QPluginLoader* QPluginLoader_new4(struct miqt_string* fileName, QObject* parent); +QPluginLoader* QPluginLoader_new4(struct miqt_string fileName, QObject* parent); QMetaObject* QPluginLoader_MetaObject(const QPluginLoader* self); void* QPluginLoader_Metacast(QPluginLoader* self, const char* param1); -struct miqt_string* QPluginLoader_Tr(const char* s); -struct miqt_string* QPluginLoader_TrUtf8(const char* s); +struct miqt_string QPluginLoader_Tr(const char* s); +struct miqt_string QPluginLoader_TrUtf8(const char* s); QObject* QPluginLoader_Instance(QPluginLoader* self); QJsonObject* QPluginLoader_MetaData(const QPluginLoader* self); struct miqt_array* QPluginLoader_StaticInstances(); @@ -42,15 +42,15 @@ struct miqt_array* QPluginLoader_StaticPlugins(); bool QPluginLoader_Load(QPluginLoader* self); bool QPluginLoader_Unload(QPluginLoader* self); bool QPluginLoader_IsLoaded(const QPluginLoader* self); -void QPluginLoader_SetFileName(QPluginLoader* self, struct miqt_string* fileName); -struct miqt_string* QPluginLoader_FileName(const QPluginLoader* self); -struct miqt_string* QPluginLoader_ErrorString(const QPluginLoader* self); +void QPluginLoader_SetFileName(QPluginLoader* self, struct miqt_string fileName); +struct miqt_string QPluginLoader_FileName(const QPluginLoader* self); +struct miqt_string QPluginLoader_ErrorString(const QPluginLoader* self); void QPluginLoader_SetLoadHints(QPluginLoader* self, int loadHints); int QPluginLoader_LoadHints(const QPluginLoader* self); -struct miqt_string* QPluginLoader_Tr2(const char* s, const char* c); -struct miqt_string* QPluginLoader_Tr3(const char* s, const char* c, int n); -struct miqt_string* QPluginLoader_TrUtf82(const char* s, const char* c); -struct miqt_string* QPluginLoader_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QPluginLoader_Tr2(const char* s, const char* c); +struct miqt_string QPluginLoader_Tr3(const char* s, const char* c, int n); +struct miqt_string QPluginLoader_TrUtf82(const char* s, const char* c); +struct miqt_string QPluginLoader_TrUtf83(const char* s, const char* c, int n); void QPluginLoader_Delete(QPluginLoader* self); #ifdef __cplusplus diff --git a/qt/gen_qprocess.cpp b/qt/gen_qprocess.cpp index fd580c63..d13bde3d 100644 --- a/qt/gen_qprocess.cpp +++ b/qt/gen_qprocess.cpp @@ -43,39 +43,47 @@ void QProcessEnvironment_Clear(QProcessEnvironment* self) { self->clear(); } -bool QProcessEnvironment_Contains(const QProcessEnvironment* self, struct miqt_string* name) { - QString name_QString = QString::fromUtf8(&name->data, name->len); +bool QProcessEnvironment_Contains(const QProcessEnvironment* self, struct miqt_string name) { + QString name_QString = QString::fromUtf8(name.data, name.len); return self->contains(name_QString); } -void QProcessEnvironment_Insert(QProcessEnvironment* self, struct miqt_string* name, struct miqt_string* value) { - QString name_QString = QString::fromUtf8(&name->data, name->len); - QString value_QString = QString::fromUtf8(&value->data, value->len); +void QProcessEnvironment_Insert(QProcessEnvironment* self, struct miqt_string name, struct miqt_string value) { + QString name_QString = QString::fromUtf8(name.data, name.len); + QString value_QString = QString::fromUtf8(value.data, value.len); self->insert(name_QString, value_QString); } -void QProcessEnvironment_Remove(QProcessEnvironment* self, struct miqt_string* name) { - QString name_QString = QString::fromUtf8(&name->data, name->len); +void QProcessEnvironment_Remove(QProcessEnvironment* self, struct miqt_string name) { + QString name_QString = QString::fromUtf8(name.data, name.len); self->remove(name_QString); } -struct miqt_string* QProcessEnvironment_Value(const QProcessEnvironment* self, struct miqt_string* name) { - QString name_QString = QString::fromUtf8(&name->data, name->len); +struct miqt_string QProcessEnvironment_Value(const QProcessEnvironment* self, struct miqt_string name) { + QString name_QString = QString::fromUtf8(name.data, name.len); QString _ret = self->value(name_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } struct miqt_array* QProcessEnvironment_ToStringList(const QProcessEnvironment* self) { QStringList _ret = self->toStringList(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -86,12 +94,16 @@ struct miqt_array* QProcessEnvironment_ToStringList(const QProcessEnvironment* s struct miqt_array* QProcessEnvironment_Keys(const QProcessEnvironment* self) { QStringList _ret = self->keys(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -107,13 +119,17 @@ QProcessEnvironment* QProcessEnvironment_SystemEnvironment() { return new QProcessEnvironment(QProcessEnvironment::systemEnvironment()); } -struct miqt_string* QProcessEnvironment_Value2(const QProcessEnvironment* self, struct miqt_string* name, struct miqt_string* defaultValue) { - QString name_QString = QString::fromUtf8(&name->data, name->len); - QString defaultValue_QString = QString::fromUtf8(&defaultValue->data, defaultValue->len); +struct miqt_string QProcessEnvironment_Value2(const QProcessEnvironment* self, struct miqt_string name, struct miqt_string defaultValue) { + QString name_QString = QString::fromUtf8(name.data, name.len); + QString defaultValue_QString = QString::fromUtf8(defaultValue.data, defaultValue.len); QString _ret = self->value(name_QString, defaultValue_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QProcessEnvironment_Delete(QProcessEnvironment* self) { @@ -136,34 +152,42 @@ void* QProcess_Metacast(QProcess* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QProcess_Tr(const char* s) { +struct miqt_string QProcess_Tr(const char* s) { QString _ret = QProcess::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QProcess_TrUtf8(const char* s) { +struct miqt_string QProcess_TrUtf8(const char* s) { QString _ret = QProcess::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QProcess_Start(QProcess* self, struct miqt_string* program, struct miqt_array* /* of struct miqt_string* */ arguments) { - QString program_QString = QString::fromUtf8(&program->data, program->len); +void QProcess_Start(QProcess* self, struct miqt_string program, struct miqt_array* /* of struct miqt_string */ arguments) { + QString program_QString = QString::fromUtf8(program.data, program.len); QStringList arguments_QList; arguments_QList.reserve(arguments->len); - struct miqt_string** arguments_arr = static_cast(arguments->data); + struct miqt_string* arguments_arr = static_cast(arguments->data); for(size_t i = 0; i < arguments->len; ++i) { - QString arguments_arr_i_QString = QString::fromUtf8(&arguments_arr[i]->data, arguments_arr[i]->len); + QString arguments_arr_i_QString = QString::fromUtf8(arguments_arr[i].data, arguments_arr[i].len); arguments_QList.push_back(arguments_arr_i_QString); } self->start(program_QString, arguments_QList); } -void QProcess_StartWithCommand(QProcess* self, struct miqt_string* command) { - QString command_QString = QString::fromUtf8(&command->data, command->len); +void QProcess_StartWithCommand(QProcess* self, struct miqt_string command) { + QString command_QString = QString::fromUtf8(command.data, command.len); self->start(command_QString); } @@ -179,27 +203,35 @@ bool QProcess_Open(QProcess* self) { return self->open(); } -struct miqt_string* QProcess_Program(const QProcess* self) { +struct miqt_string QProcess_Program(const QProcess* self) { QString _ret = self->program(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QProcess_SetProgram(QProcess* self, struct miqt_string* program) { - QString program_QString = QString::fromUtf8(&program->data, program->len); +void QProcess_SetProgram(QProcess* self, struct miqt_string program) { + QString program_QString = QString::fromUtf8(program.data, program.len); self->setProgram(program_QString); } struct miqt_array* QProcess_Arguments(const QProcess* self) { QStringList _ret = self->arguments(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -207,12 +239,12 @@ struct miqt_array* QProcess_Arguments(const QProcess* self) { return _out; } -void QProcess_SetArguments(QProcess* self, struct miqt_array* /* of struct miqt_string* */ arguments) { +void QProcess_SetArguments(QProcess* self, struct miqt_array* /* of struct miqt_string */ arguments) { QStringList arguments_QList; arguments_QList.reserve(arguments->len); - struct miqt_string** arguments_arr = static_cast(arguments->data); + struct miqt_string* arguments_arr = static_cast(arguments->data); for(size_t i = 0; i < arguments->len; ++i) { - QString arguments_arr_i_QString = QString::fromUtf8(&arguments_arr[i]->data, arguments_arr[i]->len); + QString arguments_arr_i_QString = QString::fromUtf8(arguments_arr[i].data, arguments_arr[i].len); arguments_QList.push_back(arguments_arr_i_QString); } self->setArguments(arguments_QList); @@ -262,18 +294,18 @@ void QProcess_CloseWriteChannel(QProcess* self) { self->closeWriteChannel(); } -void QProcess_SetStandardInputFile(QProcess* self, struct miqt_string* fileName) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +void QProcess_SetStandardInputFile(QProcess* self, struct miqt_string fileName) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); self->setStandardInputFile(fileName_QString); } -void QProcess_SetStandardOutputFile(QProcess* self, struct miqt_string* fileName) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +void QProcess_SetStandardOutputFile(QProcess* self, struct miqt_string fileName) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); self->setStandardOutputFile(fileName_QString); } -void QProcess_SetStandardErrorFile(QProcess* self, struct miqt_string* fileName) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +void QProcess_SetStandardErrorFile(QProcess* self, struct miqt_string fileName) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); self->setStandardErrorFile(fileName_QString); } @@ -281,24 +313,28 @@ void QProcess_SetStandardOutputProcess(QProcess* self, QProcess* destination) { self->setStandardOutputProcess(destination); } -struct miqt_string* QProcess_WorkingDirectory(const QProcess* self) { +struct miqt_string QProcess_WorkingDirectory(const QProcess* self) { QString _ret = self->workingDirectory(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QProcess_SetWorkingDirectory(QProcess* self, struct miqt_string* dir) { - QString dir_QString = QString::fromUtf8(&dir->data, dir->len); +void QProcess_SetWorkingDirectory(QProcess* self, struct miqt_string dir) { + QString dir_QString = QString::fromUtf8(dir.data, dir.len); self->setWorkingDirectory(dir_QString); } -void QProcess_SetEnvironment(QProcess* self, struct miqt_array* /* of struct miqt_string* */ environment) { +void QProcess_SetEnvironment(QProcess* self, struct miqt_array* /* of struct miqt_string */ environment) { QStringList environment_QList; environment_QList.reserve(environment->len); - struct miqt_string** environment_arr = static_cast(environment->data); + struct miqt_string* environment_arr = static_cast(environment->data); for(size_t i = 0; i < environment->len; ++i) { - QString environment_arr_i_QString = QString::fromUtf8(&environment_arr[i]->data, environment_arr[i]->len); + QString environment_arr_i_QString = QString::fromUtf8(environment_arr[i].data, environment_arr[i].len); environment_QList.push_back(environment_arr_i_QString); } self->setEnvironment(environment_QList); @@ -307,12 +343,16 @@ void QProcess_SetEnvironment(QProcess* self, struct miqt_array* /* of struct miq struct miqt_array* QProcess_Environment(const QProcess* self) { QStringList _ret = self->environment(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -369,12 +409,22 @@ bool QProcess_WaitForFinished(QProcess* self) { return self->waitForFinished(); } -QByteArray* QProcess_ReadAllStandardOutput(QProcess* self) { - return new QByteArray(self->readAllStandardOutput()); +struct miqt_string QProcess_ReadAllStandardOutput(QProcess* self) { + QByteArray _qb = self->readAllStandardOutput(); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } -QByteArray* QProcess_ReadAllStandardError(QProcess* self) { - return new QByteArray(self->readAllStandardError()); +struct miqt_string QProcess_ReadAllStandardError(QProcess* self) { + QByteArray _qb = self->readAllStandardError(); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } int QProcess_ExitCode(const QProcess* self) { @@ -412,62 +462,66 @@ bool QProcess_AtEnd(const QProcess* self) { return self->atEnd(); } -int QProcess_Execute(struct miqt_string* program, struct miqt_array* /* of struct miqt_string* */ arguments) { - QString program_QString = QString::fromUtf8(&program->data, program->len); +int QProcess_Execute(struct miqt_string program, struct miqt_array* /* of struct miqt_string */ arguments) { + QString program_QString = QString::fromUtf8(program.data, program.len); QStringList arguments_QList; arguments_QList.reserve(arguments->len); - struct miqt_string** arguments_arr = static_cast(arguments->data); + struct miqt_string* arguments_arr = static_cast(arguments->data); for(size_t i = 0; i < arguments->len; ++i) { - QString arguments_arr_i_QString = QString::fromUtf8(&arguments_arr[i]->data, arguments_arr[i]->len); + QString arguments_arr_i_QString = QString::fromUtf8(arguments_arr[i].data, arguments_arr[i].len); arguments_QList.push_back(arguments_arr_i_QString); } return QProcess::execute(program_QString, arguments_QList); } -int QProcess_ExecuteWithCommand(struct miqt_string* command) { - QString command_QString = QString::fromUtf8(&command->data, command->len); +int QProcess_ExecuteWithCommand(struct miqt_string command) { + QString command_QString = QString::fromUtf8(command.data, command.len); return QProcess::execute(command_QString); } -bool QProcess_StartDetached2(struct miqt_string* program, struct miqt_array* /* of struct miqt_string* */ arguments, struct miqt_string* workingDirectory) { - QString program_QString = QString::fromUtf8(&program->data, program->len); +bool QProcess_StartDetached2(struct miqt_string program, struct miqt_array* /* of struct miqt_string */ arguments, struct miqt_string workingDirectory) { + QString program_QString = QString::fromUtf8(program.data, program.len); QStringList arguments_QList; arguments_QList.reserve(arguments->len); - struct miqt_string** arguments_arr = static_cast(arguments->data); + struct miqt_string* arguments_arr = static_cast(arguments->data); for(size_t i = 0; i < arguments->len; ++i) { - QString arguments_arr_i_QString = QString::fromUtf8(&arguments_arr[i]->data, arguments_arr[i]->len); + QString arguments_arr_i_QString = QString::fromUtf8(arguments_arr[i].data, arguments_arr[i].len); arguments_QList.push_back(arguments_arr_i_QString); } - QString workingDirectory_QString = QString::fromUtf8(&workingDirectory->data, workingDirectory->len); + QString workingDirectory_QString = QString::fromUtf8(workingDirectory.data, workingDirectory.len); return QProcess::startDetached(program_QString, arguments_QList, workingDirectory_QString); } -bool QProcess_StartDetached3(struct miqt_string* program, struct miqt_array* /* of struct miqt_string* */ arguments) { - QString program_QString = QString::fromUtf8(&program->data, program->len); +bool QProcess_StartDetached3(struct miqt_string program, struct miqt_array* /* of struct miqt_string */ arguments) { + QString program_QString = QString::fromUtf8(program.data, program.len); QStringList arguments_QList; arguments_QList.reserve(arguments->len); - struct miqt_string** arguments_arr = static_cast(arguments->data); + struct miqt_string* arguments_arr = static_cast(arguments->data); for(size_t i = 0; i < arguments->len; ++i) { - QString arguments_arr_i_QString = QString::fromUtf8(&arguments_arr[i]->data, arguments_arr[i]->len); + QString arguments_arr_i_QString = QString::fromUtf8(arguments_arr[i].data, arguments_arr[i].len); arguments_QList.push_back(arguments_arr_i_QString); } return QProcess::startDetached(program_QString, arguments_QList); } -bool QProcess_StartDetachedWithCommand(struct miqt_string* command) { - QString command_QString = QString::fromUtf8(&command->data, command->len); +bool QProcess_StartDetachedWithCommand(struct miqt_string command) { + QString command_QString = QString::fromUtf8(command.data, command.len); return QProcess::startDetached(command_QString); } struct miqt_array* QProcess_SystemEnvironment() { QStringList _ret = QProcess::systemEnvironment(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -475,11 +529,15 @@ struct miqt_array* QProcess_SystemEnvironment() { return _out; } -struct miqt_string* QProcess_NullDevice() { +struct miqt_string QProcess_NullDevice() { QString _ret = QProcess::nullDevice(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QProcess_Terminate(QProcess* self) { @@ -538,48 +596,64 @@ void QProcess_connect_ErrorOccurred(QProcess* self, intptr_t slot) { }); } -struct miqt_string* QProcess_Tr2(const char* s, const char* c) { +struct miqt_string QProcess_Tr2(const char* s, const char* c) { QString _ret = QProcess::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QProcess_Tr3(const char* s, const char* c, int n) { +struct miqt_string QProcess_Tr3(const char* s, const char* c, int n) { QString _ret = QProcess::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QProcess_TrUtf82(const char* s, const char* c) { +struct miqt_string QProcess_TrUtf82(const char* s, const char* c) { QString _ret = QProcess::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QProcess_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QProcess_TrUtf83(const char* s, const char* c, int n) { QString _ret = QProcess::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QProcess_Start3(QProcess* self, struct miqt_string* program, struct miqt_array* /* of struct miqt_string* */ arguments, int mode) { - QString program_QString = QString::fromUtf8(&program->data, program->len); +void QProcess_Start3(QProcess* self, struct miqt_string program, struct miqt_array* /* of struct miqt_string */ arguments, int mode) { + QString program_QString = QString::fromUtf8(program.data, program.len); QStringList arguments_QList; arguments_QList.reserve(arguments->len); - struct miqt_string** arguments_arr = static_cast(arguments->data); + struct miqt_string* arguments_arr = static_cast(arguments->data); for(size_t i = 0; i < arguments->len; ++i) { - QString arguments_arr_i_QString = QString::fromUtf8(&arguments_arr[i]->data, arguments_arr[i]->len); + QString arguments_arr_i_QString = QString::fromUtf8(arguments_arr[i].data, arguments_arr[i].len); arguments_QList.push_back(arguments_arr_i_QString); } self->start(program_QString, arguments_QList, static_cast(mode)); } -void QProcess_Start22(QProcess* self, struct miqt_string* command, int mode) { - QString command_QString = QString::fromUtf8(&command->data, command->len); +void QProcess_Start22(QProcess* self, struct miqt_string command, int mode) { + QString command_QString = QString::fromUtf8(command.data, command.len); self->start(command_QString, static_cast(mode)); } @@ -595,13 +669,13 @@ bool QProcess_Open1(QProcess* self, int mode) { return self->open(static_cast(mode)); } -void QProcess_SetStandardOutputFile2(QProcess* self, struct miqt_string* fileName, int mode) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +void QProcess_SetStandardOutputFile2(QProcess* self, struct miqt_string fileName, int mode) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); self->setStandardOutputFile(fileName_QString, static_cast(mode)); } -void QProcess_SetStandardErrorFile2(QProcess* self, struct miqt_string* fileName, int mode) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +void QProcess_SetStandardErrorFile2(QProcess* self, struct miqt_string fileName, int mode) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); self->setStandardErrorFile(fileName_QString, static_cast(mode)); } @@ -621,16 +695,16 @@ bool QProcess_WaitForFinished1(QProcess* self, int msecs) { return self->waitForFinished(static_cast(msecs)); } -bool QProcess_StartDetached4(struct miqt_string* program, struct miqt_array* /* of struct miqt_string* */ arguments, struct miqt_string* workingDirectory, long long* pid) { - QString program_QString = QString::fromUtf8(&program->data, program->len); +bool QProcess_StartDetached4(struct miqt_string program, struct miqt_array* /* of struct miqt_string */ arguments, struct miqt_string workingDirectory, long long* pid) { + QString program_QString = QString::fromUtf8(program.data, program.len); QStringList arguments_QList; arguments_QList.reserve(arguments->len); - struct miqt_string** arguments_arr = static_cast(arguments->data); + struct miqt_string* arguments_arr = static_cast(arguments->data); for(size_t i = 0; i < arguments->len; ++i) { - QString arguments_arr_i_QString = QString::fromUtf8(&arguments_arr[i]->data, arguments_arr[i]->len); + QString arguments_arr_i_QString = QString::fromUtf8(arguments_arr[i].data, arguments_arr[i].len); arguments_QList.push_back(arguments_arr_i_QString); } - QString workingDirectory_QString = QString::fromUtf8(&workingDirectory->data, workingDirectory->len); + QString workingDirectory_QString = QString::fromUtf8(workingDirectory.data, workingDirectory.len); return QProcess::startDetached(program_QString, arguments_QList, workingDirectory_QString, static_cast(pid)); } diff --git a/qt/gen_qprocess.go b/qt/gen_qprocess.go index 651ffce2..f82e50ea 100644 --- a/qt/gen_qprocess.go +++ b/qt/gen_qprocess.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "runtime/cgo" "unsafe" @@ -131,42 +130,52 @@ func (this *QProcessEnvironment) Clear() { } func (this *QProcessEnvironment) Contains(name string) bool { - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - return (bool)(C.QProcessEnvironment_Contains(this.h, (*C.struct_miqt_string)(name_ms))) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + return (bool)(C.QProcessEnvironment_Contains(this.h, name_ms)) } func (this *QProcessEnvironment) Insert(name string, value string) { - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - value_ms := libmiqt.Strdupg(value) - defer C.free(value_ms) - C.QProcessEnvironment_Insert(this.h, (*C.struct_miqt_string)(name_ms), (*C.struct_miqt_string)(value_ms)) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + value_ms := C.struct_miqt_string{} + value_ms.data = C.CString(value) + value_ms.len = C.size_t(len(value)) + defer C.free(unsafe.Pointer(value_ms.data)) + C.QProcessEnvironment_Insert(this.h, name_ms, value_ms) } func (this *QProcessEnvironment) Remove(name string) { - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - C.QProcessEnvironment_Remove(this.h, (*C.struct_miqt_string)(name_ms)) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + C.QProcessEnvironment_Remove(this.h, name_ms) } func (this *QProcessEnvironment) Value(name string) string { - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - var _ms *C.struct_miqt_string = C.QProcessEnvironment_Value(this.h, (*C.struct_miqt_string)(name_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + var _ms C.struct_miqt_string = C.QProcessEnvironment_Value(this.h, name_ms) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QProcessEnvironment) ToStringList() []string { var _ma *C.struct_miqt_array = C.QProcessEnvironment_ToStringList(this.h) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -176,11 +185,11 @@ func (this *QProcessEnvironment) ToStringList() []string { func (this *QProcessEnvironment) Keys() []string { var _ma *C.struct_miqt_array = C.QProcessEnvironment_Keys(this.h) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -199,13 +208,17 @@ func QProcessEnvironment_SystemEnvironment() *QProcessEnvironment { } func (this *QProcessEnvironment) Value2(name string, defaultValue string) string { - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - defaultValue_ms := libmiqt.Strdupg(defaultValue) - defer C.free(defaultValue_ms) - var _ms *C.struct_miqt_string = C.QProcessEnvironment_Value2(this.h, (*C.struct_miqt_string)(name_ms), (*C.struct_miqt_string)(defaultValue_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + defaultValue_ms := C.struct_miqt_string{} + defaultValue_ms.data = C.CString(defaultValue) + defaultValue_ms.len = C.size_t(len(defaultValue)) + defer C.free(unsafe.Pointer(defaultValue_ms.data)) + var _ms C.struct_miqt_string = C.QProcessEnvironment_Value2(this.h, name_ms, defaultValue_ms) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -272,47 +285,53 @@ func (this *QProcess) MetaObject() *QMetaObject { func (this *QProcess) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QProcess_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QProcess_Metacast(this.h, param1_Cstring)) } func QProcess_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QProcess_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QProcess_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QProcess_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QProcess_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QProcess_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QProcess) Start(program string, arguments []string) { - program_ms := libmiqt.Strdupg(program) - defer C.free(program_ms) + program_ms := C.struct_miqt_string{} + program_ms.data = C.CString(program) + program_ms.len = C.size_t(len(program)) + defer C.free(unsafe.Pointer(program_ms.data)) // For the C ABI, malloc a C array of raw pointers - arguments_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(arguments)))) + arguments_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(arguments)))) defer C.free(unsafe.Pointer(arguments_CArray)) for i := range arguments { - arguments_i_ms := libmiqt.Strdupg(arguments[i]) - defer C.free(arguments_i_ms) - arguments_CArray[i] = (*C.struct_miqt_string)(arguments_i_ms) + arguments_i_ms := C.struct_miqt_string{} + arguments_i_ms.data = C.CString(arguments[i]) + arguments_i_ms.len = C.size_t(len(arguments[i])) + defer C.free(unsafe.Pointer(arguments_i_ms.data)) + arguments_CArray[i] = arguments_i_ms } arguments_ma := &C.struct_miqt_array{len: C.size_t(len(arguments)), data: unsafe.Pointer(arguments_CArray)} defer runtime.KeepAlive(unsafe.Pointer(arguments_ma)) - C.QProcess_Start(this.h, (*C.struct_miqt_string)(program_ms), arguments_ma) + C.QProcess_Start(this.h, program_ms, arguments_ma) } func (this *QProcess) StartWithCommand(command string) { - command_ms := libmiqt.Strdupg(command) - defer C.free(command_ms) - C.QProcess_StartWithCommand(this.h, (*C.struct_miqt_string)(command_ms)) + command_ms := C.struct_miqt_string{} + command_ms.data = C.CString(command) + command_ms.len = C.size_t(len(command)) + defer C.free(unsafe.Pointer(command_ms.data)) + C.QProcess_StartWithCommand(this.h, command_ms) } func (this *QProcess) Start2() { @@ -328,26 +347,28 @@ func (this *QProcess) Open() bool { } func (this *QProcess) Program() string { - var _ms *C.struct_miqt_string = C.QProcess_Program(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QProcess_Program(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QProcess) SetProgram(program string) { - program_ms := libmiqt.Strdupg(program) - defer C.free(program_ms) - C.QProcess_SetProgram(this.h, (*C.struct_miqt_string)(program_ms)) + program_ms := C.struct_miqt_string{} + program_ms.data = C.CString(program) + program_ms.len = C.size_t(len(program)) + defer C.free(unsafe.Pointer(program_ms.data)) + C.QProcess_SetProgram(this.h, program_ms) } func (this *QProcess) Arguments() []string { var _ma *C.struct_miqt_array = C.QProcess_Arguments(this.h) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -356,12 +377,14 @@ func (this *QProcess) Arguments() []string { func (this *QProcess) SetArguments(arguments []string) { // For the C ABI, malloc a C array of raw pointers - arguments_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(arguments)))) + arguments_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(arguments)))) defer C.free(unsafe.Pointer(arguments_CArray)) for i := range arguments { - arguments_i_ms := libmiqt.Strdupg(arguments[i]) - defer C.free(arguments_i_ms) - arguments_CArray[i] = (*C.struct_miqt_string)(arguments_i_ms) + arguments_i_ms := C.struct_miqt_string{} + arguments_i_ms.data = C.CString(arguments[i]) + arguments_i_ms.len = C.size_t(len(arguments[i])) + defer C.free(unsafe.Pointer(arguments_i_ms.data)) + arguments_CArray[i] = arguments_i_ms } arguments_ma := &C.struct_miqt_array{len: C.size_t(len(arguments)), data: unsafe.Pointer(arguments_CArray)} defer runtime.KeepAlive(unsafe.Pointer(arguments_ma)) @@ -409,21 +432,27 @@ func (this *QProcess) CloseWriteChannel() { } func (this *QProcess) SetStandardInputFile(fileName string) { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - C.QProcess_SetStandardInputFile(this.h, (*C.struct_miqt_string)(fileName_ms)) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + C.QProcess_SetStandardInputFile(this.h, fileName_ms) } func (this *QProcess) SetStandardOutputFile(fileName string) { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - C.QProcess_SetStandardOutputFile(this.h, (*C.struct_miqt_string)(fileName_ms)) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + C.QProcess_SetStandardOutputFile(this.h, fileName_ms) } func (this *QProcess) SetStandardErrorFile(fileName string) { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - C.QProcess_SetStandardErrorFile(this.h, (*C.struct_miqt_string)(fileName_ms)) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + C.QProcess_SetStandardErrorFile(this.h, fileName_ms) } func (this *QProcess) SetStandardOutputProcess(destination *QProcess) { @@ -431,26 +460,30 @@ func (this *QProcess) SetStandardOutputProcess(destination *QProcess) { } func (this *QProcess) WorkingDirectory() string { - var _ms *C.struct_miqt_string = C.QProcess_WorkingDirectory(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QProcess_WorkingDirectory(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QProcess) SetWorkingDirectory(dir string) { - dir_ms := libmiqt.Strdupg(dir) - defer C.free(dir_ms) - C.QProcess_SetWorkingDirectory(this.h, (*C.struct_miqt_string)(dir_ms)) + dir_ms := C.struct_miqt_string{} + dir_ms.data = C.CString(dir) + dir_ms.len = C.size_t(len(dir)) + defer C.free(unsafe.Pointer(dir_ms.data)) + C.QProcess_SetWorkingDirectory(this.h, dir_ms) } func (this *QProcess) SetEnvironment(environment []string) { // For the C ABI, malloc a C array of raw pointers - environment_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(environment)))) + environment_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(environment)))) defer C.free(unsafe.Pointer(environment_CArray)) for i := range environment { - environment_i_ms := libmiqt.Strdupg(environment[i]) - defer C.free(environment_i_ms) - environment_CArray[i] = (*C.struct_miqt_string)(environment_i_ms) + environment_i_ms := C.struct_miqt_string{} + environment_i_ms.data = C.CString(environment[i]) + environment_i_ms.len = C.size_t(len(environment[i])) + defer C.free(unsafe.Pointer(environment_i_ms.data)) + environment_CArray[i] = environment_i_ms } environment_ma := &C.struct_miqt_array{len: C.size_t(len(environment)), data: unsafe.Pointer(environment_CArray)} defer runtime.KeepAlive(unsafe.Pointer(environment_ma)) @@ -460,11 +493,11 @@ func (this *QProcess) SetEnvironment(environment []string) { func (this *QProcess) Environment() []string { var _ma *C.struct_miqt_array = C.QProcess_Environment(this.h) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -518,18 +551,18 @@ func (this *QProcess) WaitForFinished() bool { return (bool)(C.QProcess_WaitForFinished(this.h)) } -func (this *QProcess) ReadAllStandardOutput() *QByteArray { - _ret := C.QProcess_ReadAllStandardOutput(this.h) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QProcess) ReadAllStandardOutput() []byte { + var _bytearray C.struct_miqt_string = C.QProcess_ReadAllStandardOutput(this.h) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } -func (this *QProcess) ReadAllStandardError() *QByteArray { - _ret := C.QProcess_ReadAllStandardError(this.h) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QProcess) ReadAllStandardError() []byte { + var _bytearray C.struct_miqt_string = C.QProcess_ReadAllStandardError(this.h) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } func (this *QProcess) ExitCode() int { @@ -565,75 +598,93 @@ func (this *QProcess) AtEnd() bool { } func QProcess_Execute(program string, arguments []string) int { - program_ms := libmiqt.Strdupg(program) - defer C.free(program_ms) + program_ms := C.struct_miqt_string{} + program_ms.data = C.CString(program) + program_ms.len = C.size_t(len(program)) + defer C.free(unsafe.Pointer(program_ms.data)) // For the C ABI, malloc a C array of raw pointers - arguments_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(arguments)))) + arguments_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(arguments)))) defer C.free(unsafe.Pointer(arguments_CArray)) for i := range arguments { - arguments_i_ms := libmiqt.Strdupg(arguments[i]) - defer C.free(arguments_i_ms) - arguments_CArray[i] = (*C.struct_miqt_string)(arguments_i_ms) + arguments_i_ms := C.struct_miqt_string{} + arguments_i_ms.data = C.CString(arguments[i]) + arguments_i_ms.len = C.size_t(len(arguments[i])) + defer C.free(unsafe.Pointer(arguments_i_ms.data)) + arguments_CArray[i] = arguments_i_ms } arguments_ma := &C.struct_miqt_array{len: C.size_t(len(arguments)), data: unsafe.Pointer(arguments_CArray)} defer runtime.KeepAlive(unsafe.Pointer(arguments_ma)) - return (int)(C.QProcess_Execute((*C.struct_miqt_string)(program_ms), arguments_ma)) + return (int)(C.QProcess_Execute(program_ms, arguments_ma)) } func QProcess_ExecuteWithCommand(command string) int { - command_ms := libmiqt.Strdupg(command) - defer C.free(command_ms) - return (int)(C.QProcess_ExecuteWithCommand((*C.struct_miqt_string)(command_ms))) + command_ms := C.struct_miqt_string{} + command_ms.data = C.CString(command) + command_ms.len = C.size_t(len(command)) + defer C.free(unsafe.Pointer(command_ms.data)) + return (int)(C.QProcess_ExecuteWithCommand(command_ms)) } func QProcess_StartDetached2(program string, arguments []string, workingDirectory string) bool { - program_ms := libmiqt.Strdupg(program) - defer C.free(program_ms) + program_ms := C.struct_miqt_string{} + program_ms.data = C.CString(program) + program_ms.len = C.size_t(len(program)) + defer C.free(unsafe.Pointer(program_ms.data)) // For the C ABI, malloc a C array of raw pointers - arguments_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(arguments)))) + arguments_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(arguments)))) defer C.free(unsafe.Pointer(arguments_CArray)) for i := range arguments { - arguments_i_ms := libmiqt.Strdupg(arguments[i]) - defer C.free(arguments_i_ms) - arguments_CArray[i] = (*C.struct_miqt_string)(arguments_i_ms) + arguments_i_ms := C.struct_miqt_string{} + arguments_i_ms.data = C.CString(arguments[i]) + arguments_i_ms.len = C.size_t(len(arguments[i])) + defer C.free(unsafe.Pointer(arguments_i_ms.data)) + arguments_CArray[i] = arguments_i_ms } arguments_ma := &C.struct_miqt_array{len: C.size_t(len(arguments)), data: unsafe.Pointer(arguments_CArray)} defer runtime.KeepAlive(unsafe.Pointer(arguments_ma)) - workingDirectory_ms := libmiqt.Strdupg(workingDirectory) - defer C.free(workingDirectory_ms) - return (bool)(C.QProcess_StartDetached2((*C.struct_miqt_string)(program_ms), arguments_ma, (*C.struct_miqt_string)(workingDirectory_ms))) + workingDirectory_ms := C.struct_miqt_string{} + workingDirectory_ms.data = C.CString(workingDirectory) + workingDirectory_ms.len = C.size_t(len(workingDirectory)) + defer C.free(unsafe.Pointer(workingDirectory_ms.data)) + return (bool)(C.QProcess_StartDetached2(program_ms, arguments_ma, workingDirectory_ms)) } func QProcess_StartDetached3(program string, arguments []string) bool { - program_ms := libmiqt.Strdupg(program) - defer C.free(program_ms) + program_ms := C.struct_miqt_string{} + program_ms.data = C.CString(program) + program_ms.len = C.size_t(len(program)) + defer C.free(unsafe.Pointer(program_ms.data)) // For the C ABI, malloc a C array of raw pointers - arguments_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(arguments)))) + arguments_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(arguments)))) defer C.free(unsafe.Pointer(arguments_CArray)) for i := range arguments { - arguments_i_ms := libmiqt.Strdupg(arguments[i]) - defer C.free(arguments_i_ms) - arguments_CArray[i] = (*C.struct_miqt_string)(arguments_i_ms) + arguments_i_ms := C.struct_miqt_string{} + arguments_i_ms.data = C.CString(arguments[i]) + arguments_i_ms.len = C.size_t(len(arguments[i])) + defer C.free(unsafe.Pointer(arguments_i_ms.data)) + arguments_CArray[i] = arguments_i_ms } arguments_ma := &C.struct_miqt_array{len: C.size_t(len(arguments)), data: unsafe.Pointer(arguments_CArray)} defer runtime.KeepAlive(unsafe.Pointer(arguments_ma)) - return (bool)(C.QProcess_StartDetached3((*C.struct_miqt_string)(program_ms), arguments_ma)) + return (bool)(C.QProcess_StartDetached3(program_ms, arguments_ma)) } func QProcess_StartDetachedWithCommand(command string) bool { - command_ms := libmiqt.Strdupg(command) - defer C.free(command_ms) - return (bool)(C.QProcess_StartDetachedWithCommand((*C.struct_miqt_string)(command_ms))) + command_ms := C.struct_miqt_string{} + command_ms.data = C.CString(command) + command_ms.len = C.size_t(len(command)) + defer C.free(unsafe.Pointer(command_ms.data)) + return (bool)(C.QProcess_StartDetachedWithCommand(command_ms)) } func QProcess_SystemEnvironment() []string { var _ma *C.struct_miqt_array = C.QProcess_SystemEnvironment() _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -641,9 +692,9 @@ func QProcess_SystemEnvironment() []string { } func QProcess_NullDevice() string { - var _ms *C.struct_miqt_string = C.QProcess_NullDevice() - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QProcess_NullDevice() + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -742,9 +793,9 @@ func QProcess_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QProcess_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QProcess_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -753,9 +804,9 @@ func QProcess_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QProcess_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QProcess_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -764,9 +815,9 @@ func QProcess_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QProcess_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QProcess_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -775,32 +826,38 @@ func QProcess_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QProcess_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QProcess_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QProcess) Start3(program string, arguments []string, mode QIODevice__OpenModeFlag) { - program_ms := libmiqt.Strdupg(program) - defer C.free(program_ms) + program_ms := C.struct_miqt_string{} + program_ms.data = C.CString(program) + program_ms.len = C.size_t(len(program)) + defer C.free(unsafe.Pointer(program_ms.data)) // For the C ABI, malloc a C array of raw pointers - arguments_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(arguments)))) + arguments_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(arguments)))) defer C.free(unsafe.Pointer(arguments_CArray)) for i := range arguments { - arguments_i_ms := libmiqt.Strdupg(arguments[i]) - defer C.free(arguments_i_ms) - arguments_CArray[i] = (*C.struct_miqt_string)(arguments_i_ms) + arguments_i_ms := C.struct_miqt_string{} + arguments_i_ms.data = C.CString(arguments[i]) + arguments_i_ms.len = C.size_t(len(arguments[i])) + defer C.free(unsafe.Pointer(arguments_i_ms.data)) + arguments_CArray[i] = arguments_i_ms } arguments_ma := &C.struct_miqt_array{len: C.size_t(len(arguments)), data: unsafe.Pointer(arguments_CArray)} defer runtime.KeepAlive(unsafe.Pointer(arguments_ma)) - C.QProcess_Start3(this.h, (*C.struct_miqt_string)(program_ms), arguments_ma, (C.int)(mode)) + C.QProcess_Start3(this.h, program_ms, arguments_ma, (C.int)(mode)) } func (this *QProcess) Start22(command string, mode QIODevice__OpenModeFlag) { - command_ms := libmiqt.Strdupg(command) - defer C.free(command_ms) - C.QProcess_Start22(this.h, (*C.struct_miqt_string)(command_ms), (C.int)(mode)) + command_ms := C.struct_miqt_string{} + command_ms.data = C.CString(command) + command_ms.len = C.size_t(len(command)) + defer C.free(unsafe.Pointer(command_ms.data)) + C.QProcess_Start22(this.h, command_ms, (C.int)(mode)) } func (this *QProcess) Start1(mode QIODevice__OpenModeFlag) { @@ -816,15 +873,19 @@ func (this *QProcess) Open1(mode QIODevice__OpenModeFlag) bool { } func (this *QProcess) SetStandardOutputFile2(fileName string, mode QIODevice__OpenModeFlag) { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - C.QProcess_SetStandardOutputFile2(this.h, (*C.struct_miqt_string)(fileName_ms), (C.int)(mode)) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + C.QProcess_SetStandardOutputFile2(this.h, fileName_ms, (C.int)(mode)) } func (this *QProcess) SetStandardErrorFile2(fileName string, mode QIODevice__OpenModeFlag) { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - C.QProcess_SetStandardErrorFile2(this.h, (*C.struct_miqt_string)(fileName_ms), (C.int)(mode)) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + C.QProcess_SetStandardErrorFile2(this.h, fileName_ms, (C.int)(mode)) } func (this *QProcess) WaitForStarted1(msecs int) bool { @@ -844,21 +905,27 @@ func (this *QProcess) WaitForFinished1(msecs int) bool { } func QProcess_StartDetached4(program string, arguments []string, workingDirectory string, pid *int64) bool { - program_ms := libmiqt.Strdupg(program) - defer C.free(program_ms) + program_ms := C.struct_miqt_string{} + program_ms.data = C.CString(program) + program_ms.len = C.size_t(len(program)) + defer C.free(unsafe.Pointer(program_ms.data)) // For the C ABI, malloc a C array of raw pointers - arguments_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(arguments)))) + arguments_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(arguments)))) defer C.free(unsafe.Pointer(arguments_CArray)) for i := range arguments { - arguments_i_ms := libmiqt.Strdupg(arguments[i]) - defer C.free(arguments_i_ms) - arguments_CArray[i] = (*C.struct_miqt_string)(arguments_i_ms) + arguments_i_ms := C.struct_miqt_string{} + arguments_i_ms.data = C.CString(arguments[i]) + arguments_i_ms.len = C.size_t(len(arguments[i])) + defer C.free(unsafe.Pointer(arguments_i_ms.data)) + arguments_CArray[i] = arguments_i_ms } arguments_ma := &C.struct_miqt_array{len: C.size_t(len(arguments)), data: unsafe.Pointer(arguments_CArray)} defer runtime.KeepAlive(unsafe.Pointer(arguments_ma)) - workingDirectory_ms := libmiqt.Strdupg(workingDirectory) - defer C.free(workingDirectory_ms) - return (bool)(C.QProcess_StartDetached4((*C.struct_miqt_string)(program_ms), arguments_ma, (*C.struct_miqt_string)(workingDirectory_ms), (*C.longlong)(unsafe.Pointer(pid)))) + workingDirectory_ms := C.struct_miqt_string{} + workingDirectory_ms.data = C.CString(workingDirectory) + workingDirectory_ms.len = C.size_t(len(workingDirectory)) + defer C.free(unsafe.Pointer(workingDirectory_ms.data)) + return (bool)(C.QProcess_StartDetached4(program_ms, arguments_ma, workingDirectory_ms, (*C.longlong)(unsafe.Pointer(pid)))) } // Delete this object from C++ memory. diff --git a/qt/gen_qprocess.h b/qt/gen_qprocess.h index 960f4583..a963f752 100644 --- a/qt/gen_qprocess.h +++ b/qt/gen_qprocess.h @@ -35,32 +35,32 @@ bool QProcessEnvironment_OperatorEqual(const QProcessEnvironment* self, QProcess bool QProcessEnvironment_OperatorNotEqual(const QProcessEnvironment* self, QProcessEnvironment* other); bool QProcessEnvironment_IsEmpty(const QProcessEnvironment* self); void QProcessEnvironment_Clear(QProcessEnvironment* self); -bool QProcessEnvironment_Contains(const QProcessEnvironment* self, struct miqt_string* name); -void QProcessEnvironment_Insert(QProcessEnvironment* self, struct miqt_string* name, struct miqt_string* value); -void QProcessEnvironment_Remove(QProcessEnvironment* self, struct miqt_string* name); -struct miqt_string* QProcessEnvironment_Value(const QProcessEnvironment* self, struct miqt_string* name); +bool QProcessEnvironment_Contains(const QProcessEnvironment* self, struct miqt_string name); +void QProcessEnvironment_Insert(QProcessEnvironment* self, struct miqt_string name, struct miqt_string value); +void QProcessEnvironment_Remove(QProcessEnvironment* self, struct miqt_string name); +struct miqt_string QProcessEnvironment_Value(const QProcessEnvironment* self, struct miqt_string name); struct miqt_array* QProcessEnvironment_ToStringList(const QProcessEnvironment* self); struct miqt_array* QProcessEnvironment_Keys(const QProcessEnvironment* self); void QProcessEnvironment_InsertWithQProcessEnvironment(QProcessEnvironment* self, QProcessEnvironment* e); QProcessEnvironment* QProcessEnvironment_SystemEnvironment(); -struct miqt_string* QProcessEnvironment_Value2(const QProcessEnvironment* self, struct miqt_string* name, struct miqt_string* defaultValue); +struct miqt_string QProcessEnvironment_Value2(const QProcessEnvironment* self, struct miqt_string name, struct miqt_string defaultValue); void QProcessEnvironment_Delete(QProcessEnvironment* self); QProcess* QProcess_new(); QProcess* QProcess_new2(QObject* parent); QMetaObject* QProcess_MetaObject(const QProcess* self); void* QProcess_Metacast(QProcess* self, const char* param1); -struct miqt_string* QProcess_Tr(const char* s); -struct miqt_string* QProcess_TrUtf8(const char* s); -void QProcess_Start(QProcess* self, struct miqt_string* program, struct miqt_array* /* of struct miqt_string* */ arguments); -void QProcess_StartWithCommand(QProcess* self, struct miqt_string* command); +struct miqt_string QProcess_Tr(const char* s); +struct miqt_string QProcess_TrUtf8(const char* s); +void QProcess_Start(QProcess* self, struct miqt_string program, struct miqt_array* /* of struct miqt_string */ arguments); +void QProcess_StartWithCommand(QProcess* self, struct miqt_string command); void QProcess_Start2(QProcess* self); bool QProcess_StartDetached(QProcess* self); bool QProcess_Open(QProcess* self); -struct miqt_string* QProcess_Program(const QProcess* self); -void QProcess_SetProgram(QProcess* self, struct miqt_string* program); +struct miqt_string QProcess_Program(const QProcess* self); +void QProcess_SetProgram(QProcess* self, struct miqt_string program); struct miqt_array* QProcess_Arguments(const QProcess* self); -void QProcess_SetArguments(QProcess* self, struct miqt_array* /* of struct miqt_string* */ arguments); +void QProcess_SetArguments(QProcess* self, struct miqt_array* /* of struct miqt_string */ arguments); int QProcess_ReadChannelMode(const QProcess* self); void QProcess_SetReadChannelMode(QProcess* self, int mode); int QProcess_ProcessChannelMode(const QProcess* self); @@ -71,13 +71,13 @@ int QProcess_ReadChannel(const QProcess* self); void QProcess_SetReadChannel(QProcess* self, int channel); void QProcess_CloseReadChannel(QProcess* self, int channel); void QProcess_CloseWriteChannel(QProcess* self); -void QProcess_SetStandardInputFile(QProcess* self, struct miqt_string* fileName); -void QProcess_SetStandardOutputFile(QProcess* self, struct miqt_string* fileName); -void QProcess_SetStandardErrorFile(QProcess* self, struct miqt_string* fileName); +void QProcess_SetStandardInputFile(QProcess* self, struct miqt_string fileName); +void QProcess_SetStandardOutputFile(QProcess* self, struct miqt_string fileName); +void QProcess_SetStandardErrorFile(QProcess* self, struct miqt_string fileName); void QProcess_SetStandardOutputProcess(QProcess* self, QProcess* destination); -struct miqt_string* QProcess_WorkingDirectory(const QProcess* self); -void QProcess_SetWorkingDirectory(QProcess* self, struct miqt_string* dir); -void QProcess_SetEnvironment(QProcess* self, struct miqt_array* /* of struct miqt_string* */ environment); +struct miqt_string QProcess_WorkingDirectory(const QProcess* self); +void QProcess_SetWorkingDirectory(QProcess* self, struct miqt_string dir); +void QProcess_SetEnvironment(QProcess* self, struct miqt_array* /* of struct miqt_string */ environment); struct miqt_array* QProcess_Environment(const QProcess* self); void QProcess_SetProcessEnvironment(QProcess* self, QProcessEnvironment* environment); QProcessEnvironment* QProcess_ProcessEnvironment(const QProcess* self); @@ -89,8 +89,8 @@ bool QProcess_WaitForStarted(QProcess* self); bool QProcess_WaitForReadyRead(QProcess* self); bool QProcess_WaitForBytesWritten(QProcess* self); bool QProcess_WaitForFinished(QProcess* self); -QByteArray* QProcess_ReadAllStandardOutput(QProcess* self); -QByteArray* QProcess_ReadAllStandardError(QProcess* self); +struct miqt_string QProcess_ReadAllStandardOutput(QProcess* self); +struct miqt_string QProcess_ReadAllStandardError(QProcess* self); int QProcess_ExitCode(const QProcess* self); int QProcess_ExitStatus(const QProcess* self); long long QProcess_BytesAvailable(const QProcess* self); @@ -99,13 +99,13 @@ bool QProcess_IsSequential(const QProcess* self); bool QProcess_CanReadLine(const QProcess* self); void QProcess_Close(QProcess* self); bool QProcess_AtEnd(const QProcess* self); -int QProcess_Execute(struct miqt_string* program, struct miqt_array* /* of struct miqt_string* */ arguments); -int QProcess_ExecuteWithCommand(struct miqt_string* command); -bool QProcess_StartDetached2(struct miqt_string* program, struct miqt_array* /* of struct miqt_string* */ arguments, struct miqt_string* workingDirectory); -bool QProcess_StartDetached3(struct miqt_string* program, struct miqt_array* /* of struct miqt_string* */ arguments); -bool QProcess_StartDetachedWithCommand(struct miqt_string* command); +int QProcess_Execute(struct miqt_string program, struct miqt_array* /* of struct miqt_string */ arguments); +int QProcess_ExecuteWithCommand(struct miqt_string command); +bool QProcess_StartDetached2(struct miqt_string program, struct miqt_array* /* of struct miqt_string */ arguments, struct miqt_string workingDirectory); +bool QProcess_StartDetached3(struct miqt_string program, struct miqt_array* /* of struct miqt_string */ arguments); +bool QProcess_StartDetachedWithCommand(struct miqt_string command); struct miqt_array* QProcess_SystemEnvironment(); -struct miqt_string* QProcess_NullDevice(); +struct miqt_string QProcess_NullDevice(); void QProcess_Terminate(QProcess* self); void QProcess_Kill(QProcess* self); void QProcess_Finished(QProcess* self, int exitCode); @@ -116,22 +116,22 @@ void QProcess_ErrorWithError(QProcess* self, int error); void QProcess_connect_ErrorWithError(QProcess* self, intptr_t slot); void QProcess_ErrorOccurred(QProcess* self, int error); void QProcess_connect_ErrorOccurred(QProcess* self, intptr_t slot); -struct miqt_string* QProcess_Tr2(const char* s, const char* c); -struct miqt_string* QProcess_Tr3(const char* s, const char* c, int n); -struct miqt_string* QProcess_TrUtf82(const char* s, const char* c); -struct miqt_string* QProcess_TrUtf83(const char* s, const char* c, int n); -void QProcess_Start3(QProcess* self, struct miqt_string* program, struct miqt_array* /* of struct miqt_string* */ arguments, int mode); -void QProcess_Start22(QProcess* self, struct miqt_string* command, int mode); +struct miqt_string QProcess_Tr2(const char* s, const char* c); +struct miqt_string QProcess_Tr3(const char* s, const char* c, int n); +struct miqt_string QProcess_TrUtf82(const char* s, const char* c); +struct miqt_string QProcess_TrUtf83(const char* s, const char* c, int n); +void QProcess_Start3(QProcess* self, struct miqt_string program, struct miqt_array* /* of struct miqt_string */ arguments, int mode); +void QProcess_Start22(QProcess* self, struct miqt_string command, int mode); void QProcess_Start1(QProcess* self, int mode); bool QProcess_StartDetached1(QProcess* self, long long* pid); bool QProcess_Open1(QProcess* self, int mode); -void QProcess_SetStandardOutputFile2(QProcess* self, struct miqt_string* fileName, int mode); -void QProcess_SetStandardErrorFile2(QProcess* self, struct miqt_string* fileName, int mode); +void QProcess_SetStandardOutputFile2(QProcess* self, struct miqt_string fileName, int mode); +void QProcess_SetStandardErrorFile2(QProcess* self, struct miqt_string fileName, int mode); bool QProcess_WaitForStarted1(QProcess* self, int msecs); bool QProcess_WaitForReadyRead1(QProcess* self, int msecs); bool QProcess_WaitForBytesWritten1(QProcess* self, int msecs); bool QProcess_WaitForFinished1(QProcess* self, int msecs); -bool QProcess_StartDetached4(struct miqt_string* program, struct miqt_array* /* of struct miqt_string* */ arguments, struct miqt_string* workingDirectory, long long* pid); +bool QProcess_StartDetached4(struct miqt_string program, struct miqt_array* /* of struct miqt_string */ arguments, struct miqt_string workingDirectory, long long* pid); void QProcess_Delete(QProcess* self); #ifdef __cplusplus diff --git a/qt/gen_qprogressbar.cpp b/qt/gen_qprogressbar.cpp index ad400d4d..9f0ab4c3 100644 --- a/qt/gen_qprogressbar.cpp +++ b/qt/gen_qprogressbar.cpp @@ -25,18 +25,26 @@ void* QProgressBar_Metacast(QProgressBar* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QProgressBar_Tr(const char* s) { +struct miqt_string QProgressBar_Tr(const char* s) { QString _ret = QProgressBar::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QProgressBar_TrUtf8(const char* s) { +struct miqt_string QProgressBar_TrUtf8(const char* s) { QString _ret = QProgressBar::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QProgressBar_Minimum(const QProgressBar* self) { @@ -51,11 +59,15 @@ int QProgressBar_Value(const QProgressBar* self) { return self->value(); } -struct miqt_string* QProgressBar_Text(const QProgressBar* self) { +struct miqt_string QProgressBar_Text(const QProgressBar* self) { QString _ret = self->text(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QProgressBar_SetTextVisible(QProgressBar* self, bool visible) { @@ -105,8 +117,8 @@ int QProgressBar_TextDirection(const QProgressBar* self) { return static_cast(_ret); } -void QProgressBar_SetFormat(QProgressBar* self, struct miqt_string* format) { - QString format_QString = QString::fromUtf8(&format->data, format->len); +void QProgressBar_SetFormat(QProgressBar* self, struct miqt_string format) { + QString format_QString = QString::fromUtf8(format.data, format.len); self->setFormat(format_QString); } @@ -114,11 +126,15 @@ void QProgressBar_ResetFormat(QProgressBar* self) { self->resetFormat(); } -struct miqt_string* QProgressBar_Format(const QProgressBar* self) { +struct miqt_string QProgressBar_Format(const QProgressBar* self) { QString _ret = self->format(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QProgressBar_Reset(QProgressBar* self) { @@ -156,32 +172,48 @@ void QProgressBar_connect_ValueChanged(QProgressBar* self, intptr_t slot) { }); } -struct miqt_string* QProgressBar_Tr2(const char* s, const char* c) { +struct miqt_string QProgressBar_Tr2(const char* s, const char* c) { QString _ret = QProgressBar::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QProgressBar_Tr3(const char* s, const char* c, int n) { +struct miqt_string QProgressBar_Tr3(const char* s, const char* c, int n) { QString _ret = QProgressBar::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QProgressBar_TrUtf82(const char* s, const char* c) { +struct miqt_string QProgressBar_TrUtf82(const char* s, const char* c) { QString _ret = QProgressBar::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QProgressBar_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QProgressBar_TrUtf83(const char* s, const char* c, int n) { QString _ret = QProgressBar::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QProgressBar_Delete(QProgressBar* self) { diff --git a/qt/gen_qprogressbar.go b/qt/gen_qprogressbar.go index b69a300c..b54d6905 100644 --- a/qt/gen_qprogressbar.go +++ b/qt/gen_qprogressbar.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "runtime/cgo" "unsafe" @@ -71,24 +70,24 @@ func (this *QProgressBar) MetaObject() *QMetaObject { func (this *QProgressBar) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QProgressBar_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QProgressBar_Metacast(this.h, param1_Cstring)) } func QProgressBar_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QProgressBar_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QProgressBar_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QProgressBar_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QProgressBar_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QProgressBar_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -105,9 +104,9 @@ func (this *QProgressBar) Value() int { } func (this *QProgressBar) Text() string { - var _ms *C.struct_miqt_string = C.QProgressBar_Text(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QProgressBar_Text(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -162,9 +161,11 @@ func (this *QProgressBar) TextDirection() QProgressBar__Direction { } func (this *QProgressBar) SetFormat(format string) { - format_ms := libmiqt.Strdupg(format) - defer C.free(format_ms) - C.QProgressBar_SetFormat(this.h, (*C.struct_miqt_string)(format_ms)) + format_ms := C.struct_miqt_string{} + format_ms.data = C.CString(format) + format_ms.len = C.size_t(len(format)) + defer C.free(unsafe.Pointer(format_ms.data)) + C.QProgressBar_SetFormat(this.h, format_ms) } func (this *QProgressBar) ResetFormat() { @@ -172,9 +173,9 @@ func (this *QProgressBar) ResetFormat() { } func (this *QProgressBar) Format() string { - var _ms *C.struct_miqt_string = C.QProgressBar_Format(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QProgressBar_Format(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -227,9 +228,9 @@ func QProgressBar_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QProgressBar_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QProgressBar_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -238,9 +239,9 @@ func QProgressBar_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QProgressBar_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QProgressBar_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -249,9 +250,9 @@ func QProgressBar_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QProgressBar_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QProgressBar_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -260,9 +261,9 @@ func QProgressBar_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QProgressBar_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QProgressBar_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qprogressbar.h b/qt/gen_qprogressbar.h index a450f25d..768685e3 100644 --- a/qt/gen_qprogressbar.h +++ b/qt/gen_qprogressbar.h @@ -29,12 +29,12 @@ QProgressBar* QProgressBar_new(); QProgressBar* QProgressBar_new2(QWidget* parent); QMetaObject* QProgressBar_MetaObject(const QProgressBar* self); void* QProgressBar_Metacast(QProgressBar* self, const char* param1); -struct miqt_string* QProgressBar_Tr(const char* s); -struct miqt_string* QProgressBar_TrUtf8(const char* s); +struct miqt_string QProgressBar_Tr(const char* s); +struct miqt_string QProgressBar_TrUtf8(const char* s); int QProgressBar_Minimum(const QProgressBar* self); int QProgressBar_Maximum(const QProgressBar* self); int QProgressBar_Value(const QProgressBar* self); -struct miqt_string* QProgressBar_Text(const QProgressBar* self); +struct miqt_string QProgressBar_Text(const QProgressBar* self); void QProgressBar_SetTextVisible(QProgressBar* self, bool visible); bool QProgressBar_IsTextVisible(const QProgressBar* self); int QProgressBar_Alignment(const QProgressBar* self); @@ -46,9 +46,9 @@ void QProgressBar_SetInvertedAppearance(QProgressBar* self, bool invert); bool QProgressBar_InvertedAppearance(const QProgressBar* self); void QProgressBar_SetTextDirection(QProgressBar* self, int textDirection); int QProgressBar_TextDirection(const QProgressBar* self); -void QProgressBar_SetFormat(QProgressBar* self, struct miqt_string* format); +void QProgressBar_SetFormat(QProgressBar* self, struct miqt_string format); void QProgressBar_ResetFormat(QProgressBar* self); -struct miqt_string* QProgressBar_Format(const QProgressBar* self); +struct miqt_string QProgressBar_Format(const QProgressBar* self); void QProgressBar_Reset(QProgressBar* self); void QProgressBar_SetRange(QProgressBar* self, int minimum, int maximum); void QProgressBar_SetMinimum(QProgressBar* self, int minimum); @@ -57,10 +57,10 @@ void QProgressBar_SetValue(QProgressBar* self, int value); void QProgressBar_SetOrientation(QProgressBar* self, int orientation); void QProgressBar_ValueChanged(QProgressBar* self, int value); void QProgressBar_connect_ValueChanged(QProgressBar* self, intptr_t slot); -struct miqt_string* QProgressBar_Tr2(const char* s, const char* c); -struct miqt_string* QProgressBar_Tr3(const char* s, const char* c, int n); -struct miqt_string* QProgressBar_TrUtf82(const char* s, const char* c); -struct miqt_string* QProgressBar_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QProgressBar_Tr2(const char* s, const char* c); +struct miqt_string QProgressBar_Tr3(const char* s, const char* c, int n); +struct miqt_string QProgressBar_TrUtf82(const char* s, const char* c); +struct miqt_string QProgressBar_TrUtf83(const char* s, const char* c, int n); void QProgressBar_Delete(QProgressBar* self); #ifdef __cplusplus diff --git a/qt/gen_qprogressdialog.cpp b/qt/gen_qprogressdialog.cpp index 4f4cd245..c8262a3a 100644 --- a/qt/gen_qprogressdialog.cpp +++ b/qt/gen_qprogressdialog.cpp @@ -16,9 +16,9 @@ QProgressDialog* QProgressDialog_new() { return new QProgressDialog(); } -QProgressDialog* QProgressDialog_new2(struct miqt_string* labelText, struct miqt_string* cancelButtonText, int minimum, int maximum) { - QString labelText_QString = QString::fromUtf8(&labelText->data, labelText->len); - QString cancelButtonText_QString = QString::fromUtf8(&cancelButtonText->data, cancelButtonText->len); +QProgressDialog* QProgressDialog_new2(struct miqt_string labelText, struct miqt_string cancelButtonText, int minimum, int maximum) { + QString labelText_QString = QString::fromUtf8(labelText.data, labelText.len); + QString cancelButtonText_QString = QString::fromUtf8(cancelButtonText.data, cancelButtonText.len); return new QProgressDialog(labelText_QString, cancelButtonText_QString, static_cast(minimum), static_cast(maximum)); } @@ -30,15 +30,15 @@ QProgressDialog* QProgressDialog_new4(QWidget* parent, int flags) { return new QProgressDialog(parent, static_cast(flags)); } -QProgressDialog* QProgressDialog_new5(struct miqt_string* labelText, struct miqt_string* cancelButtonText, int minimum, int maximum, QWidget* parent) { - QString labelText_QString = QString::fromUtf8(&labelText->data, labelText->len); - QString cancelButtonText_QString = QString::fromUtf8(&cancelButtonText->data, cancelButtonText->len); +QProgressDialog* QProgressDialog_new5(struct miqt_string labelText, struct miqt_string cancelButtonText, int minimum, int maximum, QWidget* parent) { + QString labelText_QString = QString::fromUtf8(labelText.data, labelText.len); + QString cancelButtonText_QString = QString::fromUtf8(cancelButtonText.data, cancelButtonText.len); return new QProgressDialog(labelText_QString, cancelButtonText_QString, static_cast(minimum), static_cast(maximum), parent); } -QProgressDialog* QProgressDialog_new6(struct miqt_string* labelText, struct miqt_string* cancelButtonText, int minimum, int maximum, QWidget* parent, int flags) { - QString labelText_QString = QString::fromUtf8(&labelText->data, labelText->len); - QString cancelButtonText_QString = QString::fromUtf8(&cancelButtonText->data, cancelButtonText->len); +QProgressDialog* QProgressDialog_new6(struct miqt_string labelText, struct miqt_string cancelButtonText, int minimum, int maximum, QWidget* parent, int flags) { + QString labelText_QString = QString::fromUtf8(labelText.data, labelText.len); + QString cancelButtonText_QString = QString::fromUtf8(cancelButtonText.data, cancelButtonText.len); return new QProgressDialog(labelText_QString, cancelButtonText_QString, static_cast(minimum), static_cast(maximum), parent, static_cast(flags)); } @@ -50,18 +50,26 @@ void* QProgressDialog_Metacast(QProgressDialog* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QProgressDialog_Tr(const char* s) { +struct miqt_string QProgressDialog_Tr(const char* s) { QString _ret = QProgressDialog::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QProgressDialog_TrUtf8(const char* s) { +struct miqt_string QProgressDialog_TrUtf8(const char* s) { QString _ret = QProgressDialog::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QProgressDialog_SetLabel(QProgressDialog* self, QLabel* label) { @@ -96,11 +104,15 @@ QSize* QProgressDialog_SizeHint(const QProgressDialog* self) { return new QSize(self->sizeHint()); } -struct miqt_string* QProgressDialog_LabelText(const QProgressDialog* self) { +struct miqt_string QProgressDialog_LabelText(const QProgressDialog* self) { QString _ret = self->labelText(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QProgressDialog_MinimumDuration(const QProgressDialog* self) { @@ -147,13 +159,13 @@ void QProgressDialog_SetValue(QProgressDialog* self, int progress) { self->setValue(static_cast(progress)); } -void QProgressDialog_SetLabelText(QProgressDialog* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QProgressDialog_SetLabelText(QProgressDialog* self, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->setLabelText(text_QString); } -void QProgressDialog_SetCancelButtonText(QProgressDialog* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QProgressDialog_SetCancelButtonText(QProgressDialog* self, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->setCancelButtonText(text_QString); } @@ -171,32 +183,48 @@ void QProgressDialog_connect_Canceled(QProgressDialog* self, intptr_t slot) { }); } -struct miqt_string* QProgressDialog_Tr2(const char* s, const char* c) { +struct miqt_string QProgressDialog_Tr2(const char* s, const char* c) { QString _ret = QProgressDialog::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QProgressDialog_Tr3(const char* s, const char* c, int n) { +struct miqt_string QProgressDialog_Tr3(const char* s, const char* c, int n) { QString _ret = QProgressDialog::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QProgressDialog_TrUtf82(const char* s, const char* c) { +struct miqt_string QProgressDialog_TrUtf82(const char* s, const char* c) { QString _ret = QProgressDialog::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QProgressDialog_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QProgressDialog_TrUtf83(const char* s, const char* c, int n) { QString _ret = QProgressDialog::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QProgressDialog_Delete(QProgressDialog* self) { diff --git a/qt/gen_qprogressdialog.go b/qt/gen_qprogressdialog.go index 1fdc049a..cb666ea9 100644 --- a/qt/gen_qprogressdialog.go +++ b/qt/gen_qprogressdialog.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "runtime/cgo" "unsafe" @@ -53,11 +52,15 @@ func NewQProgressDialog() *QProgressDialog { // NewQProgressDialog2 constructs a new QProgressDialog object. func NewQProgressDialog2(labelText string, cancelButtonText string, minimum int, maximum int) *QProgressDialog { - labelText_ms := libmiqt.Strdupg(labelText) - defer C.free(labelText_ms) - cancelButtonText_ms := libmiqt.Strdupg(cancelButtonText) - defer C.free(cancelButtonText_ms) - ret := C.QProgressDialog_new2((*C.struct_miqt_string)(labelText_ms), (*C.struct_miqt_string)(cancelButtonText_ms), (C.int)(minimum), (C.int)(maximum)) + labelText_ms := C.struct_miqt_string{} + labelText_ms.data = C.CString(labelText) + labelText_ms.len = C.size_t(len(labelText)) + defer C.free(unsafe.Pointer(labelText_ms.data)) + cancelButtonText_ms := C.struct_miqt_string{} + cancelButtonText_ms.data = C.CString(cancelButtonText) + cancelButtonText_ms.len = C.size_t(len(cancelButtonText)) + defer C.free(unsafe.Pointer(cancelButtonText_ms.data)) + ret := C.QProgressDialog_new2(labelText_ms, cancelButtonText_ms, (C.int)(minimum), (C.int)(maximum)) return newQProgressDialog(ret) } @@ -75,21 +78,29 @@ func NewQProgressDialog4(parent *QWidget, flags WindowType) *QProgressDialog { // NewQProgressDialog5 constructs a new QProgressDialog object. func NewQProgressDialog5(labelText string, cancelButtonText string, minimum int, maximum int, parent *QWidget) *QProgressDialog { - labelText_ms := libmiqt.Strdupg(labelText) - defer C.free(labelText_ms) - cancelButtonText_ms := libmiqt.Strdupg(cancelButtonText) - defer C.free(cancelButtonText_ms) - ret := C.QProgressDialog_new5((*C.struct_miqt_string)(labelText_ms), (*C.struct_miqt_string)(cancelButtonText_ms), (C.int)(minimum), (C.int)(maximum), parent.cPointer()) + labelText_ms := C.struct_miqt_string{} + labelText_ms.data = C.CString(labelText) + labelText_ms.len = C.size_t(len(labelText)) + defer C.free(unsafe.Pointer(labelText_ms.data)) + cancelButtonText_ms := C.struct_miqt_string{} + cancelButtonText_ms.data = C.CString(cancelButtonText) + cancelButtonText_ms.len = C.size_t(len(cancelButtonText)) + defer C.free(unsafe.Pointer(cancelButtonText_ms.data)) + ret := C.QProgressDialog_new5(labelText_ms, cancelButtonText_ms, (C.int)(minimum), (C.int)(maximum), parent.cPointer()) return newQProgressDialog(ret) } // NewQProgressDialog6 constructs a new QProgressDialog object. func NewQProgressDialog6(labelText string, cancelButtonText string, minimum int, maximum int, parent *QWidget, flags WindowType) *QProgressDialog { - labelText_ms := libmiqt.Strdupg(labelText) - defer C.free(labelText_ms) - cancelButtonText_ms := libmiqt.Strdupg(cancelButtonText) - defer C.free(cancelButtonText_ms) - ret := C.QProgressDialog_new6((*C.struct_miqt_string)(labelText_ms), (*C.struct_miqt_string)(cancelButtonText_ms), (C.int)(minimum), (C.int)(maximum), parent.cPointer(), (C.int)(flags)) + labelText_ms := C.struct_miqt_string{} + labelText_ms.data = C.CString(labelText) + labelText_ms.len = C.size_t(len(labelText)) + defer C.free(unsafe.Pointer(labelText_ms.data)) + cancelButtonText_ms := C.struct_miqt_string{} + cancelButtonText_ms.data = C.CString(cancelButtonText) + cancelButtonText_ms.len = C.size_t(len(cancelButtonText)) + defer C.free(unsafe.Pointer(cancelButtonText_ms.data)) + ret := C.QProgressDialog_new6(labelText_ms, cancelButtonText_ms, (C.int)(minimum), (C.int)(maximum), parent.cPointer(), (C.int)(flags)) return newQProgressDialog(ret) } @@ -100,24 +111,24 @@ func (this *QProgressDialog) MetaObject() *QMetaObject { func (this *QProgressDialog) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QProgressDialog_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QProgressDialog_Metacast(this.h, param1_Cstring)) } func QProgressDialog_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QProgressDialog_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QProgressDialog_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QProgressDialog_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QProgressDialog_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QProgressDialog_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -157,9 +168,9 @@ func (this *QProgressDialog) SizeHint() *QSize { } func (this *QProgressDialog) LabelText() string { - var _ms *C.struct_miqt_string = C.QProgressDialog_LabelText(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QProgressDialog_LabelText(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -208,15 +219,19 @@ func (this *QProgressDialog) SetValue(progress int) { } func (this *QProgressDialog) SetLabelText(text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QProgressDialog_SetLabelText(this.h, (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QProgressDialog_SetLabelText(this.h, text_ms) } func (this *QProgressDialog) SetCancelButtonText(text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QProgressDialog_SetCancelButtonText(this.h, (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QProgressDialog_SetCancelButtonText(this.h, text_ms) } func (this *QProgressDialog) SetMinimumDuration(ms int) { @@ -245,9 +260,9 @@ func QProgressDialog_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QProgressDialog_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QProgressDialog_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -256,9 +271,9 @@ func QProgressDialog_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QProgressDialog_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QProgressDialog_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -267,9 +282,9 @@ func QProgressDialog_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QProgressDialog_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QProgressDialog_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -278,9 +293,9 @@ func QProgressDialog_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QProgressDialog_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QProgressDialog_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qprogressdialog.h b/qt/gen_qprogressdialog.h index 77894b8c..cacfe2d2 100644 --- a/qt/gen_qprogressdialog.h +++ b/qt/gen_qprogressdialog.h @@ -32,15 +32,15 @@ typedef struct QWidget QWidget; #endif QProgressDialog* QProgressDialog_new(); -QProgressDialog* QProgressDialog_new2(struct miqt_string* labelText, struct miqt_string* cancelButtonText, int minimum, int maximum); +QProgressDialog* QProgressDialog_new2(struct miqt_string labelText, struct miqt_string cancelButtonText, int minimum, int maximum); QProgressDialog* QProgressDialog_new3(QWidget* parent); QProgressDialog* QProgressDialog_new4(QWidget* parent, int flags); -QProgressDialog* QProgressDialog_new5(struct miqt_string* labelText, struct miqt_string* cancelButtonText, int minimum, int maximum, QWidget* parent); -QProgressDialog* QProgressDialog_new6(struct miqt_string* labelText, struct miqt_string* cancelButtonText, int minimum, int maximum, QWidget* parent, int flags); +QProgressDialog* QProgressDialog_new5(struct miqt_string labelText, struct miqt_string cancelButtonText, int minimum, int maximum, QWidget* parent); +QProgressDialog* QProgressDialog_new6(struct miqt_string labelText, struct miqt_string cancelButtonText, int minimum, int maximum, QWidget* parent, int flags); QMetaObject* QProgressDialog_MetaObject(const QProgressDialog* self); void* QProgressDialog_Metacast(QProgressDialog* self, const char* param1); -struct miqt_string* QProgressDialog_Tr(const char* s); -struct miqt_string* QProgressDialog_TrUtf8(const char* s); +struct miqt_string QProgressDialog_Tr(const char* s); +struct miqt_string QProgressDialog_TrUtf8(const char* s); void QProgressDialog_SetLabel(QProgressDialog* self, QLabel* label); void QProgressDialog_SetCancelButton(QProgressDialog* self, QPushButton* button); void QProgressDialog_SetBar(QProgressDialog* self, QProgressBar* bar); @@ -49,7 +49,7 @@ int QProgressDialog_Minimum(const QProgressDialog* self); int QProgressDialog_Maximum(const QProgressDialog* self); int QProgressDialog_Value(const QProgressDialog* self); QSize* QProgressDialog_SizeHint(const QProgressDialog* self); -struct miqt_string* QProgressDialog_LabelText(const QProgressDialog* self); +struct miqt_string QProgressDialog_LabelText(const QProgressDialog* self); int QProgressDialog_MinimumDuration(const QProgressDialog* self); void QProgressDialog_SetAutoReset(QProgressDialog* self, bool reset); bool QProgressDialog_AutoReset(const QProgressDialog* self); @@ -61,15 +61,15 @@ void QProgressDialog_SetMaximum(QProgressDialog* self, int maximum); void QProgressDialog_SetMinimum(QProgressDialog* self, int minimum); void QProgressDialog_SetRange(QProgressDialog* self, int minimum, int maximum); void QProgressDialog_SetValue(QProgressDialog* self, int progress); -void QProgressDialog_SetLabelText(QProgressDialog* self, struct miqt_string* text); -void QProgressDialog_SetCancelButtonText(QProgressDialog* self, struct miqt_string* text); +void QProgressDialog_SetLabelText(QProgressDialog* self, struct miqt_string text); +void QProgressDialog_SetCancelButtonText(QProgressDialog* self, struct miqt_string text); void QProgressDialog_SetMinimumDuration(QProgressDialog* self, int ms); void QProgressDialog_Canceled(QProgressDialog* self); void QProgressDialog_connect_Canceled(QProgressDialog* self, intptr_t slot); -struct miqt_string* QProgressDialog_Tr2(const char* s, const char* c); -struct miqt_string* QProgressDialog_Tr3(const char* s, const char* c, int n); -struct miqt_string* QProgressDialog_TrUtf82(const char* s, const char* c); -struct miqt_string* QProgressDialog_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QProgressDialog_Tr2(const char* s, const char* c); +struct miqt_string QProgressDialog_Tr3(const char* s, const char* c, int n); +struct miqt_string QProgressDialog_TrUtf82(const char* s, const char* c); +struct miqt_string QProgressDialog_TrUtf83(const char* s, const char* c, int n); void QProgressDialog_Delete(QProgressDialog* self); #ifdef __cplusplus diff --git a/qt/gen_qpropertyanimation.cpp b/qt/gen_qpropertyanimation.cpp index 68cf2a66..98afeafe 100644 --- a/qt/gen_qpropertyanimation.cpp +++ b/qt/gen_qpropertyanimation.cpp @@ -13,16 +13,18 @@ QPropertyAnimation* QPropertyAnimation_new() { return new QPropertyAnimation(); } -QPropertyAnimation* QPropertyAnimation_new2(QObject* target, QByteArray* propertyName) { - return new QPropertyAnimation(target, *propertyName); +QPropertyAnimation* QPropertyAnimation_new2(QObject* target, struct miqt_string propertyName) { + QByteArray propertyName_QByteArray(propertyName.data, propertyName.len); + return new QPropertyAnimation(target, propertyName_QByteArray); } QPropertyAnimation* QPropertyAnimation_new3(QObject* parent) { return new QPropertyAnimation(parent); } -QPropertyAnimation* QPropertyAnimation_new4(QObject* target, QByteArray* propertyName, QObject* parent) { - return new QPropertyAnimation(target, *propertyName, parent); +QPropertyAnimation* QPropertyAnimation_new4(QObject* target, struct miqt_string propertyName, QObject* parent) { + QByteArray propertyName_QByteArray(propertyName.data, propertyName.len); + return new QPropertyAnimation(target, propertyName_QByteArray, parent); } QMetaObject* QPropertyAnimation_MetaObject(const QPropertyAnimation* self) { @@ -33,18 +35,26 @@ void* QPropertyAnimation_Metacast(QPropertyAnimation* self, const char* param1) return self->qt_metacast(param1); } -struct miqt_string* QPropertyAnimation_Tr(const char* s) { +struct miqt_string QPropertyAnimation_Tr(const char* s) { QString _ret = QPropertyAnimation::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPropertyAnimation_TrUtf8(const char* s) { +struct miqt_string QPropertyAnimation_TrUtf8(const char* s) { QString _ret = QPropertyAnimation::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QObject* QPropertyAnimation_TargetObject(const QPropertyAnimation* self) { @@ -55,40 +65,62 @@ void QPropertyAnimation_SetTargetObject(QPropertyAnimation* self, QObject* targe self->setTargetObject(target); } -QByteArray* QPropertyAnimation_PropertyName(const QPropertyAnimation* self) { - return new QByteArray(self->propertyName()); +struct miqt_string QPropertyAnimation_PropertyName(const QPropertyAnimation* self) { + QByteArray _qb = self->propertyName(); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } -void QPropertyAnimation_SetPropertyName(QPropertyAnimation* self, QByteArray* propertyName) { - self->setPropertyName(*propertyName); +void QPropertyAnimation_SetPropertyName(QPropertyAnimation* self, struct miqt_string propertyName) { + QByteArray propertyName_QByteArray(propertyName.data, propertyName.len); + self->setPropertyName(propertyName_QByteArray); } -struct miqt_string* QPropertyAnimation_Tr2(const char* s, const char* c) { +struct miqt_string QPropertyAnimation_Tr2(const char* s, const char* c) { QString _ret = QPropertyAnimation::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPropertyAnimation_Tr3(const char* s, const char* c, int n) { +struct miqt_string QPropertyAnimation_Tr3(const char* s, const char* c, int n) { QString _ret = QPropertyAnimation::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPropertyAnimation_TrUtf82(const char* s, const char* c) { +struct miqt_string QPropertyAnimation_TrUtf82(const char* s, const char* c) { QString _ret = QPropertyAnimation::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPropertyAnimation_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QPropertyAnimation_TrUtf83(const char* s, const char* c, int n) { QString _ret = QPropertyAnimation::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QPropertyAnimation_Delete(QPropertyAnimation* self) { diff --git a/qt/gen_qpropertyanimation.go b/qt/gen_qpropertyanimation.go index 404b5ac8..223cabe2 100644 --- a/qt/gen_qpropertyanimation.go +++ b/qt/gen_qpropertyanimation.go @@ -50,8 +50,11 @@ func NewQPropertyAnimation() *QPropertyAnimation { } // NewQPropertyAnimation2 constructs a new QPropertyAnimation object. -func NewQPropertyAnimation2(target *QObject, propertyName *QByteArray) *QPropertyAnimation { - ret := C.QPropertyAnimation_new2(target.cPointer(), propertyName.cPointer()) +func NewQPropertyAnimation2(target *QObject, propertyName []byte) *QPropertyAnimation { + propertyName_alias := C.struct_miqt_string{} + propertyName_alias.data = (*C.char)(unsafe.Pointer(&propertyName[0])) + propertyName_alias.len = C.size_t(len(propertyName)) + ret := C.QPropertyAnimation_new2(target.cPointer(), propertyName_alias) return newQPropertyAnimation(ret) } @@ -62,8 +65,11 @@ func NewQPropertyAnimation3(parent *QObject) *QPropertyAnimation { } // NewQPropertyAnimation4 constructs a new QPropertyAnimation object. -func NewQPropertyAnimation4(target *QObject, propertyName *QByteArray, parent *QObject) *QPropertyAnimation { - ret := C.QPropertyAnimation_new4(target.cPointer(), propertyName.cPointer(), parent.cPointer()) +func NewQPropertyAnimation4(target *QObject, propertyName []byte, parent *QObject) *QPropertyAnimation { + propertyName_alias := C.struct_miqt_string{} + propertyName_alias.data = (*C.char)(unsafe.Pointer(&propertyName[0])) + propertyName_alias.len = C.size_t(len(propertyName)) + ret := C.QPropertyAnimation_new4(target.cPointer(), propertyName_alias, parent.cPointer()) return newQPropertyAnimation(ret) } @@ -74,24 +80,24 @@ func (this *QPropertyAnimation) MetaObject() *QMetaObject { func (this *QPropertyAnimation) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QPropertyAnimation_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QPropertyAnimation_Metacast(this.h, param1_Cstring)) } func QPropertyAnimation_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QPropertyAnimation_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPropertyAnimation_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QPropertyAnimation_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QPropertyAnimation_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPropertyAnimation_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -103,15 +109,18 @@ func (this *QPropertyAnimation) SetTargetObject(target *QObject) { C.QPropertyAnimation_SetTargetObject(this.h, target.cPointer()) } -func (this *QPropertyAnimation) PropertyName() *QByteArray { - _ret := C.QPropertyAnimation_PropertyName(this.h) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QPropertyAnimation) PropertyName() []byte { + var _bytearray C.struct_miqt_string = C.QPropertyAnimation_PropertyName(this.h) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } -func (this *QPropertyAnimation) SetPropertyName(propertyName *QByteArray) { - C.QPropertyAnimation_SetPropertyName(this.h, propertyName.cPointer()) +func (this *QPropertyAnimation) SetPropertyName(propertyName []byte) { + propertyName_alias := C.struct_miqt_string{} + propertyName_alias.data = (*C.char)(unsafe.Pointer(&propertyName[0])) + propertyName_alias.len = C.size_t(len(propertyName)) + C.QPropertyAnimation_SetPropertyName(this.h, propertyName_alias) } func QPropertyAnimation_Tr2(s string, c string) string { @@ -119,9 +128,9 @@ func QPropertyAnimation_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPropertyAnimation_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPropertyAnimation_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -130,9 +139,9 @@ func QPropertyAnimation_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPropertyAnimation_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPropertyAnimation_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -141,9 +150,9 @@ func QPropertyAnimation_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPropertyAnimation_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPropertyAnimation_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -152,9 +161,9 @@ func QPropertyAnimation_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPropertyAnimation_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPropertyAnimation_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qpropertyanimation.h b/qt/gen_qpropertyanimation.h index edb99eb9..ad2762bc 100644 --- a/qt/gen_qpropertyanimation.h +++ b/qt/gen_qpropertyanimation.h @@ -26,21 +26,21 @@ typedef struct QPropertyAnimation QPropertyAnimation; #endif QPropertyAnimation* QPropertyAnimation_new(); -QPropertyAnimation* QPropertyAnimation_new2(QObject* target, QByteArray* propertyName); +QPropertyAnimation* QPropertyAnimation_new2(QObject* target, struct miqt_string propertyName); QPropertyAnimation* QPropertyAnimation_new3(QObject* parent); -QPropertyAnimation* QPropertyAnimation_new4(QObject* target, QByteArray* propertyName, QObject* parent); +QPropertyAnimation* QPropertyAnimation_new4(QObject* target, struct miqt_string propertyName, QObject* parent); QMetaObject* QPropertyAnimation_MetaObject(const QPropertyAnimation* self); void* QPropertyAnimation_Metacast(QPropertyAnimation* self, const char* param1); -struct miqt_string* QPropertyAnimation_Tr(const char* s); -struct miqt_string* QPropertyAnimation_TrUtf8(const char* s); +struct miqt_string QPropertyAnimation_Tr(const char* s); +struct miqt_string QPropertyAnimation_TrUtf8(const char* s); QObject* QPropertyAnimation_TargetObject(const QPropertyAnimation* self); void QPropertyAnimation_SetTargetObject(QPropertyAnimation* self, QObject* target); -QByteArray* QPropertyAnimation_PropertyName(const QPropertyAnimation* self); -void QPropertyAnimation_SetPropertyName(QPropertyAnimation* self, QByteArray* propertyName); -struct miqt_string* QPropertyAnimation_Tr2(const char* s, const char* c); -struct miqt_string* QPropertyAnimation_Tr3(const char* s, const char* c, int n); -struct miqt_string* QPropertyAnimation_TrUtf82(const char* s, const char* c); -struct miqt_string* QPropertyAnimation_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QPropertyAnimation_PropertyName(const QPropertyAnimation* self); +void QPropertyAnimation_SetPropertyName(QPropertyAnimation* self, struct miqt_string propertyName); +struct miqt_string QPropertyAnimation_Tr2(const char* s, const char* c); +struct miqt_string QPropertyAnimation_Tr3(const char* s, const char* c, int n); +struct miqt_string QPropertyAnimation_TrUtf82(const char* s, const char* c); +struct miqt_string QPropertyAnimation_TrUtf83(const char* s, const char* c, int n); void QPropertyAnimation_Delete(QPropertyAnimation* self); #ifdef __cplusplus diff --git a/qt/gen_qproxystyle.cpp b/qt/gen_qproxystyle.cpp index e3dd9772..66d6512e 100644 --- a/qt/gen_qproxystyle.cpp +++ b/qt/gen_qproxystyle.cpp @@ -25,8 +25,8 @@ QProxyStyle* QProxyStyle_new() { return new QProxyStyle(); } -QProxyStyle* QProxyStyle_new2(struct miqt_string* key) { - QString key_QString = QString::fromUtf8(&key->data, key->len); +QProxyStyle* QProxyStyle_new2(struct miqt_string key) { + QString key_QString = QString::fromUtf8(key.data, key.len); return new QProxyStyle(key_QString); } @@ -42,18 +42,26 @@ void* QProxyStyle_Metacast(QProxyStyle* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QProxyStyle_Tr(const char* s) { +struct miqt_string QProxyStyle_Tr(const char* s) { QString _ret = QProxyStyle::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QProxyStyle_TrUtf8(const char* s) { +struct miqt_string QProxyStyle_TrUtf8(const char* s) { QString _ret = QProxyStyle::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QStyle* QProxyStyle_BaseStyle(const QProxyStyle* self) { @@ -76,8 +84,8 @@ void QProxyStyle_DrawComplexControl(const QProxyStyle* self, int control, QStyle self->drawComplexControl(static_cast(control), option, painter); } -void QProxyStyle_DrawItemText(const QProxyStyle* self, QPainter* painter, QRect* rect, int flags, QPalette* pal, bool enabled, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QProxyStyle_DrawItemText(const QProxyStyle* self, QPainter* painter, QRect* rect, int flags, QPalette* pal, bool enabled, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->drawItemText(painter, *rect, static_cast(flags), *pal, enabled, text_QString); } @@ -97,8 +105,8 @@ QRect* QProxyStyle_SubControlRect(const QProxyStyle* self, int cc, QStyleOptionC return new QRect(self->subControlRect(static_cast(cc), opt, static_cast(sc), widget)); } -QRect* QProxyStyle_ItemTextRect(const QProxyStyle* self, QFontMetrics* fm, QRect* r, int flags, bool enabled, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QRect* QProxyStyle_ItemTextRect(const QProxyStyle* self, QFontMetrics* fm, QRect* r, int flags, bool enabled, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QRect(self->itemTextRect(*fm, *r, static_cast(flags), enabled, text_QString)); } @@ -159,32 +167,48 @@ void QProxyStyle_UnpolishWithApp(QProxyStyle* self, QApplication* app) { self->unpolish(app); } -struct miqt_string* QProxyStyle_Tr2(const char* s, const char* c) { +struct miqt_string QProxyStyle_Tr2(const char* s, const char* c) { QString _ret = QProxyStyle::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QProxyStyle_Tr3(const char* s, const char* c, int n) { +struct miqt_string QProxyStyle_Tr3(const char* s, const char* c, int n) { QString _ret = QProxyStyle::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QProxyStyle_TrUtf82(const char* s, const char* c) { +struct miqt_string QProxyStyle_TrUtf82(const char* s, const char* c) { QString _ret = QProxyStyle::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QProxyStyle_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QProxyStyle_TrUtf83(const char* s, const char* c, int n) { QString _ret = QProxyStyle::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QProxyStyle_DrawPrimitive4(const QProxyStyle* self, int element, QStyleOption* option, QPainter* painter, QWidget* widget) { @@ -199,8 +223,8 @@ void QProxyStyle_DrawComplexControl4(const QProxyStyle* self, int control, QStyl self->drawComplexControl(static_cast(control), option, painter, widget); } -void QProxyStyle_DrawItemText7(const QProxyStyle* self, QPainter* painter, QRect* rect, int flags, QPalette* pal, bool enabled, struct miqt_string* text, int textRole) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QProxyStyle_DrawItemText7(const QProxyStyle* self, QPainter* painter, QRect* rect, int flags, QPalette* pal, bool enabled, struct miqt_string text, int textRole) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->drawItemText(painter, *rect, static_cast(flags), *pal, enabled, text_QString, static_cast(textRole)); } diff --git a/qt/gen_qproxystyle.go b/qt/gen_qproxystyle.go index dd18bcde..185e97fb 100644 --- a/qt/gen_qproxystyle.go +++ b/qt/gen_qproxystyle.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -52,9 +51,11 @@ func NewQProxyStyle() *QProxyStyle { // NewQProxyStyle2 constructs a new QProxyStyle object. func NewQProxyStyle2(key string) *QProxyStyle { - key_ms := libmiqt.Strdupg(key) - defer C.free(key_ms) - ret := C.QProxyStyle_new2((*C.struct_miqt_string)(key_ms)) + key_ms := C.struct_miqt_string{} + key_ms.data = C.CString(key) + key_ms.len = C.size_t(len(key)) + defer C.free(unsafe.Pointer(key_ms.data)) + ret := C.QProxyStyle_new2(key_ms) return newQProxyStyle(ret) } @@ -71,24 +72,24 @@ func (this *QProxyStyle) MetaObject() *QMetaObject { func (this *QProxyStyle) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QProxyStyle_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QProxyStyle_Metacast(this.h, param1_Cstring)) } func QProxyStyle_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QProxyStyle_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QProxyStyle_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QProxyStyle_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QProxyStyle_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QProxyStyle_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -113,9 +114,11 @@ func (this *QProxyStyle) DrawComplexControl(control QStyle__ComplexControl, opti } func (this *QProxyStyle) DrawItemText(painter *QPainter, rect *QRect, flags int, pal *QPalette, enabled bool, text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QProxyStyle_DrawItemText(this.h, painter.cPointer(), rect.cPointer(), (C.int)(flags), pal.cPointer(), (C.bool)(enabled), (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QProxyStyle_DrawItemText(this.h, painter.cPointer(), rect.cPointer(), (C.int)(flags), pal.cPointer(), (C.bool)(enabled), text_ms) } func (this *QProxyStyle) DrawItemPixmap(painter *QPainter, rect *QRect, alignment int, pixmap *QPixmap) { @@ -144,9 +147,11 @@ func (this *QProxyStyle) SubControlRect(cc QStyle__ComplexControl, opt *QStyleOp } func (this *QProxyStyle) ItemTextRect(fm *QFontMetrics, r *QRect, flags int, enabled bool, text string) *QRect { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - _ret := C.QProxyStyle_ItemTextRect(this.h, fm.cPointer(), r.cPointer(), (C.int)(flags), (C.bool)(enabled), (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + _ret := C.QProxyStyle_ItemTextRect(this.h, fm.cPointer(), r.cPointer(), (C.int)(flags), (C.bool)(enabled), text_ms) _goptr := newQRect(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -228,9 +233,9 @@ func QProxyStyle_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QProxyStyle_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QProxyStyle_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -239,9 +244,9 @@ func QProxyStyle_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QProxyStyle_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QProxyStyle_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -250,9 +255,9 @@ func QProxyStyle_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QProxyStyle_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QProxyStyle_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -261,9 +266,9 @@ func QProxyStyle_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QProxyStyle_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QProxyStyle_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -280,9 +285,11 @@ func (this *QProxyStyle) DrawComplexControl4(control QStyle__ComplexControl, opt } func (this *QProxyStyle) DrawItemText7(painter *QPainter, rect *QRect, flags int, pal *QPalette, enabled bool, text string, textRole QPalette__ColorRole) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QProxyStyle_DrawItemText7(this.h, painter.cPointer(), rect.cPointer(), (C.int)(flags), pal.cPointer(), (C.bool)(enabled), (*C.struct_miqt_string)(text_ms), (C.int)(textRole)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QProxyStyle_DrawItemText7(this.h, painter.cPointer(), rect.cPointer(), (C.int)(flags), pal.cPointer(), (C.bool)(enabled), text_ms, (C.int)(textRole)) } func (this *QProxyStyle) HitTestComplexControl4(control QStyle__ComplexControl, option *QStyleOptionComplex, pos *QPoint, widget *QWidget) QStyle__SubControl { diff --git a/qt/gen_qproxystyle.h b/qt/gen_qproxystyle.h index f7541d69..6ea5d9ba 100644 --- a/qt/gen_qproxystyle.h +++ b/qt/gen_qproxystyle.h @@ -50,23 +50,23 @@ typedef struct QWidget QWidget; #endif QProxyStyle* QProxyStyle_new(); -QProxyStyle* QProxyStyle_new2(struct miqt_string* key); +QProxyStyle* QProxyStyle_new2(struct miqt_string key); QProxyStyle* QProxyStyle_new3(QStyle* style); QMetaObject* QProxyStyle_MetaObject(const QProxyStyle* self); void* QProxyStyle_Metacast(QProxyStyle* self, const char* param1); -struct miqt_string* QProxyStyle_Tr(const char* s); -struct miqt_string* QProxyStyle_TrUtf8(const char* s); +struct miqt_string QProxyStyle_Tr(const char* s); +struct miqt_string QProxyStyle_TrUtf8(const char* s); QStyle* QProxyStyle_BaseStyle(const QProxyStyle* self); void QProxyStyle_SetBaseStyle(QProxyStyle* self, QStyle* style); void QProxyStyle_DrawPrimitive(const QProxyStyle* self, int element, QStyleOption* option, QPainter* painter); void QProxyStyle_DrawControl(const QProxyStyle* self, int element, QStyleOption* option, QPainter* painter); void QProxyStyle_DrawComplexControl(const QProxyStyle* self, int control, QStyleOptionComplex* option, QPainter* painter); -void QProxyStyle_DrawItemText(const QProxyStyle* self, QPainter* painter, QRect* rect, int flags, QPalette* pal, bool enabled, struct miqt_string* text); +void QProxyStyle_DrawItemText(const QProxyStyle* self, QPainter* painter, QRect* rect, int flags, QPalette* pal, bool enabled, struct miqt_string text); void QProxyStyle_DrawItemPixmap(const QProxyStyle* self, QPainter* painter, QRect* rect, int alignment, QPixmap* pixmap); QSize* QProxyStyle_SizeFromContents(const QProxyStyle* self, int typeVal, QStyleOption* option, QSize* size, QWidget* widget); QRect* QProxyStyle_SubElementRect(const QProxyStyle* self, int element, QStyleOption* option, QWidget* widget); QRect* QProxyStyle_SubControlRect(const QProxyStyle* self, int cc, QStyleOptionComplex* opt, int sc, QWidget* widget); -QRect* QProxyStyle_ItemTextRect(const QProxyStyle* self, QFontMetrics* fm, QRect* r, int flags, bool enabled, struct miqt_string* text); +QRect* QProxyStyle_ItemTextRect(const QProxyStyle* self, QFontMetrics* fm, QRect* r, int flags, bool enabled, struct miqt_string text); QRect* QProxyStyle_ItemPixmapRect(const QProxyStyle* self, QRect* r, int flags, QPixmap* pixmap); int QProxyStyle_HitTestComplexControl(const QProxyStyle* self, int control, QStyleOptionComplex* option, QPoint* pos); int QProxyStyle_StyleHint(const QProxyStyle* self, int hint); @@ -81,14 +81,14 @@ void QProxyStyle_PolishWithPal(QProxyStyle* self, QPalette* pal); void QProxyStyle_PolishWithApp(QProxyStyle* self, QApplication* app); void QProxyStyle_Unpolish(QProxyStyle* self, QWidget* widget); void QProxyStyle_UnpolishWithApp(QProxyStyle* self, QApplication* app); -struct miqt_string* QProxyStyle_Tr2(const char* s, const char* c); -struct miqt_string* QProxyStyle_Tr3(const char* s, const char* c, int n); -struct miqt_string* QProxyStyle_TrUtf82(const char* s, const char* c); -struct miqt_string* QProxyStyle_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QProxyStyle_Tr2(const char* s, const char* c); +struct miqt_string QProxyStyle_Tr3(const char* s, const char* c, int n); +struct miqt_string QProxyStyle_TrUtf82(const char* s, const char* c); +struct miqt_string QProxyStyle_TrUtf83(const char* s, const char* c, int n); void QProxyStyle_DrawPrimitive4(const QProxyStyle* self, int element, QStyleOption* option, QPainter* painter, QWidget* widget); void QProxyStyle_DrawControl4(const QProxyStyle* self, int element, QStyleOption* option, QPainter* painter, QWidget* widget); void QProxyStyle_DrawComplexControl4(const QProxyStyle* self, int control, QStyleOptionComplex* option, QPainter* painter, QWidget* widget); -void QProxyStyle_DrawItemText7(const QProxyStyle* self, QPainter* painter, QRect* rect, int flags, QPalette* pal, bool enabled, struct miqt_string* text, int textRole); +void QProxyStyle_DrawItemText7(const QProxyStyle* self, QPainter* painter, QRect* rect, int flags, QPalette* pal, bool enabled, struct miqt_string text, int textRole); int QProxyStyle_HitTestComplexControl4(const QProxyStyle* self, int control, QStyleOptionComplex* option, QPoint* pos, QWidget* widget); int QProxyStyle_StyleHint2(const QProxyStyle* self, int hint, QStyleOption* option); int QProxyStyle_StyleHint3(const QProxyStyle* self, int hint, QStyleOption* option, QWidget* widget); diff --git a/qt/gen_qpushbutton.cpp b/qt/gen_qpushbutton.cpp index 6d95cac6..64b347d9 100644 --- a/qt/gen_qpushbutton.cpp +++ b/qt/gen_qpushbutton.cpp @@ -15,13 +15,13 @@ QPushButton* QPushButton_new() { return new QPushButton(); } -QPushButton* QPushButton_new2(struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QPushButton* QPushButton_new2(struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QPushButton(text_QString); } -QPushButton* QPushButton_new3(QIcon* icon, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QPushButton* QPushButton_new3(QIcon* icon, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QPushButton(*icon, text_QString); } @@ -29,13 +29,13 @@ QPushButton* QPushButton_new4(QWidget* parent) { return new QPushButton(parent); } -QPushButton* QPushButton_new5(struct miqt_string* text, QWidget* parent) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QPushButton* QPushButton_new5(struct miqt_string text, QWidget* parent) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QPushButton(text_QString, parent); } -QPushButton* QPushButton_new6(QIcon* icon, struct miqt_string* text, QWidget* parent) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QPushButton* QPushButton_new6(QIcon* icon, struct miqt_string text, QWidget* parent) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QPushButton(*icon, text_QString, parent); } @@ -47,18 +47,26 @@ void* QPushButton_Metacast(QPushButton* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QPushButton_Tr(const char* s) { +struct miqt_string QPushButton_Tr(const char* s) { QString _ret = QPushButton::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPushButton_TrUtf8(const char* s) { +struct miqt_string QPushButton_TrUtf8(const char* s) { QString _ret = QPushButton::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QSize* QPushButton_SizeHint(const QPushButton* self) { @@ -105,32 +113,48 @@ void QPushButton_ShowMenu(QPushButton* self) { self->showMenu(); } -struct miqt_string* QPushButton_Tr2(const char* s, const char* c) { +struct miqt_string QPushButton_Tr2(const char* s, const char* c) { QString _ret = QPushButton::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPushButton_Tr3(const char* s, const char* c, int n) { +struct miqt_string QPushButton_Tr3(const char* s, const char* c, int n) { QString _ret = QPushButton::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPushButton_TrUtf82(const char* s, const char* c) { +struct miqt_string QPushButton_TrUtf82(const char* s, const char* c) { QString _ret = QPushButton::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPushButton_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QPushButton_TrUtf83(const char* s, const char* c, int n) { QString _ret = QPushButton::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QPushButton_Delete(QPushButton* self) { diff --git a/qt/gen_qpushbutton.go b/qt/gen_qpushbutton.go index 2d9adef6..ec6718b0 100644 --- a/qt/gen_qpushbutton.go +++ b/qt/gen_qpushbutton.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -52,17 +51,21 @@ func NewQPushButton() *QPushButton { // NewQPushButton2 constructs a new QPushButton object. func NewQPushButton2(text string) *QPushButton { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - ret := C.QPushButton_new2((*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + ret := C.QPushButton_new2(text_ms) return newQPushButton(ret) } // NewQPushButton3 constructs a new QPushButton object. func NewQPushButton3(icon *QIcon, text string) *QPushButton { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - ret := C.QPushButton_new3(icon.cPointer(), (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + ret := C.QPushButton_new3(icon.cPointer(), text_ms) return newQPushButton(ret) } @@ -74,17 +77,21 @@ func NewQPushButton4(parent *QWidget) *QPushButton { // NewQPushButton5 constructs a new QPushButton object. func NewQPushButton5(text string, parent *QWidget) *QPushButton { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - ret := C.QPushButton_new5((*C.struct_miqt_string)(text_ms), parent.cPointer()) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + ret := C.QPushButton_new5(text_ms, parent.cPointer()) return newQPushButton(ret) } // NewQPushButton6 constructs a new QPushButton object. func NewQPushButton6(icon *QIcon, text string, parent *QWidget) *QPushButton { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - ret := C.QPushButton_new6(icon.cPointer(), (*C.struct_miqt_string)(text_ms), parent.cPointer()) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + ret := C.QPushButton_new6(icon.cPointer(), text_ms, parent.cPointer()) return newQPushButton(ret) } @@ -95,24 +102,24 @@ func (this *QPushButton) MetaObject() *QMetaObject { func (this *QPushButton) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QPushButton_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QPushButton_Metacast(this.h, param1_Cstring)) } func QPushButton_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QPushButton_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPushButton_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QPushButton_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QPushButton_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPushButton_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -171,9 +178,9 @@ func QPushButton_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPushButton_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPushButton_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -182,9 +189,9 @@ func QPushButton_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPushButton_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPushButton_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -193,9 +200,9 @@ func QPushButton_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPushButton_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPushButton_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -204,9 +211,9 @@ func QPushButton_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPushButton_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPushButton_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qpushbutton.h b/qt/gen_qpushbutton.h index 83867f7d..3215e589 100644 --- a/qt/gen_qpushbutton.h +++ b/qt/gen_qpushbutton.h @@ -30,15 +30,15 @@ typedef struct QWidget QWidget; #endif QPushButton* QPushButton_new(); -QPushButton* QPushButton_new2(struct miqt_string* text); -QPushButton* QPushButton_new3(QIcon* icon, struct miqt_string* text); +QPushButton* QPushButton_new2(struct miqt_string text); +QPushButton* QPushButton_new3(QIcon* icon, struct miqt_string text); QPushButton* QPushButton_new4(QWidget* parent); -QPushButton* QPushButton_new5(struct miqt_string* text, QWidget* parent); -QPushButton* QPushButton_new6(QIcon* icon, struct miqt_string* text, QWidget* parent); +QPushButton* QPushButton_new5(struct miqt_string text, QWidget* parent); +QPushButton* QPushButton_new6(QIcon* icon, struct miqt_string text, QWidget* parent); QMetaObject* QPushButton_MetaObject(const QPushButton* self); void* QPushButton_Metacast(QPushButton* self, const char* param1); -struct miqt_string* QPushButton_Tr(const char* s); -struct miqt_string* QPushButton_TrUtf8(const char* s); +struct miqt_string QPushButton_Tr(const char* s); +struct miqt_string QPushButton_TrUtf8(const char* s); QSize* QPushButton_SizeHint(const QPushButton* self); QSize* QPushButton_MinimumSizeHint(const QPushButton* self); bool QPushButton_AutoDefault(const QPushButton* self); @@ -50,10 +50,10 @@ QMenu* QPushButton_Menu(const QPushButton* self); void QPushButton_SetFlat(QPushButton* self, bool flat); bool QPushButton_IsFlat(const QPushButton* self); void QPushButton_ShowMenu(QPushButton* self); -struct miqt_string* QPushButton_Tr2(const char* s, const char* c); -struct miqt_string* QPushButton_Tr3(const char* s, const char* c, int n); -struct miqt_string* QPushButton_TrUtf82(const char* s, const char* c); -struct miqt_string* QPushButton_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QPushButton_Tr2(const char* s, const char* c); +struct miqt_string QPushButton_Tr3(const char* s, const char* c, int n); +struct miqt_string QPushButton_TrUtf82(const char* s, const char* c); +struct miqt_string QPushButton_TrUtf83(const char* s, const char* c, int n); void QPushButton_Delete(QPushButton* self); #ifdef __cplusplus diff --git a/qt/gen_qradiobutton.cpp b/qt/gen_qradiobutton.cpp index be80b43e..e60e2fe0 100644 --- a/qt/gen_qradiobutton.cpp +++ b/qt/gen_qradiobutton.cpp @@ -13,8 +13,8 @@ QRadioButton* QRadioButton_new() { return new QRadioButton(); } -QRadioButton* QRadioButton_new2(struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QRadioButton* QRadioButton_new2(struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QRadioButton(text_QString); } @@ -22,8 +22,8 @@ QRadioButton* QRadioButton_new3(QWidget* parent) { return new QRadioButton(parent); } -QRadioButton* QRadioButton_new4(struct miqt_string* text, QWidget* parent) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QRadioButton* QRadioButton_new4(struct miqt_string text, QWidget* parent) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QRadioButton(text_QString, parent); } @@ -35,18 +35,26 @@ void* QRadioButton_Metacast(QRadioButton* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QRadioButton_Tr(const char* s) { +struct miqt_string QRadioButton_Tr(const char* s) { QString _ret = QRadioButton::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QRadioButton_TrUtf8(const char* s) { +struct miqt_string QRadioButton_TrUtf8(const char* s) { QString _ret = QRadioButton::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QSize* QRadioButton_SizeHint(const QRadioButton* self) { @@ -57,32 +65,48 @@ QSize* QRadioButton_MinimumSizeHint(const QRadioButton* self) { return new QSize(self->minimumSizeHint()); } -struct miqt_string* QRadioButton_Tr2(const char* s, const char* c) { +struct miqt_string QRadioButton_Tr2(const char* s, const char* c) { QString _ret = QRadioButton::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QRadioButton_Tr3(const char* s, const char* c, int n) { +struct miqt_string QRadioButton_Tr3(const char* s, const char* c, int n) { QString _ret = QRadioButton::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QRadioButton_TrUtf82(const char* s, const char* c) { +struct miqt_string QRadioButton_TrUtf82(const char* s, const char* c) { QString _ret = QRadioButton::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QRadioButton_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QRadioButton_TrUtf83(const char* s, const char* c, int n) { QString _ret = QRadioButton::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QRadioButton_Delete(QRadioButton* self) { diff --git a/qt/gen_qradiobutton.go b/qt/gen_qradiobutton.go index cdc31f48..448a12e4 100644 --- a/qt/gen_qradiobutton.go +++ b/qt/gen_qradiobutton.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -52,9 +51,11 @@ func NewQRadioButton() *QRadioButton { // NewQRadioButton2 constructs a new QRadioButton object. func NewQRadioButton2(text string) *QRadioButton { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - ret := C.QRadioButton_new2((*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + ret := C.QRadioButton_new2(text_ms) return newQRadioButton(ret) } @@ -66,9 +67,11 @@ func NewQRadioButton3(parent *QWidget) *QRadioButton { // NewQRadioButton4 constructs a new QRadioButton object. func NewQRadioButton4(text string, parent *QWidget) *QRadioButton { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - ret := C.QRadioButton_new4((*C.struct_miqt_string)(text_ms), parent.cPointer()) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + ret := C.QRadioButton_new4(text_ms, parent.cPointer()) return newQRadioButton(ret) } @@ -79,24 +82,24 @@ func (this *QRadioButton) MetaObject() *QMetaObject { func (this *QRadioButton) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QRadioButton_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QRadioButton_Metacast(this.h, param1_Cstring)) } func QRadioButton_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QRadioButton_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QRadioButton_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QRadioButton_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QRadioButton_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QRadioButton_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -119,9 +122,9 @@ func QRadioButton_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QRadioButton_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QRadioButton_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -130,9 +133,9 @@ func QRadioButton_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QRadioButton_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QRadioButton_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -141,9 +144,9 @@ func QRadioButton_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QRadioButton_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QRadioButton_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -152,9 +155,9 @@ func QRadioButton_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QRadioButton_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QRadioButton_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qradiobutton.h b/qt/gen_qradiobutton.h index 1fbb3826..bf7ec590 100644 --- a/qt/gen_qradiobutton.h +++ b/qt/gen_qradiobutton.h @@ -26,19 +26,19 @@ typedef struct QWidget QWidget; #endif QRadioButton* QRadioButton_new(); -QRadioButton* QRadioButton_new2(struct miqt_string* text); +QRadioButton* QRadioButton_new2(struct miqt_string text); QRadioButton* QRadioButton_new3(QWidget* parent); -QRadioButton* QRadioButton_new4(struct miqt_string* text, QWidget* parent); +QRadioButton* QRadioButton_new4(struct miqt_string text, QWidget* parent); QMetaObject* QRadioButton_MetaObject(const QRadioButton* self); void* QRadioButton_Metacast(QRadioButton* self, const char* param1); -struct miqt_string* QRadioButton_Tr(const char* s); -struct miqt_string* QRadioButton_TrUtf8(const char* s); +struct miqt_string QRadioButton_Tr(const char* s); +struct miqt_string QRadioButton_TrUtf8(const char* s); QSize* QRadioButton_SizeHint(const QRadioButton* self); QSize* QRadioButton_MinimumSizeHint(const QRadioButton* self); -struct miqt_string* QRadioButton_Tr2(const char* s, const char* c); -struct miqt_string* QRadioButton_Tr3(const char* s, const char* c, int n); -struct miqt_string* QRadioButton_TrUtf82(const char* s, const char* c); -struct miqt_string* QRadioButton_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QRadioButton_Tr2(const char* s, const char* c); +struct miqt_string QRadioButton_Tr3(const char* s, const char* c, int n); +struct miqt_string QRadioButton_TrUtf82(const char* s, const char* c); +struct miqt_string QRadioButton_TrUtf83(const char* s, const char* c, int n); void QRadioButton_Delete(QRadioButton* self); #ifdef __cplusplus diff --git a/qt/gen_qrasterwindow.cpp b/qt/gen_qrasterwindow.cpp index 8b5184ce..67e0aeb1 100644 --- a/qt/gen_qrasterwindow.cpp +++ b/qt/gen_qrasterwindow.cpp @@ -24,46 +24,70 @@ void* QRasterWindow_Metacast(QRasterWindow* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QRasterWindow_Tr(const char* s) { +struct miqt_string QRasterWindow_Tr(const char* s) { QString _ret = QRasterWindow::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QRasterWindow_TrUtf8(const char* s) { +struct miqt_string QRasterWindow_TrUtf8(const char* s) { QString _ret = QRasterWindow::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QRasterWindow_Tr2(const char* s, const char* c) { +struct miqt_string QRasterWindow_Tr2(const char* s, const char* c) { QString _ret = QRasterWindow::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QRasterWindow_Tr3(const char* s, const char* c, int n) { +struct miqt_string QRasterWindow_Tr3(const char* s, const char* c, int n) { QString _ret = QRasterWindow::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QRasterWindow_TrUtf82(const char* s, const char* c) { +struct miqt_string QRasterWindow_TrUtf82(const char* s, const char* c) { QString _ret = QRasterWindow::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QRasterWindow_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QRasterWindow_TrUtf83(const char* s, const char* c, int n) { QString _ret = QRasterWindow::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QRasterWindow_Delete(QRasterWindow* self) { diff --git a/qt/gen_qrasterwindow.go b/qt/gen_qrasterwindow.go index 9d8eea3e..5a065dd1 100644 --- a/qt/gen_qrasterwindow.go +++ b/qt/gen_qrasterwindow.go @@ -62,24 +62,24 @@ func (this *QRasterWindow) MetaObject() *QMetaObject { func (this *QRasterWindow) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QRasterWindow_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QRasterWindow_Metacast(this.h, param1_Cstring)) } func QRasterWindow_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QRasterWindow_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QRasterWindow_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QRasterWindow_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QRasterWindow_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QRasterWindow_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -88,9 +88,9 @@ func QRasterWindow_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QRasterWindow_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QRasterWindow_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -99,9 +99,9 @@ func QRasterWindow_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QRasterWindow_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QRasterWindow_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -110,9 +110,9 @@ func QRasterWindow_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QRasterWindow_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QRasterWindow_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -121,9 +121,9 @@ func QRasterWindow_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QRasterWindow_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QRasterWindow_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qrasterwindow.h b/qt/gen_qrasterwindow.h index 86c8c655..f58fc78b 100644 --- a/qt/gen_qrasterwindow.h +++ b/qt/gen_qrasterwindow.h @@ -27,12 +27,12 @@ QRasterWindow* QRasterWindow_new(); QRasterWindow* QRasterWindow_new2(QWindow* parent); QMetaObject* QRasterWindow_MetaObject(const QRasterWindow* self); void* QRasterWindow_Metacast(QRasterWindow* self, const char* param1); -struct miqt_string* QRasterWindow_Tr(const char* s); -struct miqt_string* QRasterWindow_TrUtf8(const char* s); -struct miqt_string* QRasterWindow_Tr2(const char* s, const char* c); -struct miqt_string* QRasterWindow_Tr3(const char* s, const char* c, int n); -struct miqt_string* QRasterWindow_TrUtf82(const char* s, const char* c); -struct miqt_string* QRasterWindow_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QRasterWindow_Tr(const char* s); +struct miqt_string QRasterWindow_TrUtf8(const char* s); +struct miqt_string QRasterWindow_Tr2(const char* s, const char* c); +struct miqt_string QRasterWindow_Tr3(const char* s, const char* c, int n); +struct miqt_string QRasterWindow_TrUtf82(const char* s, const char* c); +struct miqt_string QRasterWindow_TrUtf83(const char* s, const char* c, int n); void QRasterWindow_Delete(QRasterWindow* self); #ifdef __cplusplus diff --git a/qt/gen_qrawfont.cpp b/qt/gen_qrawfont.cpp index 46822057..d407d9d6 100644 --- a/qt/gen_qrawfont.cpp +++ b/qt/gen_qrawfont.cpp @@ -19,26 +19,28 @@ QRawFont* QRawFont_new() { return new QRawFont(); } -QRawFont* QRawFont_new2(struct miqt_string* fileName, double pixelSize) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +QRawFont* QRawFont_new2(struct miqt_string fileName, double pixelSize) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); return new QRawFont(fileName_QString, static_cast(pixelSize)); } -QRawFont* QRawFont_new3(QByteArray* fontData, double pixelSize) { - return new QRawFont(*fontData, static_cast(pixelSize)); +QRawFont* QRawFont_new3(struct miqt_string fontData, double pixelSize) { + QByteArray fontData_QByteArray(fontData.data, fontData.len); + return new QRawFont(fontData_QByteArray, static_cast(pixelSize)); } QRawFont* QRawFont_new4(QRawFont* other) { return new QRawFont(*other); } -QRawFont* QRawFont_new5(struct miqt_string* fileName, double pixelSize, int hintingPreference) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +QRawFont* QRawFont_new5(struct miqt_string fileName, double pixelSize, int hintingPreference) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); return new QRawFont(fileName_QString, static_cast(pixelSize), static_cast(hintingPreference)); } -QRawFont* QRawFont_new6(QByteArray* fontData, double pixelSize, int hintingPreference) { - return new QRawFont(*fontData, static_cast(pixelSize), static_cast(hintingPreference)); +QRawFont* QRawFont_new6(struct miqt_string fontData, double pixelSize, int hintingPreference) { + QByteArray fontData_QByteArray(fontData.data, fontData.len); + return new QRawFont(fontData_QByteArray, static_cast(pixelSize), static_cast(hintingPreference)); } void QRawFont_OperatorAssign(QRawFont* self, QRawFont* other) { @@ -61,18 +63,26 @@ bool QRawFont_OperatorNotEqual(const QRawFont* self, QRawFont* other) { return self->operator!=(*other); } -struct miqt_string* QRawFont_FamilyName(const QRawFont* self) { +struct miqt_string QRawFont_FamilyName(const QRawFont* self) { QString _ret = self->familyName(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QRawFont_StyleName(const QRawFont* self) { +struct miqt_string QRawFont_StyleName(const QRawFont* self) { QString _ret = self->styleName(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QRawFont_Style(const QRawFont* self) { @@ -84,8 +94,8 @@ int QRawFont_Weight(const QRawFont* self) { return self->weight(); } -struct miqt_array* QRawFont_GlyphIndexesForString(const QRawFont* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +struct miqt_array* QRawFont_GlyphIndexesForString(const QRawFont* self, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); QVector _ret = self->glyphIndexesForString(text_QString); // Convert QList<> from C++ memory to manually-managed C memory unsigned int* _arr = static_cast(malloc(sizeof(unsigned int) * _ret.length())); @@ -224,13 +234,14 @@ double QRawFont_UnitsPerEm(const QRawFont* self) { return static_cast(_ret); } -void QRawFont_LoadFromFile(QRawFont* self, struct miqt_string* fileName, double pixelSize, int hintingPreference) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +void QRawFont_LoadFromFile(QRawFont* self, struct miqt_string fileName, double pixelSize, int hintingPreference) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); self->loadFromFile(fileName_QString, static_cast(pixelSize), static_cast(hintingPreference)); } -void QRawFont_LoadFromData(QRawFont* self, QByteArray* fontData, double pixelSize, int hintingPreference) { - self->loadFromData(*fontData, static_cast(pixelSize), static_cast(hintingPreference)); +void QRawFont_LoadFromData(QRawFont* self, struct miqt_string fontData, double pixelSize, int hintingPreference) { + QByteArray fontData_QByteArray(fontData.data, fontData.len); + self->loadFromData(fontData_QByteArray, static_cast(pixelSize), static_cast(hintingPreference)); } bool QRawFont_SupportsCharacter(const QRawFont* self, unsigned int ucs4) { @@ -255,8 +266,13 @@ struct miqt_array* QRawFont_SupportedWritingSystems(const QRawFont* self) { return _out; } -QByteArray* QRawFont_FontTable(const QRawFont* self, const char* tagName) { - return new QByteArray(self->fontTable(tagName)); +struct miqt_string QRawFont_FontTable(const QRawFont* self, const char* tagName) { + QByteArray _qb = self->fontTable(tagName); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } QRawFont* QRawFont_FromFont(QFont* font) { diff --git a/qt/gen_qrawfont.go b/qt/gen_qrawfont.go index 184737d9..787c3090 100644 --- a/qt/gen_qrawfont.go +++ b/qt/gen_qrawfont.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -66,15 +65,20 @@ func NewQRawFont() *QRawFont { // NewQRawFont2 constructs a new QRawFont object. func NewQRawFont2(fileName string, pixelSize float64) *QRawFont { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - ret := C.QRawFont_new2((*C.struct_miqt_string)(fileName_ms), (C.double)(pixelSize)) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + ret := C.QRawFont_new2(fileName_ms, (C.double)(pixelSize)) return newQRawFont(ret) } // NewQRawFont3 constructs a new QRawFont object. -func NewQRawFont3(fontData *QByteArray, pixelSize float64) *QRawFont { - ret := C.QRawFont_new3(fontData.cPointer(), (C.double)(pixelSize)) +func NewQRawFont3(fontData []byte, pixelSize float64) *QRawFont { + fontData_alias := C.struct_miqt_string{} + fontData_alias.data = (*C.char)(unsafe.Pointer(&fontData[0])) + fontData_alias.len = C.size_t(len(fontData)) + ret := C.QRawFont_new3(fontData_alias, (C.double)(pixelSize)) return newQRawFont(ret) } @@ -86,15 +90,20 @@ func NewQRawFont4(other *QRawFont) *QRawFont { // NewQRawFont5 constructs a new QRawFont object. func NewQRawFont5(fileName string, pixelSize float64, hintingPreference QFont__HintingPreference) *QRawFont { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - ret := C.QRawFont_new5((*C.struct_miqt_string)(fileName_ms), (C.double)(pixelSize), (C.int)(hintingPreference)) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + ret := C.QRawFont_new5(fileName_ms, (C.double)(pixelSize), (C.int)(hintingPreference)) return newQRawFont(ret) } // NewQRawFont6 constructs a new QRawFont object. -func NewQRawFont6(fontData *QByteArray, pixelSize float64, hintingPreference QFont__HintingPreference) *QRawFont { - ret := C.QRawFont_new6(fontData.cPointer(), (C.double)(pixelSize), (C.int)(hintingPreference)) +func NewQRawFont6(fontData []byte, pixelSize float64, hintingPreference QFont__HintingPreference) *QRawFont { + fontData_alias := C.struct_miqt_string{} + fontData_alias.data = (*C.char)(unsafe.Pointer(&fontData[0])) + fontData_alias.len = C.size_t(len(fontData)) + ret := C.QRawFont_new6(fontData_alias, (C.double)(pixelSize), (C.int)(hintingPreference)) return newQRawFont(ret) } @@ -119,16 +128,16 @@ func (this *QRawFont) OperatorNotEqual(other *QRawFont) bool { } func (this *QRawFont) FamilyName() string { - var _ms *C.struct_miqt_string = C.QRawFont_FamilyName(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QRawFont_FamilyName(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QRawFont) StyleName() string { - var _ms *C.struct_miqt_string = C.QRawFont_StyleName(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QRawFont_StyleName(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -141,9 +150,11 @@ func (this *QRawFont) Weight() int { } func (this *QRawFont) GlyphIndexesForString(text string) []uint { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - var _ma *C.struct_miqt_array = C.QRawFont_GlyphIndexesForString(this.h, (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + var _ma *C.struct_miqt_array = C.QRawFont_GlyphIndexesForString(this.h, text_ms) _ret := make([]uint, int(_ma.len)) _outCast := (*[0xffff]C.uint)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -283,13 +294,18 @@ func (this *QRawFont) UnitsPerEm() float64 { } func (this *QRawFont) LoadFromFile(fileName string, pixelSize float64, hintingPreference QFont__HintingPreference) { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - C.QRawFont_LoadFromFile(this.h, (*C.struct_miqt_string)(fileName_ms), (C.double)(pixelSize), (C.int)(hintingPreference)) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + C.QRawFont_LoadFromFile(this.h, fileName_ms, (C.double)(pixelSize), (C.int)(hintingPreference)) } -func (this *QRawFont) LoadFromData(fontData *QByteArray, pixelSize float64, hintingPreference QFont__HintingPreference) { - C.QRawFont_LoadFromData(this.h, fontData.cPointer(), (C.double)(pixelSize), (C.int)(hintingPreference)) +func (this *QRawFont) LoadFromData(fontData []byte, pixelSize float64, hintingPreference QFont__HintingPreference) { + fontData_alias := C.struct_miqt_string{} + fontData_alias.data = (*C.char)(unsafe.Pointer(&fontData[0])) + fontData_alias.len = C.size_t(len(fontData)) + C.QRawFont_LoadFromData(this.h, fontData_alias, (C.double)(pixelSize), (C.int)(hintingPreference)) } func (this *QRawFont) SupportsCharacter(ucs4 uint) bool { @@ -311,13 +327,13 @@ func (this *QRawFont) SupportedWritingSystems() []QFontDatabase__WritingSystem { return _ret } -func (this *QRawFont) FontTable(tagName string) *QByteArray { +func (this *QRawFont) FontTable(tagName string) []byte { tagName_Cstring := C.CString(tagName) defer C.free(unsafe.Pointer(tagName_Cstring)) - _ret := C.QRawFont_FontTable(this.h, tagName_Cstring) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr + var _bytearray C.struct_miqt_string = C.QRawFont_FontTable(this.h, tagName_Cstring) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } func QRawFont_FromFont(font *QFont) *QRawFont { diff --git a/qt/gen_qrawfont.h b/qt/gen_qrawfont.h index 110db832..f9201f75 100644 --- a/qt/gen_qrawfont.h +++ b/qt/gen_qrawfont.h @@ -36,21 +36,21 @@ typedef struct QTransform QTransform; #endif QRawFont* QRawFont_new(); -QRawFont* QRawFont_new2(struct miqt_string* fileName, double pixelSize); -QRawFont* QRawFont_new3(QByteArray* fontData, double pixelSize); +QRawFont* QRawFont_new2(struct miqt_string fileName, double pixelSize); +QRawFont* QRawFont_new3(struct miqt_string fontData, double pixelSize); QRawFont* QRawFont_new4(QRawFont* other); -QRawFont* QRawFont_new5(struct miqt_string* fileName, double pixelSize, int hintingPreference); -QRawFont* QRawFont_new6(QByteArray* fontData, double pixelSize, int hintingPreference); +QRawFont* QRawFont_new5(struct miqt_string fileName, double pixelSize, int hintingPreference); +QRawFont* QRawFont_new6(struct miqt_string fontData, double pixelSize, int hintingPreference); void QRawFont_OperatorAssign(QRawFont* self, QRawFont* other); void QRawFont_Swap(QRawFont* self, QRawFont* other); bool QRawFont_IsValid(const QRawFont* self); bool QRawFont_OperatorEqual(const QRawFont* self, QRawFont* other); bool QRawFont_OperatorNotEqual(const QRawFont* self, QRawFont* other); -struct miqt_string* QRawFont_FamilyName(const QRawFont* self); -struct miqt_string* QRawFont_StyleName(const QRawFont* self); +struct miqt_string QRawFont_FamilyName(const QRawFont* self); +struct miqt_string QRawFont_StyleName(const QRawFont* self); int QRawFont_Style(const QRawFont* self); int QRawFont_Weight(const QRawFont* self); -struct miqt_array* QRawFont_GlyphIndexesForString(const QRawFont* self, struct miqt_string* text); +struct miqt_array* QRawFont_GlyphIndexesForString(const QRawFont* self, struct miqt_string text); struct miqt_array* QRawFont_AdvancesForGlyphIndexes(const QRawFont* self, struct miqt_array* /* of unsigned int */ glyphIndexes); struct miqt_array* QRawFont_AdvancesForGlyphIndexes2(const QRawFont* self, struct miqt_array* /* of unsigned int */ glyphIndexes, int layoutFlags); bool QRawFont_GlyphIndexesForChars(const QRawFont* self, QChar* chars, int numChars, unsigned int* glyphIndexes, int* numGlyphs); @@ -72,12 +72,12 @@ double QRawFont_MaxCharWidth(const QRawFont* self); double QRawFont_LineThickness(const QRawFont* self); double QRawFont_UnderlinePosition(const QRawFont* self); double QRawFont_UnitsPerEm(const QRawFont* self); -void QRawFont_LoadFromFile(QRawFont* self, struct miqt_string* fileName, double pixelSize, int hintingPreference); -void QRawFont_LoadFromData(QRawFont* self, QByteArray* fontData, double pixelSize, int hintingPreference); +void QRawFont_LoadFromFile(QRawFont* self, struct miqt_string fileName, double pixelSize, int hintingPreference); +void QRawFont_LoadFromData(QRawFont* self, struct miqt_string fontData, double pixelSize, int hintingPreference); bool QRawFont_SupportsCharacter(const QRawFont* self, unsigned int ucs4); bool QRawFont_SupportsCharacterWithCharacter(const QRawFont* self, QChar* character); struct miqt_array* QRawFont_SupportedWritingSystems(const QRawFont* self); -QByteArray* QRawFont_FontTable(const QRawFont* self, const char* tagName); +struct miqt_string QRawFont_FontTable(const QRawFont* self, const char* tagName); QRawFont* QRawFont_FromFont(QFont* font); QImage* QRawFont_AlphaMapForGlyph2(const QRawFont* self, unsigned int glyphIndex, int antialiasingType); QImage* QRawFont_AlphaMapForGlyph3(const QRawFont* self, unsigned int glyphIndex, int antialiasingType, QTransform* transform); diff --git a/qt/gen_qregexp.cpp b/qt/gen_qregexp.cpp index 910a80d3..ff311b09 100644 --- a/qt/gen_qregexp.cpp +++ b/qt/gen_qregexp.cpp @@ -11,8 +11,8 @@ QRegExp* QRegExp_new() { return new QRegExp(); } -QRegExp* QRegExp_new2(struct miqt_string* pattern) { - QString pattern_QString = QString::fromUtf8(&pattern->data, pattern->len); +QRegExp* QRegExp_new2(struct miqt_string pattern) { + QString pattern_QString = QString::fromUtf8(pattern.data, pattern.len); return new QRegExp(pattern_QString); } @@ -20,13 +20,13 @@ QRegExp* QRegExp_new3(QRegExp* rx) { return new QRegExp(*rx); } -QRegExp* QRegExp_new4(struct miqt_string* pattern, int cs) { - QString pattern_QString = QString::fromUtf8(&pattern->data, pattern->len); +QRegExp* QRegExp_new4(struct miqt_string pattern, int cs) { + QString pattern_QString = QString::fromUtf8(pattern.data, pattern.len); return new QRegExp(pattern_QString, static_cast(cs)); } -QRegExp* QRegExp_new5(struct miqt_string* pattern, int cs, int syntax) { - QString pattern_QString = QString::fromUtf8(&pattern->data, pattern->len); +QRegExp* QRegExp_new5(struct miqt_string pattern, int cs, int syntax) { + QString pattern_QString = QString::fromUtf8(pattern.data, pattern.len); return new QRegExp(pattern_QString, static_cast(cs), static_cast(syntax)); } @@ -54,15 +54,19 @@ bool QRegExp_IsValid(const QRegExp* self) { return self->isValid(); } -struct miqt_string* QRegExp_Pattern(const QRegExp* self) { +struct miqt_string QRegExp_Pattern(const QRegExp* self) { QString _ret = self->pattern(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QRegExp_SetPattern(QRegExp* self, struct miqt_string* pattern) { - QString pattern_QString = QString::fromUtf8(&pattern->data, pattern->len); +void QRegExp_SetPattern(QRegExp* self, struct miqt_string pattern) { + QString pattern_QString = QString::fromUtf8(pattern.data, pattern.len); self->setPattern(pattern_QString); } @@ -92,18 +96,18 @@ void QRegExp_SetMinimal(QRegExp* self, bool minimal) { self->setMinimal(minimal); } -bool QRegExp_ExactMatch(const QRegExp* self, struct miqt_string* str) { - QString str_QString = QString::fromUtf8(&str->data, str->len); +bool QRegExp_ExactMatch(const QRegExp* self, struct miqt_string str) { + QString str_QString = QString::fromUtf8(str.data, str.len); return self->exactMatch(str_QString); } -int QRegExp_IndexIn(const QRegExp* self, struct miqt_string* str) { - QString str_QString = QString::fromUtf8(&str->data, str->len); +int QRegExp_IndexIn(const QRegExp* self, struct miqt_string str) { + QString str_QString = QString::fromUtf8(str.data, str.len); return self->indexIn(str_QString); } -int QRegExp_LastIndexIn(const QRegExp* self, struct miqt_string* str) { - QString str_QString = QString::fromUtf8(&str->data, str->len); +int QRegExp_LastIndexIn(const QRegExp* self, struct miqt_string str) { + QString str_QString = QString::fromUtf8(str.data, str.len); return self->lastIndexIn(str_QString); } @@ -118,12 +122,16 @@ int QRegExp_CaptureCount(const QRegExp* self) { struct miqt_array* QRegExp_CapturedTexts(const QRegExp* self) { QStringList _ret = self->capturedTexts(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -134,12 +142,16 @@ struct miqt_array* QRegExp_CapturedTexts(const QRegExp* self) { struct miqt_array* QRegExp_CapturedTexts2(QRegExp* self) { QStringList _ret = self->capturedTexts(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -147,18 +159,26 @@ struct miqt_array* QRegExp_CapturedTexts2(QRegExp* self) { return _out; } -struct miqt_string* QRegExp_Cap(const QRegExp* self) { +struct miqt_string QRegExp_Cap(const QRegExp* self) { QString _ret = self->cap(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QRegExp_Cap2(QRegExp* self) { +struct miqt_string QRegExp_Cap2(QRegExp* self) { QString _ret = self->cap(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QRegExp_Pos(const QRegExp* self) { @@ -169,60 +189,80 @@ int QRegExp_Pos2(QRegExp* self) { return self->pos(); } -struct miqt_string* QRegExp_ErrorString(const QRegExp* self) { +struct miqt_string QRegExp_ErrorString(const QRegExp* self) { QString _ret = self->errorString(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QRegExp_ErrorString2(QRegExp* self) { +struct miqt_string QRegExp_ErrorString2(QRegExp* self) { QString _ret = self->errorString(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QRegExp_Escape(struct miqt_string* str) { - QString str_QString = QString::fromUtf8(&str->data, str->len); +struct miqt_string QRegExp_Escape(struct miqt_string str) { + QString str_QString = QString::fromUtf8(str.data, str.len); QString _ret = QRegExp::escape(str_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -int QRegExp_IndexIn2(const QRegExp* self, struct miqt_string* str, int offset) { - QString str_QString = QString::fromUtf8(&str->data, str->len); +int QRegExp_IndexIn2(const QRegExp* self, struct miqt_string str, int offset) { + QString str_QString = QString::fromUtf8(str.data, str.len); return self->indexIn(str_QString, static_cast(offset)); } -int QRegExp_IndexIn3(const QRegExp* self, struct miqt_string* str, int offset, int caretMode) { - QString str_QString = QString::fromUtf8(&str->data, str->len); +int QRegExp_IndexIn3(const QRegExp* self, struct miqt_string str, int offset, int caretMode) { + QString str_QString = QString::fromUtf8(str.data, str.len); return self->indexIn(str_QString, static_cast(offset), static_cast(caretMode)); } -int QRegExp_LastIndexIn2(const QRegExp* self, struct miqt_string* str, int offset) { - QString str_QString = QString::fromUtf8(&str->data, str->len); +int QRegExp_LastIndexIn2(const QRegExp* self, struct miqt_string str, int offset) { + QString str_QString = QString::fromUtf8(str.data, str.len); return self->lastIndexIn(str_QString, static_cast(offset)); } -int QRegExp_LastIndexIn3(const QRegExp* self, struct miqt_string* str, int offset, int caretMode) { - QString str_QString = QString::fromUtf8(&str->data, str->len); +int QRegExp_LastIndexIn3(const QRegExp* self, struct miqt_string str, int offset, int caretMode) { + QString str_QString = QString::fromUtf8(str.data, str.len); return self->lastIndexIn(str_QString, static_cast(offset), static_cast(caretMode)); } -struct miqt_string* QRegExp_Cap1(const QRegExp* self, int nth) { +struct miqt_string QRegExp_Cap1(const QRegExp* self, int nth) { QString _ret = self->cap(static_cast(nth)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QRegExp_Cap1WithNth(QRegExp* self, int nth) { +struct miqt_string QRegExp_Cap1WithNth(QRegExp* self, int nth) { QString _ret = self->cap(static_cast(nth)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QRegExp_Pos1(const QRegExp* self, int nth) { diff --git a/qt/gen_qregexp.go b/qt/gen_qregexp.go index 801057b1..24a77780 100644 --- a/qt/gen_qregexp.go +++ b/qt/gen_qregexp.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -70,9 +69,11 @@ func NewQRegExp() *QRegExp { // NewQRegExp2 constructs a new QRegExp object. func NewQRegExp2(pattern string) *QRegExp { - pattern_ms := libmiqt.Strdupg(pattern) - defer C.free(pattern_ms) - ret := C.QRegExp_new2((*C.struct_miqt_string)(pattern_ms)) + pattern_ms := C.struct_miqt_string{} + pattern_ms.data = C.CString(pattern) + pattern_ms.len = C.size_t(len(pattern)) + defer C.free(unsafe.Pointer(pattern_ms.data)) + ret := C.QRegExp_new2(pattern_ms) return newQRegExp(ret) } @@ -84,17 +85,21 @@ func NewQRegExp3(rx *QRegExp) *QRegExp { // NewQRegExp4 constructs a new QRegExp object. func NewQRegExp4(pattern string, cs CaseSensitivity) *QRegExp { - pattern_ms := libmiqt.Strdupg(pattern) - defer C.free(pattern_ms) - ret := C.QRegExp_new4((*C.struct_miqt_string)(pattern_ms), (C.int)(cs)) + pattern_ms := C.struct_miqt_string{} + pattern_ms.data = C.CString(pattern) + pattern_ms.len = C.size_t(len(pattern)) + defer C.free(unsafe.Pointer(pattern_ms.data)) + ret := C.QRegExp_new4(pattern_ms, (C.int)(cs)) return newQRegExp(ret) } // NewQRegExp5 constructs a new QRegExp object. func NewQRegExp5(pattern string, cs CaseSensitivity, syntax QRegExp__PatternSyntax) *QRegExp { - pattern_ms := libmiqt.Strdupg(pattern) - defer C.free(pattern_ms) - ret := C.QRegExp_new5((*C.struct_miqt_string)(pattern_ms), (C.int)(cs), (C.int)(syntax)) + pattern_ms := C.struct_miqt_string{} + pattern_ms.data = C.CString(pattern) + pattern_ms.len = C.size_t(len(pattern)) + defer C.free(unsafe.Pointer(pattern_ms.data)) + ret := C.QRegExp_new5(pattern_ms, (C.int)(cs), (C.int)(syntax)) return newQRegExp(ret) } @@ -123,16 +128,18 @@ func (this *QRegExp) IsValid() bool { } func (this *QRegExp) Pattern() string { - var _ms *C.struct_miqt_string = C.QRegExp_Pattern(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QRegExp_Pattern(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QRegExp) SetPattern(pattern string) { - pattern_ms := libmiqt.Strdupg(pattern) - defer C.free(pattern_ms) - C.QRegExp_SetPattern(this.h, (*C.struct_miqt_string)(pattern_ms)) + pattern_ms := C.struct_miqt_string{} + pattern_ms.data = C.CString(pattern) + pattern_ms.len = C.size_t(len(pattern)) + defer C.free(unsafe.Pointer(pattern_ms.data)) + C.QRegExp_SetPattern(this.h, pattern_ms) } func (this *QRegExp) CaseSensitivity() CaseSensitivity { @@ -160,21 +167,27 @@ func (this *QRegExp) SetMinimal(minimal bool) { } func (this *QRegExp) ExactMatch(str string) bool { - str_ms := libmiqt.Strdupg(str) - defer C.free(str_ms) - return (bool)(C.QRegExp_ExactMatch(this.h, (*C.struct_miqt_string)(str_ms))) + str_ms := C.struct_miqt_string{} + str_ms.data = C.CString(str) + str_ms.len = C.size_t(len(str)) + defer C.free(unsafe.Pointer(str_ms.data)) + return (bool)(C.QRegExp_ExactMatch(this.h, str_ms)) } func (this *QRegExp) IndexIn(str string) int { - str_ms := libmiqt.Strdupg(str) - defer C.free(str_ms) - return (int)(C.QRegExp_IndexIn(this.h, (*C.struct_miqt_string)(str_ms))) + str_ms := C.struct_miqt_string{} + str_ms.data = C.CString(str) + str_ms.len = C.size_t(len(str)) + defer C.free(unsafe.Pointer(str_ms.data)) + return (int)(C.QRegExp_IndexIn(this.h, str_ms)) } func (this *QRegExp) LastIndexIn(str string) int { - str_ms := libmiqt.Strdupg(str) - defer C.free(str_ms) - return (int)(C.QRegExp_LastIndexIn(this.h, (*C.struct_miqt_string)(str_ms))) + str_ms := C.struct_miqt_string{} + str_ms.data = C.CString(str) + str_ms.len = C.size_t(len(str)) + defer C.free(unsafe.Pointer(str_ms.data)) + return (int)(C.QRegExp_LastIndexIn(this.h, str_ms)) } func (this *QRegExp) MatchedLength() int { @@ -188,11 +201,11 @@ func (this *QRegExp) CaptureCount() int { func (this *QRegExp) CapturedTexts() []string { var _ma *C.struct_miqt_array = C.QRegExp_CapturedTexts(this.h) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -202,11 +215,11 @@ func (this *QRegExp) CapturedTexts() []string { func (this *QRegExp) CapturedTexts2() []string { var _ma *C.struct_miqt_array = C.QRegExp_CapturedTexts2(this.h) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -214,16 +227,16 @@ func (this *QRegExp) CapturedTexts2() []string { } func (this *QRegExp) Cap() string { - var _ms *C.struct_miqt_string = C.QRegExp_Cap(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QRegExp_Cap(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QRegExp) Cap2() string { - var _ms *C.struct_miqt_string = C.QRegExp_Cap2(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QRegExp_Cap2(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -236,63 +249,73 @@ func (this *QRegExp) Pos2() int { } func (this *QRegExp) ErrorString() string { - var _ms *C.struct_miqt_string = C.QRegExp_ErrorString(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QRegExp_ErrorString(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QRegExp) ErrorString2() string { - var _ms *C.struct_miqt_string = C.QRegExp_ErrorString2(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QRegExp_ErrorString2(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QRegExp_Escape(str string) string { - str_ms := libmiqt.Strdupg(str) - defer C.free(str_ms) - var _ms *C.struct_miqt_string = C.QRegExp_Escape((*C.struct_miqt_string)(str_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + str_ms := C.struct_miqt_string{} + str_ms.data = C.CString(str) + str_ms.len = C.size_t(len(str)) + defer C.free(unsafe.Pointer(str_ms.data)) + var _ms C.struct_miqt_string = C.QRegExp_Escape(str_ms) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QRegExp) IndexIn2(str string, offset int) int { - str_ms := libmiqt.Strdupg(str) - defer C.free(str_ms) - return (int)(C.QRegExp_IndexIn2(this.h, (*C.struct_miqt_string)(str_ms), (C.int)(offset))) + str_ms := C.struct_miqt_string{} + str_ms.data = C.CString(str) + str_ms.len = C.size_t(len(str)) + defer C.free(unsafe.Pointer(str_ms.data)) + return (int)(C.QRegExp_IndexIn2(this.h, str_ms, (C.int)(offset))) } func (this *QRegExp) IndexIn3(str string, offset int, caretMode QRegExp__CaretMode) int { - str_ms := libmiqt.Strdupg(str) - defer C.free(str_ms) - return (int)(C.QRegExp_IndexIn3(this.h, (*C.struct_miqt_string)(str_ms), (C.int)(offset), (C.int)(caretMode))) + str_ms := C.struct_miqt_string{} + str_ms.data = C.CString(str) + str_ms.len = C.size_t(len(str)) + defer C.free(unsafe.Pointer(str_ms.data)) + return (int)(C.QRegExp_IndexIn3(this.h, str_ms, (C.int)(offset), (C.int)(caretMode))) } func (this *QRegExp) LastIndexIn2(str string, offset int) int { - str_ms := libmiqt.Strdupg(str) - defer C.free(str_ms) - return (int)(C.QRegExp_LastIndexIn2(this.h, (*C.struct_miqt_string)(str_ms), (C.int)(offset))) + str_ms := C.struct_miqt_string{} + str_ms.data = C.CString(str) + str_ms.len = C.size_t(len(str)) + defer C.free(unsafe.Pointer(str_ms.data)) + return (int)(C.QRegExp_LastIndexIn2(this.h, str_ms, (C.int)(offset))) } func (this *QRegExp) LastIndexIn3(str string, offset int, caretMode QRegExp__CaretMode) int { - str_ms := libmiqt.Strdupg(str) - defer C.free(str_ms) - return (int)(C.QRegExp_LastIndexIn3(this.h, (*C.struct_miqt_string)(str_ms), (C.int)(offset), (C.int)(caretMode))) + str_ms := C.struct_miqt_string{} + str_ms.data = C.CString(str) + str_ms.len = C.size_t(len(str)) + defer C.free(unsafe.Pointer(str_ms.data)) + return (int)(C.QRegExp_LastIndexIn3(this.h, str_ms, (C.int)(offset), (C.int)(caretMode))) } func (this *QRegExp) Cap1(nth int) string { - var _ms *C.struct_miqt_string = C.QRegExp_Cap1(this.h, (C.int)(nth)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QRegExp_Cap1(this.h, (C.int)(nth)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QRegExp) Cap1WithNth(nth int) string { - var _ms *C.struct_miqt_string = C.QRegExp_Cap1WithNth(this.h, (C.int)(nth)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QRegExp_Cap1WithNth(this.h, (C.int)(nth)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qregexp.h b/qt/gen_qregexp.h index 6881777c..1ade6b59 100644 --- a/qt/gen_qregexp.h +++ b/qt/gen_qregexp.h @@ -20,44 +20,44 @@ typedef struct QRegExp QRegExp; #endif QRegExp* QRegExp_new(); -QRegExp* QRegExp_new2(struct miqt_string* pattern); +QRegExp* QRegExp_new2(struct miqt_string pattern); QRegExp* QRegExp_new3(QRegExp* rx); -QRegExp* QRegExp_new4(struct miqt_string* pattern, int cs); -QRegExp* QRegExp_new5(struct miqt_string* pattern, int cs, int syntax); +QRegExp* QRegExp_new4(struct miqt_string pattern, int cs); +QRegExp* QRegExp_new5(struct miqt_string pattern, int cs, int syntax); void QRegExp_OperatorAssign(QRegExp* self, QRegExp* rx); void QRegExp_Swap(QRegExp* self, QRegExp* other); bool QRegExp_OperatorEqual(const QRegExp* self, QRegExp* rx); bool QRegExp_OperatorNotEqual(const QRegExp* self, QRegExp* rx); bool QRegExp_IsEmpty(const QRegExp* self); bool QRegExp_IsValid(const QRegExp* self); -struct miqt_string* QRegExp_Pattern(const QRegExp* self); -void QRegExp_SetPattern(QRegExp* self, struct miqt_string* pattern); +struct miqt_string QRegExp_Pattern(const QRegExp* self); +void QRegExp_SetPattern(QRegExp* self, struct miqt_string pattern); int QRegExp_CaseSensitivity(const QRegExp* self); void QRegExp_SetCaseSensitivity(QRegExp* self, int cs); int QRegExp_PatternSyntax(const QRegExp* self); void QRegExp_SetPatternSyntax(QRegExp* self, int syntax); bool QRegExp_IsMinimal(const QRegExp* self); void QRegExp_SetMinimal(QRegExp* self, bool minimal); -bool QRegExp_ExactMatch(const QRegExp* self, struct miqt_string* str); -int QRegExp_IndexIn(const QRegExp* self, struct miqt_string* str); -int QRegExp_LastIndexIn(const QRegExp* self, struct miqt_string* str); +bool QRegExp_ExactMatch(const QRegExp* self, struct miqt_string str); +int QRegExp_IndexIn(const QRegExp* self, struct miqt_string str); +int QRegExp_LastIndexIn(const QRegExp* self, struct miqt_string str); int QRegExp_MatchedLength(const QRegExp* self); int QRegExp_CaptureCount(const QRegExp* self); struct miqt_array* QRegExp_CapturedTexts(const QRegExp* self); struct miqt_array* QRegExp_CapturedTexts2(QRegExp* self); -struct miqt_string* QRegExp_Cap(const QRegExp* self); -struct miqt_string* QRegExp_Cap2(QRegExp* self); +struct miqt_string QRegExp_Cap(const QRegExp* self); +struct miqt_string QRegExp_Cap2(QRegExp* self); int QRegExp_Pos(const QRegExp* self); int QRegExp_Pos2(QRegExp* self); -struct miqt_string* QRegExp_ErrorString(const QRegExp* self); -struct miqt_string* QRegExp_ErrorString2(QRegExp* self); -struct miqt_string* QRegExp_Escape(struct miqt_string* str); -int QRegExp_IndexIn2(const QRegExp* self, struct miqt_string* str, int offset); -int QRegExp_IndexIn3(const QRegExp* self, struct miqt_string* str, int offset, int caretMode); -int QRegExp_LastIndexIn2(const QRegExp* self, struct miqt_string* str, int offset); -int QRegExp_LastIndexIn3(const QRegExp* self, struct miqt_string* str, int offset, int caretMode); -struct miqt_string* QRegExp_Cap1(const QRegExp* self, int nth); -struct miqt_string* QRegExp_Cap1WithNth(QRegExp* self, int nth); +struct miqt_string QRegExp_ErrorString(const QRegExp* self); +struct miqt_string QRegExp_ErrorString2(QRegExp* self); +struct miqt_string QRegExp_Escape(struct miqt_string str); +int QRegExp_IndexIn2(const QRegExp* self, struct miqt_string str, int offset); +int QRegExp_IndexIn3(const QRegExp* self, struct miqt_string str, int offset, int caretMode); +int QRegExp_LastIndexIn2(const QRegExp* self, struct miqt_string str, int offset); +int QRegExp_LastIndexIn3(const QRegExp* self, struct miqt_string str, int offset, int caretMode); +struct miqt_string QRegExp_Cap1(const QRegExp* self, int nth); +struct miqt_string QRegExp_Cap1WithNth(QRegExp* self, int nth); int QRegExp_Pos1(const QRegExp* self, int nth); int QRegExp_Pos1WithNth(QRegExp* self, int nth); void QRegExp_Delete(QRegExp* self); diff --git a/qt/gen_qregularexpression.cpp b/qt/gen_qregularexpression.cpp index 20b09786..dbd513cf 100644 --- a/qt/gen_qregularexpression.cpp +++ b/qt/gen_qregularexpression.cpp @@ -13,8 +13,8 @@ QRegularExpression* QRegularExpression_new() { return new QRegularExpression(); } -QRegularExpression* QRegularExpression_new2(struct miqt_string* pattern) { - QString pattern_QString = QString::fromUtf8(&pattern->data, pattern->len); +QRegularExpression* QRegularExpression_new2(struct miqt_string pattern) { + QString pattern_QString = QString::fromUtf8(pattern.data, pattern.len); return new QRegularExpression(pattern_QString); } @@ -22,8 +22,8 @@ QRegularExpression* QRegularExpression_new3(QRegularExpression* re) { return new QRegularExpression(*re); } -QRegularExpression* QRegularExpression_new4(struct miqt_string* pattern, int options) { - QString pattern_QString = QString::fromUtf8(&pattern->data, pattern->len); +QRegularExpression* QRegularExpression_new4(struct miqt_string pattern, int options) { + QString pattern_QString = QString::fromUtf8(pattern.data, pattern.len); return new QRegularExpression(pattern_QString, static_cast(options)); } @@ -44,15 +44,19 @@ void QRegularExpression_Swap(QRegularExpression* self, QRegularExpression* other self->swap(*other); } -struct miqt_string* QRegularExpression_Pattern(const QRegularExpression* self) { +struct miqt_string QRegularExpression_Pattern(const QRegularExpression* self) { QString _ret = self->pattern(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QRegularExpression_SetPattern(QRegularExpression* self, struct miqt_string* pattern) { - QString pattern_QString = QString::fromUtf8(&pattern->data, pattern->len); +void QRegularExpression_SetPattern(QRegularExpression* self, struct miqt_string pattern) { + QString pattern_QString = QString::fromUtf8(pattern.data, pattern.len); self->setPattern(pattern_QString); } @@ -64,11 +68,15 @@ int QRegularExpression_PatternErrorOffset(const QRegularExpression* self) { return self->patternErrorOffset(); } -struct miqt_string* QRegularExpression_ErrorString(const QRegularExpression* self) { +struct miqt_string QRegularExpression_ErrorString(const QRegularExpression* self) { QString _ret = self->errorString(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QRegularExpression_CaptureCount(const QRegularExpression* self) { @@ -78,12 +86,16 @@ int QRegularExpression_CaptureCount(const QRegularExpression* self) { struct miqt_array* QRegularExpression_NamedCaptureGroups(const QRegularExpression* self) { QStringList _ret = self->namedCaptureGroups(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -91,13 +103,13 @@ struct miqt_array* QRegularExpression_NamedCaptureGroups(const QRegularExpressio return _out; } -QRegularExpressionMatch* QRegularExpression_Match(const QRegularExpression* self, struct miqt_string* subject) { - QString subject_QString = QString::fromUtf8(&subject->data, subject->len); +QRegularExpressionMatch* QRegularExpression_Match(const QRegularExpression* self, struct miqt_string subject) { + QString subject_QString = QString::fromUtf8(subject.data, subject.len); return new QRegularExpressionMatch(self->match(subject_QString)); } -QRegularExpressionMatchIterator* QRegularExpression_GlobalMatch(const QRegularExpression* self, struct miqt_string* subject) { - QString subject_QString = QString::fromUtf8(&subject->data, subject->len); +QRegularExpressionMatchIterator* QRegularExpression_GlobalMatch(const QRegularExpression* self, struct miqt_string subject) { + QString subject_QString = QString::fromUtf8(subject.data, subject.len); return new QRegularExpressionMatchIterator(self->globalMatch(subject_QString)); } @@ -105,28 +117,40 @@ void QRegularExpression_Optimize(const QRegularExpression* self) { self->optimize(); } -struct miqt_string* QRegularExpression_Escape(struct miqt_string* str) { - QString str_QString = QString::fromUtf8(&str->data, str->len); +struct miqt_string QRegularExpression_Escape(struct miqt_string str) { + QString str_QString = QString::fromUtf8(str.data, str.len); QString _ret = QRegularExpression::escape(str_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QRegularExpression_WildcardToRegularExpression(struct miqt_string* str) { - QString str_QString = QString::fromUtf8(&str->data, str->len); +struct miqt_string QRegularExpression_WildcardToRegularExpression(struct miqt_string str) { + QString str_QString = QString::fromUtf8(str.data, str.len); QString _ret = QRegularExpression::wildcardToRegularExpression(str_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QRegularExpression_AnchoredPattern(struct miqt_string* expression) { - QString expression_QString = QString::fromUtf8(&expression->data, expression->len); +struct miqt_string QRegularExpression_AnchoredPattern(struct miqt_string expression) { + QString expression_QString = QString::fromUtf8(expression.data, expression.len); QString _ret = QRegularExpression::anchoredPattern(expression_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } bool QRegularExpression_OperatorEqual(const QRegularExpression* self, QRegularExpression* re) { @@ -137,33 +161,33 @@ bool QRegularExpression_OperatorNotEqual(const QRegularExpression* self, QRegula return self->operator!=(*re); } -QRegularExpressionMatch* QRegularExpression_Match2(const QRegularExpression* self, struct miqt_string* subject, int offset) { - QString subject_QString = QString::fromUtf8(&subject->data, subject->len); +QRegularExpressionMatch* QRegularExpression_Match2(const QRegularExpression* self, struct miqt_string subject, int offset) { + QString subject_QString = QString::fromUtf8(subject.data, subject.len); return new QRegularExpressionMatch(self->match(subject_QString, static_cast(offset))); } -QRegularExpressionMatch* QRegularExpression_Match3(const QRegularExpression* self, struct miqt_string* subject, int offset, int matchType) { - QString subject_QString = QString::fromUtf8(&subject->data, subject->len); +QRegularExpressionMatch* QRegularExpression_Match3(const QRegularExpression* self, struct miqt_string subject, int offset, int matchType) { + QString subject_QString = QString::fromUtf8(subject.data, subject.len); return new QRegularExpressionMatch(self->match(subject_QString, static_cast(offset), static_cast(matchType))); } -QRegularExpressionMatch* QRegularExpression_Match4(const QRegularExpression* self, struct miqt_string* subject, int offset, int matchType, int matchOptions) { - QString subject_QString = QString::fromUtf8(&subject->data, subject->len); +QRegularExpressionMatch* QRegularExpression_Match4(const QRegularExpression* self, struct miqt_string subject, int offset, int matchType, int matchOptions) { + QString subject_QString = QString::fromUtf8(subject.data, subject.len); return new QRegularExpressionMatch(self->match(subject_QString, static_cast(offset), static_cast(matchType), static_cast(matchOptions))); } -QRegularExpressionMatchIterator* QRegularExpression_GlobalMatch2(const QRegularExpression* self, struct miqt_string* subject, int offset) { - QString subject_QString = QString::fromUtf8(&subject->data, subject->len); +QRegularExpressionMatchIterator* QRegularExpression_GlobalMatch2(const QRegularExpression* self, struct miqt_string subject, int offset) { + QString subject_QString = QString::fromUtf8(subject.data, subject.len); return new QRegularExpressionMatchIterator(self->globalMatch(subject_QString, static_cast(offset))); } -QRegularExpressionMatchIterator* QRegularExpression_GlobalMatch3(const QRegularExpression* self, struct miqt_string* subject, int offset, int matchType) { - QString subject_QString = QString::fromUtf8(&subject->data, subject->len); +QRegularExpressionMatchIterator* QRegularExpression_GlobalMatch3(const QRegularExpression* self, struct miqt_string subject, int offset, int matchType) { + QString subject_QString = QString::fromUtf8(subject.data, subject.len); return new QRegularExpressionMatchIterator(self->globalMatch(subject_QString, static_cast(offset), static_cast(matchType))); } -QRegularExpressionMatchIterator* QRegularExpression_GlobalMatch4(const QRegularExpression* self, struct miqt_string* subject, int offset, int matchType, int matchOptions) { - QString subject_QString = QString::fromUtf8(&subject->data, subject->len); +QRegularExpressionMatchIterator* QRegularExpression_GlobalMatch4(const QRegularExpression* self, struct miqt_string subject, int offset, int matchType, int matchOptions) { + QString subject_QString = QString::fromUtf8(subject.data, subject.len); return new QRegularExpressionMatchIterator(self->globalMatch(subject_QString, static_cast(offset), static_cast(matchType), static_cast(matchOptions))); } @@ -217,30 +241,42 @@ int QRegularExpressionMatch_LastCapturedIndex(const QRegularExpressionMatch* sel return self->lastCapturedIndex(); } -struct miqt_string* QRegularExpressionMatch_Captured(const QRegularExpressionMatch* self) { +struct miqt_string QRegularExpressionMatch_Captured(const QRegularExpressionMatch* self) { QString _ret = self->captured(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QRegularExpressionMatch_CapturedWithName(const QRegularExpressionMatch* self, struct miqt_string* name) { - QString name_QString = QString::fromUtf8(&name->data, name->len); +struct miqt_string QRegularExpressionMatch_CapturedWithName(const QRegularExpressionMatch* self, struct miqt_string name) { + QString name_QString = QString::fromUtf8(name.data, name.len); QString _ret = self->captured(name_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } struct miqt_array* QRegularExpressionMatch_CapturedTexts(const QRegularExpressionMatch* self) { QStringList _ret = self->capturedTexts(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -260,26 +296,30 @@ int QRegularExpressionMatch_CapturedEnd(const QRegularExpressionMatch* self) { return self->capturedEnd(); } -int QRegularExpressionMatch_CapturedStartWithName(const QRegularExpressionMatch* self, struct miqt_string* name) { - QString name_QString = QString::fromUtf8(&name->data, name->len); +int QRegularExpressionMatch_CapturedStartWithName(const QRegularExpressionMatch* self, struct miqt_string name) { + QString name_QString = QString::fromUtf8(name.data, name.len); return self->capturedStart(name_QString); } -int QRegularExpressionMatch_CapturedLengthWithName(const QRegularExpressionMatch* self, struct miqt_string* name) { - QString name_QString = QString::fromUtf8(&name->data, name->len); +int QRegularExpressionMatch_CapturedLengthWithName(const QRegularExpressionMatch* self, struct miqt_string name) { + QString name_QString = QString::fromUtf8(name.data, name.len); return self->capturedLength(name_QString); } -int QRegularExpressionMatch_CapturedEndWithName(const QRegularExpressionMatch* self, struct miqt_string* name) { - QString name_QString = QString::fromUtf8(&name->data, name->len); +int QRegularExpressionMatch_CapturedEndWithName(const QRegularExpressionMatch* self, struct miqt_string name) { + QString name_QString = QString::fromUtf8(name.data, name.len); return self->capturedEnd(name_QString); } -struct miqt_string* QRegularExpressionMatch_Captured1(const QRegularExpressionMatch* self, int nth) { +struct miqt_string QRegularExpressionMatch_Captured1(const QRegularExpressionMatch* self, int nth) { QString _ret = self->captured(static_cast(nth)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QRegularExpressionMatch_CapturedStart1(const QRegularExpressionMatch* self, int nth) { diff --git a/qt/gen_qregularexpression.go b/qt/gen_qregularexpression.go index 61902e0a..33c7d3ab 100644 --- a/qt/gen_qregularexpression.go +++ b/qt/gen_qregularexpression.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -83,9 +82,11 @@ func NewQRegularExpression() *QRegularExpression { // NewQRegularExpression2 constructs a new QRegularExpression object. func NewQRegularExpression2(pattern string) *QRegularExpression { - pattern_ms := libmiqt.Strdupg(pattern) - defer C.free(pattern_ms) - ret := C.QRegularExpression_new2((*C.struct_miqt_string)(pattern_ms)) + pattern_ms := C.struct_miqt_string{} + pattern_ms.data = C.CString(pattern) + pattern_ms.len = C.size_t(len(pattern)) + defer C.free(unsafe.Pointer(pattern_ms.data)) + ret := C.QRegularExpression_new2(pattern_ms) return newQRegularExpression(ret) } @@ -97,9 +98,11 @@ func NewQRegularExpression3(re *QRegularExpression) *QRegularExpression { // NewQRegularExpression4 constructs a new QRegularExpression object. func NewQRegularExpression4(pattern string, options QRegularExpression__PatternOption) *QRegularExpression { - pattern_ms := libmiqt.Strdupg(pattern) - defer C.free(pattern_ms) - ret := C.QRegularExpression_new4((*C.struct_miqt_string)(pattern_ms), (C.int)(options)) + pattern_ms := C.struct_miqt_string{} + pattern_ms.data = C.CString(pattern) + pattern_ms.len = C.size_t(len(pattern)) + defer C.free(unsafe.Pointer(pattern_ms.data)) + ret := C.QRegularExpression_new4(pattern_ms, (C.int)(options)) return newQRegularExpression(ret) } @@ -120,16 +123,18 @@ func (this *QRegularExpression) Swap(other *QRegularExpression) { } func (this *QRegularExpression) Pattern() string { - var _ms *C.struct_miqt_string = C.QRegularExpression_Pattern(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QRegularExpression_Pattern(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QRegularExpression) SetPattern(pattern string) { - pattern_ms := libmiqt.Strdupg(pattern) - defer C.free(pattern_ms) - C.QRegularExpression_SetPattern(this.h, (*C.struct_miqt_string)(pattern_ms)) + pattern_ms := C.struct_miqt_string{} + pattern_ms.data = C.CString(pattern) + pattern_ms.len = C.size_t(len(pattern)) + defer C.free(unsafe.Pointer(pattern_ms.data)) + C.QRegularExpression_SetPattern(this.h, pattern_ms) } func (this *QRegularExpression) IsValid() bool { @@ -141,9 +146,9 @@ func (this *QRegularExpression) PatternErrorOffset() int { } func (this *QRegularExpression) ErrorString() string { - var _ms *C.struct_miqt_string = C.QRegularExpression_ErrorString(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QRegularExpression_ErrorString(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -154,11 +159,11 @@ func (this *QRegularExpression) CaptureCount() int { func (this *QRegularExpression) NamedCaptureGroups() []string { var _ma *C.struct_miqt_array = C.QRegularExpression_NamedCaptureGroups(this.h) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -166,18 +171,22 @@ func (this *QRegularExpression) NamedCaptureGroups() []string { } func (this *QRegularExpression) Match(subject string) *QRegularExpressionMatch { - subject_ms := libmiqt.Strdupg(subject) - defer C.free(subject_ms) - _ret := C.QRegularExpression_Match(this.h, (*C.struct_miqt_string)(subject_ms)) + subject_ms := C.struct_miqt_string{} + subject_ms.data = C.CString(subject) + subject_ms.len = C.size_t(len(subject)) + defer C.free(unsafe.Pointer(subject_ms.data)) + _ret := C.QRegularExpression_Match(this.h, subject_ms) _goptr := newQRegularExpressionMatch(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QRegularExpression) GlobalMatch(subject string) *QRegularExpressionMatchIterator { - subject_ms := libmiqt.Strdupg(subject) - defer C.free(subject_ms) - _ret := C.QRegularExpression_GlobalMatch(this.h, (*C.struct_miqt_string)(subject_ms)) + subject_ms := C.struct_miqt_string{} + subject_ms.data = C.CString(subject) + subject_ms.len = C.size_t(len(subject)) + defer C.free(unsafe.Pointer(subject_ms.data)) + _ret := C.QRegularExpression_GlobalMatch(this.h, subject_ms) _goptr := newQRegularExpressionMatchIterator(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -188,29 +197,35 @@ func (this *QRegularExpression) Optimize() { } func QRegularExpression_Escape(str string) string { - str_ms := libmiqt.Strdupg(str) - defer C.free(str_ms) - var _ms *C.struct_miqt_string = C.QRegularExpression_Escape((*C.struct_miqt_string)(str_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + str_ms := C.struct_miqt_string{} + str_ms.data = C.CString(str) + str_ms.len = C.size_t(len(str)) + defer C.free(unsafe.Pointer(str_ms.data)) + var _ms C.struct_miqt_string = C.QRegularExpression_Escape(str_ms) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QRegularExpression_WildcardToRegularExpression(str string) string { - str_ms := libmiqt.Strdupg(str) - defer C.free(str_ms) - var _ms *C.struct_miqt_string = C.QRegularExpression_WildcardToRegularExpression((*C.struct_miqt_string)(str_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + str_ms := C.struct_miqt_string{} + str_ms.data = C.CString(str) + str_ms.len = C.size_t(len(str)) + defer C.free(unsafe.Pointer(str_ms.data)) + var _ms C.struct_miqt_string = C.QRegularExpression_WildcardToRegularExpression(str_ms) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QRegularExpression_AnchoredPattern(expression string) string { - expression_ms := libmiqt.Strdupg(expression) - defer C.free(expression_ms) - var _ms *C.struct_miqt_string = C.QRegularExpression_AnchoredPattern((*C.struct_miqt_string)(expression_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + expression_ms := C.struct_miqt_string{} + expression_ms.data = C.CString(expression) + expression_ms.len = C.size_t(len(expression)) + defer C.free(unsafe.Pointer(expression_ms.data)) + var _ms C.struct_miqt_string = C.QRegularExpression_AnchoredPattern(expression_ms) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -223,54 +238,66 @@ func (this *QRegularExpression) OperatorNotEqual(re *QRegularExpression) bool { } func (this *QRegularExpression) Match2(subject string, offset int) *QRegularExpressionMatch { - subject_ms := libmiqt.Strdupg(subject) - defer C.free(subject_ms) - _ret := C.QRegularExpression_Match2(this.h, (*C.struct_miqt_string)(subject_ms), (C.int)(offset)) + subject_ms := C.struct_miqt_string{} + subject_ms.data = C.CString(subject) + subject_ms.len = C.size_t(len(subject)) + defer C.free(unsafe.Pointer(subject_ms.data)) + _ret := C.QRegularExpression_Match2(this.h, subject_ms, (C.int)(offset)) _goptr := newQRegularExpressionMatch(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QRegularExpression) Match3(subject string, offset int, matchType QRegularExpression__MatchType) *QRegularExpressionMatch { - subject_ms := libmiqt.Strdupg(subject) - defer C.free(subject_ms) - _ret := C.QRegularExpression_Match3(this.h, (*C.struct_miqt_string)(subject_ms), (C.int)(offset), (C.int)(matchType)) + subject_ms := C.struct_miqt_string{} + subject_ms.data = C.CString(subject) + subject_ms.len = C.size_t(len(subject)) + defer C.free(unsafe.Pointer(subject_ms.data)) + _ret := C.QRegularExpression_Match3(this.h, subject_ms, (C.int)(offset), (C.int)(matchType)) _goptr := newQRegularExpressionMatch(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QRegularExpression) Match4(subject string, offset int, matchType QRegularExpression__MatchType, matchOptions QRegularExpression__MatchOption) *QRegularExpressionMatch { - subject_ms := libmiqt.Strdupg(subject) - defer C.free(subject_ms) - _ret := C.QRegularExpression_Match4(this.h, (*C.struct_miqt_string)(subject_ms), (C.int)(offset), (C.int)(matchType), (C.int)(matchOptions)) + subject_ms := C.struct_miqt_string{} + subject_ms.data = C.CString(subject) + subject_ms.len = C.size_t(len(subject)) + defer C.free(unsafe.Pointer(subject_ms.data)) + _ret := C.QRegularExpression_Match4(this.h, subject_ms, (C.int)(offset), (C.int)(matchType), (C.int)(matchOptions)) _goptr := newQRegularExpressionMatch(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QRegularExpression) GlobalMatch2(subject string, offset int) *QRegularExpressionMatchIterator { - subject_ms := libmiqt.Strdupg(subject) - defer C.free(subject_ms) - _ret := C.QRegularExpression_GlobalMatch2(this.h, (*C.struct_miqt_string)(subject_ms), (C.int)(offset)) + subject_ms := C.struct_miqt_string{} + subject_ms.data = C.CString(subject) + subject_ms.len = C.size_t(len(subject)) + defer C.free(unsafe.Pointer(subject_ms.data)) + _ret := C.QRegularExpression_GlobalMatch2(this.h, subject_ms, (C.int)(offset)) _goptr := newQRegularExpressionMatchIterator(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QRegularExpression) GlobalMatch3(subject string, offset int, matchType QRegularExpression__MatchType) *QRegularExpressionMatchIterator { - subject_ms := libmiqt.Strdupg(subject) - defer C.free(subject_ms) - _ret := C.QRegularExpression_GlobalMatch3(this.h, (*C.struct_miqt_string)(subject_ms), (C.int)(offset), (C.int)(matchType)) + subject_ms := C.struct_miqt_string{} + subject_ms.data = C.CString(subject) + subject_ms.len = C.size_t(len(subject)) + defer C.free(unsafe.Pointer(subject_ms.data)) + _ret := C.QRegularExpression_GlobalMatch3(this.h, subject_ms, (C.int)(offset), (C.int)(matchType)) _goptr := newQRegularExpressionMatchIterator(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QRegularExpression) GlobalMatch4(subject string, offset int, matchType QRegularExpression__MatchType, matchOptions QRegularExpression__MatchOption) *QRegularExpressionMatchIterator { - subject_ms := libmiqt.Strdupg(subject) - defer C.free(subject_ms) - _ret := C.QRegularExpression_GlobalMatch4(this.h, (*C.struct_miqt_string)(subject_ms), (C.int)(offset), (C.int)(matchType), (C.int)(matchOptions)) + subject_ms := C.struct_miqt_string{} + subject_ms.data = C.CString(subject) + subject_ms.len = C.size_t(len(subject)) + defer C.free(unsafe.Pointer(subject_ms.data)) + _ret := C.QRegularExpression_GlobalMatch4(this.h, subject_ms, (C.int)(offset), (C.int)(matchType), (C.int)(matchOptions)) _goptr := newQRegularExpressionMatchIterator(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -371,29 +398,31 @@ func (this *QRegularExpressionMatch) LastCapturedIndex() int { } func (this *QRegularExpressionMatch) Captured() string { - var _ms *C.struct_miqt_string = C.QRegularExpressionMatch_Captured(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QRegularExpressionMatch_Captured(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QRegularExpressionMatch) CapturedWithName(name string) string { - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - var _ms *C.struct_miqt_string = C.QRegularExpressionMatch_CapturedWithName(this.h, (*C.struct_miqt_string)(name_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + var _ms C.struct_miqt_string = C.QRegularExpressionMatch_CapturedWithName(this.h, name_ms) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QRegularExpressionMatch) CapturedTexts() []string { var _ma *C.struct_miqt_array = C.QRegularExpressionMatch_CapturedTexts(this.h) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -413,27 +442,33 @@ func (this *QRegularExpressionMatch) CapturedEnd() int { } func (this *QRegularExpressionMatch) CapturedStartWithName(name string) int { - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - return (int)(C.QRegularExpressionMatch_CapturedStartWithName(this.h, (*C.struct_miqt_string)(name_ms))) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + return (int)(C.QRegularExpressionMatch_CapturedStartWithName(this.h, name_ms)) } func (this *QRegularExpressionMatch) CapturedLengthWithName(name string) int { - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - return (int)(C.QRegularExpressionMatch_CapturedLengthWithName(this.h, (*C.struct_miqt_string)(name_ms))) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + return (int)(C.QRegularExpressionMatch_CapturedLengthWithName(this.h, name_ms)) } func (this *QRegularExpressionMatch) CapturedEndWithName(name string) int { - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - return (int)(C.QRegularExpressionMatch_CapturedEndWithName(this.h, (*C.struct_miqt_string)(name_ms))) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + return (int)(C.QRegularExpressionMatch_CapturedEndWithName(this.h, name_ms)) } func (this *QRegularExpressionMatch) Captured1(nth int) string { - var _ms *C.struct_miqt_string = C.QRegularExpressionMatch_Captured1(this.h, (C.int)(nth)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QRegularExpressionMatch_Captured1(this.h, (C.int)(nth)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qregularexpression.h b/qt/gen_qregularexpression.h index 71cc017d..8ecdd35f 100644 --- a/qt/gen_qregularexpression.h +++ b/qt/gen_qregularexpression.h @@ -24,34 +24,34 @@ typedef struct QRegularExpressionMatchIterator QRegularExpressionMatchIterator; #endif QRegularExpression* QRegularExpression_new(); -QRegularExpression* QRegularExpression_new2(struct miqt_string* pattern); +QRegularExpression* QRegularExpression_new2(struct miqt_string pattern); QRegularExpression* QRegularExpression_new3(QRegularExpression* re); -QRegularExpression* QRegularExpression_new4(struct miqt_string* pattern, int options); +QRegularExpression* QRegularExpression_new4(struct miqt_string pattern, int options); int QRegularExpression_PatternOptions(const QRegularExpression* self); void QRegularExpression_SetPatternOptions(QRegularExpression* self, int options); void QRegularExpression_OperatorAssign(QRegularExpression* self, QRegularExpression* re); void QRegularExpression_Swap(QRegularExpression* self, QRegularExpression* other); -struct miqt_string* QRegularExpression_Pattern(const QRegularExpression* self); -void QRegularExpression_SetPattern(QRegularExpression* self, struct miqt_string* pattern); +struct miqt_string QRegularExpression_Pattern(const QRegularExpression* self); +void QRegularExpression_SetPattern(QRegularExpression* self, struct miqt_string pattern); bool QRegularExpression_IsValid(const QRegularExpression* self); int QRegularExpression_PatternErrorOffset(const QRegularExpression* self); -struct miqt_string* QRegularExpression_ErrorString(const QRegularExpression* self); +struct miqt_string QRegularExpression_ErrorString(const QRegularExpression* self); int QRegularExpression_CaptureCount(const QRegularExpression* self); struct miqt_array* QRegularExpression_NamedCaptureGroups(const QRegularExpression* self); -QRegularExpressionMatch* QRegularExpression_Match(const QRegularExpression* self, struct miqt_string* subject); -QRegularExpressionMatchIterator* QRegularExpression_GlobalMatch(const QRegularExpression* self, struct miqt_string* subject); +QRegularExpressionMatch* QRegularExpression_Match(const QRegularExpression* self, struct miqt_string subject); +QRegularExpressionMatchIterator* QRegularExpression_GlobalMatch(const QRegularExpression* self, struct miqt_string subject); void QRegularExpression_Optimize(const QRegularExpression* self); -struct miqt_string* QRegularExpression_Escape(struct miqt_string* str); -struct miqt_string* QRegularExpression_WildcardToRegularExpression(struct miqt_string* str); -struct miqt_string* QRegularExpression_AnchoredPattern(struct miqt_string* expression); +struct miqt_string QRegularExpression_Escape(struct miqt_string str); +struct miqt_string QRegularExpression_WildcardToRegularExpression(struct miqt_string str); +struct miqt_string QRegularExpression_AnchoredPattern(struct miqt_string expression); bool QRegularExpression_OperatorEqual(const QRegularExpression* self, QRegularExpression* re); bool QRegularExpression_OperatorNotEqual(const QRegularExpression* self, QRegularExpression* re); -QRegularExpressionMatch* QRegularExpression_Match2(const QRegularExpression* self, struct miqt_string* subject, int offset); -QRegularExpressionMatch* QRegularExpression_Match3(const QRegularExpression* self, struct miqt_string* subject, int offset, int matchType); -QRegularExpressionMatch* QRegularExpression_Match4(const QRegularExpression* self, struct miqt_string* subject, int offset, int matchType, int matchOptions); -QRegularExpressionMatchIterator* QRegularExpression_GlobalMatch2(const QRegularExpression* self, struct miqt_string* subject, int offset); -QRegularExpressionMatchIterator* QRegularExpression_GlobalMatch3(const QRegularExpression* self, struct miqt_string* subject, int offset, int matchType); -QRegularExpressionMatchIterator* QRegularExpression_GlobalMatch4(const QRegularExpression* self, struct miqt_string* subject, int offset, int matchType, int matchOptions); +QRegularExpressionMatch* QRegularExpression_Match2(const QRegularExpression* self, struct miqt_string subject, int offset); +QRegularExpressionMatch* QRegularExpression_Match3(const QRegularExpression* self, struct miqt_string subject, int offset, int matchType); +QRegularExpressionMatch* QRegularExpression_Match4(const QRegularExpression* self, struct miqt_string subject, int offset, int matchType, int matchOptions); +QRegularExpressionMatchIterator* QRegularExpression_GlobalMatch2(const QRegularExpression* self, struct miqt_string subject, int offset); +QRegularExpressionMatchIterator* QRegularExpression_GlobalMatch3(const QRegularExpression* self, struct miqt_string subject, int offset, int matchType); +QRegularExpressionMatchIterator* QRegularExpression_GlobalMatch4(const QRegularExpression* self, struct miqt_string subject, int offset, int matchType, int matchOptions); void QRegularExpression_Delete(QRegularExpression* self); QRegularExpressionMatch* QRegularExpressionMatch_new(); @@ -65,16 +65,16 @@ bool QRegularExpressionMatch_HasMatch(const QRegularExpressionMatch* self); bool QRegularExpressionMatch_HasPartialMatch(const QRegularExpressionMatch* self); bool QRegularExpressionMatch_IsValid(const QRegularExpressionMatch* self); int QRegularExpressionMatch_LastCapturedIndex(const QRegularExpressionMatch* self); -struct miqt_string* QRegularExpressionMatch_Captured(const QRegularExpressionMatch* self); -struct miqt_string* QRegularExpressionMatch_CapturedWithName(const QRegularExpressionMatch* self, struct miqt_string* name); +struct miqt_string QRegularExpressionMatch_Captured(const QRegularExpressionMatch* self); +struct miqt_string QRegularExpressionMatch_CapturedWithName(const QRegularExpressionMatch* self, struct miqt_string name); struct miqt_array* QRegularExpressionMatch_CapturedTexts(const QRegularExpressionMatch* self); int QRegularExpressionMatch_CapturedStart(const QRegularExpressionMatch* self); int QRegularExpressionMatch_CapturedLength(const QRegularExpressionMatch* self); int QRegularExpressionMatch_CapturedEnd(const QRegularExpressionMatch* self); -int QRegularExpressionMatch_CapturedStartWithName(const QRegularExpressionMatch* self, struct miqt_string* name); -int QRegularExpressionMatch_CapturedLengthWithName(const QRegularExpressionMatch* self, struct miqt_string* name); -int QRegularExpressionMatch_CapturedEndWithName(const QRegularExpressionMatch* self, struct miqt_string* name); -struct miqt_string* QRegularExpressionMatch_Captured1(const QRegularExpressionMatch* self, int nth); +int QRegularExpressionMatch_CapturedStartWithName(const QRegularExpressionMatch* self, struct miqt_string name); +int QRegularExpressionMatch_CapturedLengthWithName(const QRegularExpressionMatch* self, struct miqt_string name); +int QRegularExpressionMatch_CapturedEndWithName(const QRegularExpressionMatch* self, struct miqt_string name); +struct miqt_string QRegularExpressionMatch_Captured1(const QRegularExpressionMatch* self, int nth); int QRegularExpressionMatch_CapturedStart1(const QRegularExpressionMatch* self, int nth); int QRegularExpressionMatch_CapturedLength1(const QRegularExpressionMatch* self, int nth); int QRegularExpressionMatch_CapturedEnd1(const QRegularExpressionMatch* self, int nth); diff --git a/qt/gen_qresource.cpp b/qt/gen_qresource.cpp index 3b9ab664..7af01e56 100644 --- a/qt/gen_qresource.cpp +++ b/qt/gen_qresource.cpp @@ -14,33 +14,41 @@ QResource* QResource_new() { return new QResource(); } -QResource* QResource_new2(struct miqt_string* file) { - QString file_QString = QString::fromUtf8(&file->data, file->len); +QResource* QResource_new2(struct miqt_string file) { + QString file_QString = QString::fromUtf8(file.data, file.len); return new QResource(file_QString); } -QResource* QResource_new3(struct miqt_string* file, QLocale* locale) { - QString file_QString = QString::fromUtf8(&file->data, file->len); +QResource* QResource_new3(struct miqt_string file, QLocale* locale) { + QString file_QString = QString::fromUtf8(file.data, file.len); return new QResource(file_QString, *locale); } -void QResource_SetFileName(QResource* self, struct miqt_string* file) { - QString file_QString = QString::fromUtf8(&file->data, file->len); +void QResource_SetFileName(QResource* self, struct miqt_string file) { + QString file_QString = QString::fromUtf8(file.data, file.len); self->setFileName(file_QString); } -struct miqt_string* QResource_FileName(const QResource* self) { +struct miqt_string QResource_FileName(const QResource* self) { QString _ret = self->fileName(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QResource_AbsoluteFilePath(const QResource* self) { +struct miqt_string QResource_AbsoluteFilePath(const QResource* self) { QString _ret = self->absoluteFilePath(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QResource_SetLocale(QResource* self, QLocale* locale) { @@ -75,28 +83,37 @@ long long QResource_UncompressedSize(const QResource* self) { return static_cast(_ret); } -QByteArray* QResource_UncompressedData(const QResource* self) { - return new QByteArray(self->uncompressedData()); +struct miqt_string QResource_UncompressedData(const QResource* self) { + QByteArray _qb = self->uncompressedData(); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } QDateTime* QResource_LastModified(const QResource* self) { return new QDateTime(self->lastModified()); } -void QResource_AddSearchPath(struct miqt_string* path) { - QString path_QString = QString::fromUtf8(&path->data, path->len); +void QResource_AddSearchPath(struct miqt_string path) { + QString path_QString = QString::fromUtf8(path.data, path.len); QResource::addSearchPath(path_QString); } struct miqt_array* QResource_SearchPaths() { QStringList _ret = QResource::searchPaths(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -108,13 +125,13 @@ bool QResource_IsCompressed(const QResource* self) { return self->isCompressed(); } -bool QResource_RegisterResource(struct miqt_string* rccFilename) { - QString rccFilename_QString = QString::fromUtf8(&rccFilename->data, rccFilename->len); +bool QResource_RegisterResource(struct miqt_string rccFilename) { + QString rccFilename_QString = QString::fromUtf8(rccFilename.data, rccFilename.len); return QResource::registerResource(rccFilename_QString); } -bool QResource_UnregisterResource(struct miqt_string* rccFilename) { - QString rccFilename_QString = QString::fromUtf8(&rccFilename->data, rccFilename->len); +bool QResource_UnregisterResource(struct miqt_string rccFilename) { + QString rccFilename_QString = QString::fromUtf8(rccFilename.data, rccFilename.len); return QResource::unregisterResource(rccFilename_QString); } @@ -126,25 +143,25 @@ bool QResource_UnregisterResourceWithRccData(const unsigned char* rccData) { return QResource::unregisterResource(static_cast(rccData)); } -bool QResource_RegisterResource2(struct miqt_string* rccFilename, struct miqt_string* resourceRoot) { - QString rccFilename_QString = QString::fromUtf8(&rccFilename->data, rccFilename->len); - QString resourceRoot_QString = QString::fromUtf8(&resourceRoot->data, resourceRoot->len); +bool QResource_RegisterResource2(struct miqt_string rccFilename, struct miqt_string resourceRoot) { + QString rccFilename_QString = QString::fromUtf8(rccFilename.data, rccFilename.len); + QString resourceRoot_QString = QString::fromUtf8(resourceRoot.data, resourceRoot.len); return QResource::registerResource(rccFilename_QString, resourceRoot_QString); } -bool QResource_UnregisterResource2(struct miqt_string* rccFilename, struct miqt_string* resourceRoot) { - QString rccFilename_QString = QString::fromUtf8(&rccFilename->data, rccFilename->len); - QString resourceRoot_QString = QString::fromUtf8(&resourceRoot->data, resourceRoot->len); +bool QResource_UnregisterResource2(struct miqt_string rccFilename, struct miqt_string resourceRoot) { + QString rccFilename_QString = QString::fromUtf8(rccFilename.data, rccFilename.len); + QString resourceRoot_QString = QString::fromUtf8(resourceRoot.data, resourceRoot.len); return QResource::unregisterResource(rccFilename_QString, resourceRoot_QString); } -bool QResource_RegisterResource22(const unsigned char* rccData, struct miqt_string* resourceRoot) { - QString resourceRoot_QString = QString::fromUtf8(&resourceRoot->data, resourceRoot->len); +bool QResource_RegisterResource22(const unsigned char* rccData, struct miqt_string resourceRoot) { + QString resourceRoot_QString = QString::fromUtf8(resourceRoot.data, resourceRoot.len); return QResource::registerResource(static_cast(rccData), resourceRoot_QString); } -bool QResource_UnregisterResource22(const unsigned char* rccData, struct miqt_string* resourceRoot) { - QString resourceRoot_QString = QString::fromUtf8(&resourceRoot->data, resourceRoot->len); +bool QResource_UnregisterResource22(const unsigned char* rccData, struct miqt_string resourceRoot) { + QString resourceRoot_QString = QString::fromUtf8(resourceRoot.data, resourceRoot.len); return QResource::unregisterResource(static_cast(rccData), resourceRoot_QString); } diff --git a/qt/gen_qresource.go b/qt/gen_qresource.go index 5510a5a1..6e97fc83 100644 --- a/qt/gen_qresource.go +++ b/qt/gen_qresource.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -59,37 +58,43 @@ func NewQResource() *QResource { // NewQResource2 constructs a new QResource object. func NewQResource2(file string) *QResource { - file_ms := libmiqt.Strdupg(file) - defer C.free(file_ms) - ret := C.QResource_new2((*C.struct_miqt_string)(file_ms)) + file_ms := C.struct_miqt_string{} + file_ms.data = C.CString(file) + file_ms.len = C.size_t(len(file)) + defer C.free(unsafe.Pointer(file_ms.data)) + ret := C.QResource_new2(file_ms) return newQResource(ret) } // NewQResource3 constructs a new QResource object. func NewQResource3(file string, locale *QLocale) *QResource { - file_ms := libmiqt.Strdupg(file) - defer C.free(file_ms) - ret := C.QResource_new3((*C.struct_miqt_string)(file_ms), locale.cPointer()) + file_ms := C.struct_miqt_string{} + file_ms.data = C.CString(file) + file_ms.len = C.size_t(len(file)) + defer C.free(unsafe.Pointer(file_ms.data)) + ret := C.QResource_new3(file_ms, locale.cPointer()) return newQResource(ret) } func (this *QResource) SetFileName(file string) { - file_ms := libmiqt.Strdupg(file) - defer C.free(file_ms) - C.QResource_SetFileName(this.h, (*C.struct_miqt_string)(file_ms)) + file_ms := C.struct_miqt_string{} + file_ms.data = C.CString(file) + file_ms.len = C.size_t(len(file)) + defer C.free(unsafe.Pointer(file_ms.data)) + C.QResource_SetFileName(this.h, file_ms) } func (this *QResource) FileName() string { - var _ms *C.struct_miqt_string = C.QResource_FileName(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QResource_FileName(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QResource) AbsoluteFilePath() string { - var _ms *C.struct_miqt_string = C.QResource_AbsoluteFilePath(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QResource_AbsoluteFilePath(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -124,11 +129,11 @@ func (this *QResource) UncompressedSize() int64 { return (int64)(C.QResource_UncompressedSize(this.h)) } -func (this *QResource) UncompressedData() *QByteArray { - _ret := C.QResource_UncompressedData(this.h) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QResource) UncompressedData() []byte { + var _bytearray C.struct_miqt_string = C.QResource_UncompressedData(this.h) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } func (this *QResource) LastModified() *QDateTime { @@ -139,19 +144,21 @@ func (this *QResource) LastModified() *QDateTime { } func QResource_AddSearchPath(path string) { - path_ms := libmiqt.Strdupg(path) - defer C.free(path_ms) - C.QResource_AddSearchPath((*C.struct_miqt_string)(path_ms)) + path_ms := C.struct_miqt_string{} + path_ms.data = C.CString(path) + path_ms.len = C.size_t(len(path)) + defer C.free(unsafe.Pointer(path_ms.data)) + C.QResource_AddSearchPath(path_ms) } func QResource_SearchPaths() []string { var _ma *C.struct_miqt_array = C.QResource_SearchPaths() _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -163,15 +170,19 @@ func (this *QResource) IsCompressed() bool { } func QResource_RegisterResource(rccFilename string) bool { - rccFilename_ms := libmiqt.Strdupg(rccFilename) - defer C.free(rccFilename_ms) - return (bool)(C.QResource_RegisterResource((*C.struct_miqt_string)(rccFilename_ms))) + rccFilename_ms := C.struct_miqt_string{} + rccFilename_ms.data = C.CString(rccFilename) + rccFilename_ms.len = C.size_t(len(rccFilename)) + defer C.free(unsafe.Pointer(rccFilename_ms.data)) + return (bool)(C.QResource_RegisterResource(rccFilename_ms)) } func QResource_UnregisterResource(rccFilename string) bool { - rccFilename_ms := libmiqt.Strdupg(rccFilename) - defer C.free(rccFilename_ms) - return (bool)(C.QResource_UnregisterResource((*C.struct_miqt_string)(rccFilename_ms))) + rccFilename_ms := C.struct_miqt_string{} + rccFilename_ms.data = C.CString(rccFilename) + rccFilename_ms.len = C.size_t(len(rccFilename)) + defer C.free(unsafe.Pointer(rccFilename_ms.data)) + return (bool)(C.QResource_UnregisterResource(rccFilename_ms)) } func QResource_RegisterResourceWithRccData(rccData *byte) bool { @@ -183,31 +194,43 @@ func QResource_UnregisterResourceWithRccData(rccData *byte) bool { } func QResource_RegisterResource2(rccFilename string, resourceRoot string) bool { - rccFilename_ms := libmiqt.Strdupg(rccFilename) - defer C.free(rccFilename_ms) - resourceRoot_ms := libmiqt.Strdupg(resourceRoot) - defer C.free(resourceRoot_ms) - return (bool)(C.QResource_RegisterResource2((*C.struct_miqt_string)(rccFilename_ms), (*C.struct_miqt_string)(resourceRoot_ms))) + rccFilename_ms := C.struct_miqt_string{} + rccFilename_ms.data = C.CString(rccFilename) + rccFilename_ms.len = C.size_t(len(rccFilename)) + defer C.free(unsafe.Pointer(rccFilename_ms.data)) + resourceRoot_ms := C.struct_miqt_string{} + resourceRoot_ms.data = C.CString(resourceRoot) + resourceRoot_ms.len = C.size_t(len(resourceRoot)) + defer C.free(unsafe.Pointer(resourceRoot_ms.data)) + return (bool)(C.QResource_RegisterResource2(rccFilename_ms, resourceRoot_ms)) } func QResource_UnregisterResource2(rccFilename string, resourceRoot string) bool { - rccFilename_ms := libmiqt.Strdupg(rccFilename) - defer C.free(rccFilename_ms) - resourceRoot_ms := libmiqt.Strdupg(resourceRoot) - defer C.free(resourceRoot_ms) - return (bool)(C.QResource_UnregisterResource2((*C.struct_miqt_string)(rccFilename_ms), (*C.struct_miqt_string)(resourceRoot_ms))) + rccFilename_ms := C.struct_miqt_string{} + rccFilename_ms.data = C.CString(rccFilename) + rccFilename_ms.len = C.size_t(len(rccFilename)) + defer C.free(unsafe.Pointer(rccFilename_ms.data)) + resourceRoot_ms := C.struct_miqt_string{} + resourceRoot_ms.data = C.CString(resourceRoot) + resourceRoot_ms.len = C.size_t(len(resourceRoot)) + defer C.free(unsafe.Pointer(resourceRoot_ms.data)) + return (bool)(C.QResource_UnregisterResource2(rccFilename_ms, resourceRoot_ms)) } func QResource_RegisterResource22(rccData *byte, resourceRoot string) bool { - resourceRoot_ms := libmiqt.Strdupg(resourceRoot) - defer C.free(resourceRoot_ms) - return (bool)(C.QResource_RegisterResource22((*C.uchar)(unsafe.Pointer(rccData)), (*C.struct_miqt_string)(resourceRoot_ms))) + resourceRoot_ms := C.struct_miqt_string{} + resourceRoot_ms.data = C.CString(resourceRoot) + resourceRoot_ms.len = C.size_t(len(resourceRoot)) + defer C.free(unsafe.Pointer(resourceRoot_ms.data)) + return (bool)(C.QResource_RegisterResource22((*C.uchar)(unsafe.Pointer(rccData)), resourceRoot_ms)) } func QResource_UnregisterResource22(rccData *byte, resourceRoot string) bool { - resourceRoot_ms := libmiqt.Strdupg(resourceRoot) - defer C.free(resourceRoot_ms) - return (bool)(C.QResource_UnregisterResource22((*C.uchar)(unsafe.Pointer(rccData)), (*C.struct_miqt_string)(resourceRoot_ms))) + resourceRoot_ms := C.struct_miqt_string{} + resourceRoot_ms.data = C.CString(resourceRoot) + resourceRoot_ms.len = C.size_t(len(resourceRoot)) + defer C.free(unsafe.Pointer(resourceRoot_ms.data)) + return (bool)(C.QResource_UnregisterResource22((*C.uchar)(unsafe.Pointer(rccData)), resourceRoot_ms)) } // Delete this object from C++ memory. diff --git a/qt/gen_qresource.h b/qt/gen_qresource.h index 9139ff0a..22582bb0 100644 --- a/qt/gen_qresource.h +++ b/qt/gen_qresource.h @@ -26,11 +26,11 @@ typedef struct QResource QResource; #endif QResource* QResource_new(); -QResource* QResource_new2(struct miqt_string* file); -QResource* QResource_new3(struct miqt_string* file, QLocale* locale); -void QResource_SetFileName(QResource* self, struct miqt_string* file); -struct miqt_string* QResource_FileName(const QResource* self); -struct miqt_string* QResource_AbsoluteFilePath(const QResource* self); +QResource* QResource_new2(struct miqt_string file); +QResource* QResource_new3(struct miqt_string file, QLocale* locale); +void QResource_SetFileName(QResource* self, struct miqt_string file); +struct miqt_string QResource_FileName(const QResource* self); +struct miqt_string QResource_AbsoluteFilePath(const QResource* self); void QResource_SetLocale(QResource* self, QLocale* locale); QLocale* QResource_Locale(const QResource* self); bool QResource_IsValid(const QResource* self); @@ -38,19 +38,19 @@ int QResource_CompressionAlgorithm(const QResource* self); long long QResource_Size(const QResource* self); const unsigned char* QResource_Data(const QResource* self); long long QResource_UncompressedSize(const QResource* self); -QByteArray* QResource_UncompressedData(const QResource* self); +struct miqt_string QResource_UncompressedData(const QResource* self); QDateTime* QResource_LastModified(const QResource* self); -void QResource_AddSearchPath(struct miqt_string* path); +void QResource_AddSearchPath(struct miqt_string path); struct miqt_array* QResource_SearchPaths(); bool QResource_IsCompressed(const QResource* self); -bool QResource_RegisterResource(struct miqt_string* rccFilename); -bool QResource_UnregisterResource(struct miqt_string* rccFilename); +bool QResource_RegisterResource(struct miqt_string rccFilename); +bool QResource_UnregisterResource(struct miqt_string rccFilename); bool QResource_RegisterResourceWithRccData(const unsigned char* rccData); bool QResource_UnregisterResourceWithRccData(const unsigned char* rccData); -bool QResource_RegisterResource2(struct miqt_string* rccFilename, struct miqt_string* resourceRoot); -bool QResource_UnregisterResource2(struct miqt_string* rccFilename, struct miqt_string* resourceRoot); -bool QResource_RegisterResource22(const unsigned char* rccData, struct miqt_string* resourceRoot); -bool QResource_UnregisterResource22(const unsigned char* rccData, struct miqt_string* resourceRoot); +bool QResource_RegisterResource2(struct miqt_string rccFilename, struct miqt_string resourceRoot); +bool QResource_UnregisterResource2(struct miqt_string rccFilename, struct miqt_string resourceRoot); +bool QResource_RegisterResource22(const unsigned char* rccData, struct miqt_string resourceRoot); +bool QResource_UnregisterResource22(const unsigned char* rccData, struct miqt_string resourceRoot); void QResource_Delete(QResource* self); #ifdef __cplusplus diff --git a/qt/gen_qrubberband.cpp b/qt/gen_qrubberband.cpp index 8ac1c1df..e2f418cc 100644 --- a/qt/gen_qrubberband.cpp +++ b/qt/gen_qrubberband.cpp @@ -27,18 +27,26 @@ void* QRubberBand_Metacast(QRubberBand* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QRubberBand_Tr(const char* s) { +struct miqt_string QRubberBand_Tr(const char* s) { QString _ret = QRubberBand::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QRubberBand_TrUtf8(const char* s) { +struct miqt_string QRubberBand_TrUtf8(const char* s) { QString _ret = QRubberBand::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QRubberBand_Shape(const QRubberBand* self) { @@ -70,32 +78,48 @@ void QRubberBand_ResizeWithQSize(QRubberBand* self, QSize* s) { self->resize(*s); } -struct miqt_string* QRubberBand_Tr2(const char* s, const char* c) { +struct miqt_string QRubberBand_Tr2(const char* s, const char* c) { QString _ret = QRubberBand::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QRubberBand_Tr3(const char* s, const char* c, int n) { +struct miqt_string QRubberBand_Tr3(const char* s, const char* c, int n) { QString _ret = QRubberBand::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QRubberBand_TrUtf82(const char* s, const char* c) { +struct miqt_string QRubberBand_TrUtf82(const char* s, const char* c) { QString _ret = QRubberBand::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QRubberBand_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QRubberBand_TrUtf83(const char* s, const char* c, int n) { QString _ret = QRubberBand::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QRubberBand_Delete(QRubberBand* self) { diff --git a/qt/gen_qrubberband.go b/qt/gen_qrubberband.go index 32010901..2c91403e 100644 --- a/qt/gen_qrubberband.go +++ b/qt/gen_qrubberband.go @@ -69,24 +69,24 @@ func (this *QRubberBand) MetaObject() *QMetaObject { func (this *QRubberBand) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QRubberBand_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QRubberBand_Metacast(this.h, param1_Cstring)) } func QRubberBand_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QRubberBand_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QRubberBand_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QRubberBand_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QRubberBand_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QRubberBand_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -123,9 +123,9 @@ func QRubberBand_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QRubberBand_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QRubberBand_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -134,9 +134,9 @@ func QRubberBand_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QRubberBand_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QRubberBand_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -145,9 +145,9 @@ func QRubberBand_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QRubberBand_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QRubberBand_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -156,9 +156,9 @@ func QRubberBand_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QRubberBand_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QRubberBand_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qrubberband.h b/qt/gen_qrubberband.h index 463c3f3b..96364691 100644 --- a/qt/gen_qrubberband.h +++ b/qt/gen_qrubberband.h @@ -33,8 +33,8 @@ QRubberBand* QRubberBand_new(int param1); QRubberBand* QRubberBand_new2(int param1, QWidget* param2); QMetaObject* QRubberBand_MetaObject(const QRubberBand* self); void* QRubberBand_Metacast(QRubberBand* self, const char* param1); -struct miqt_string* QRubberBand_Tr(const char* s); -struct miqt_string* QRubberBand_TrUtf8(const char* s); +struct miqt_string QRubberBand_Tr(const char* s); +struct miqt_string QRubberBand_TrUtf8(const char* s); int QRubberBand_Shape(const QRubberBand* self); void QRubberBand_SetGeometry(QRubberBand* self, QRect* r); void QRubberBand_SetGeometry2(QRubberBand* self, int x, int y, int w, int h); @@ -42,10 +42,10 @@ void QRubberBand_Move(QRubberBand* self, int x, int y); void QRubberBand_MoveWithQPoint(QRubberBand* self, QPoint* p); void QRubberBand_Resize(QRubberBand* self, int w, int h); void QRubberBand_ResizeWithQSize(QRubberBand* self, QSize* s); -struct miqt_string* QRubberBand_Tr2(const char* s, const char* c); -struct miqt_string* QRubberBand_Tr3(const char* s, const char* c, int n); -struct miqt_string* QRubberBand_TrUtf82(const char* s, const char* c); -struct miqt_string* QRubberBand_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QRubberBand_Tr2(const char* s, const char* c); +struct miqt_string QRubberBand_Tr3(const char* s, const char* c, int n); +struct miqt_string QRubberBand_TrUtf82(const char* s, const char* c); +struct miqt_string QRubberBand_TrUtf83(const char* s, const char* c, int n); void QRubberBand_Delete(QRubberBand* self); #ifdef __cplusplus diff --git a/qt/gen_qsavefile.cpp b/qt/gen_qsavefile.cpp index a0264506..2aeea087 100644 --- a/qt/gen_qsavefile.cpp +++ b/qt/gen_qsavefile.cpp @@ -8,8 +8,8 @@ #include "gen_qsavefile.h" #include "_cgo_export.h" -QSaveFile* QSaveFile_new(struct miqt_string* name) { - QString name_QString = QString::fromUtf8(&name->data, name->len); +QSaveFile* QSaveFile_new(struct miqt_string name) { + QString name_QString = QString::fromUtf8(name.data, name.len); return new QSaveFile(name_QString); } @@ -17,8 +17,8 @@ QSaveFile* QSaveFile_new2() { return new QSaveFile(); } -QSaveFile* QSaveFile_new3(struct miqt_string* name, QObject* parent) { - QString name_QString = QString::fromUtf8(&name->data, name->len); +QSaveFile* QSaveFile_new3(struct miqt_string name, QObject* parent) { + QString name_QString = QString::fromUtf8(name.data, name.len); return new QSaveFile(name_QString, parent); } @@ -34,29 +34,41 @@ void* QSaveFile_Metacast(QSaveFile* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QSaveFile_Tr(const char* s) { +struct miqt_string QSaveFile_Tr(const char* s) { QString _ret = QSaveFile::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSaveFile_TrUtf8(const char* s) { +struct miqt_string QSaveFile_TrUtf8(const char* s) { QString _ret = QSaveFile::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSaveFile_FileName(const QSaveFile* self) { +struct miqt_string QSaveFile_FileName(const QSaveFile* self) { QString _ret = self->fileName(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QSaveFile_SetFileName(QSaveFile* self, struct miqt_string* name) { - QString name_QString = QString::fromUtf8(&name->data, name->len); +void QSaveFile_SetFileName(QSaveFile* self, struct miqt_string name) { + QString name_QString = QString::fromUtf8(name.data, name.len); self->setFileName(name_QString); } @@ -80,32 +92,48 @@ bool QSaveFile_DirectWriteFallback(const QSaveFile* self) { return self->directWriteFallback(); } -struct miqt_string* QSaveFile_Tr2(const char* s, const char* c) { +struct miqt_string QSaveFile_Tr2(const char* s, const char* c) { QString _ret = QSaveFile::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSaveFile_Tr3(const char* s, const char* c, int n) { +struct miqt_string QSaveFile_Tr3(const char* s, const char* c, int n) { QString _ret = QSaveFile::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSaveFile_TrUtf82(const char* s, const char* c) { +struct miqt_string QSaveFile_TrUtf82(const char* s, const char* c) { QString _ret = QSaveFile::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSaveFile_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QSaveFile_TrUtf83(const char* s, const char* c, int n) { QString _ret = QSaveFile::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QSaveFile_Delete(QSaveFile* self) { diff --git a/qt/gen_qsavefile.go b/qt/gen_qsavefile.go index dda08998..eda36cef 100644 --- a/qt/gen_qsavefile.go +++ b/qt/gen_qsavefile.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -46,9 +45,11 @@ func UnsafeNewQSaveFile(h unsafe.Pointer) *QSaveFile { // NewQSaveFile constructs a new QSaveFile object. func NewQSaveFile(name string) *QSaveFile { - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - ret := C.QSaveFile_new((*C.struct_miqt_string)(name_ms)) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + ret := C.QSaveFile_new(name_ms) return newQSaveFile(ret) } @@ -60,9 +61,11 @@ func NewQSaveFile2() *QSaveFile { // NewQSaveFile3 constructs a new QSaveFile object. func NewQSaveFile3(name string, parent *QObject) *QSaveFile { - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - ret := C.QSaveFile_new3((*C.struct_miqt_string)(name_ms), parent.cPointer()) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + ret := C.QSaveFile_new3(name_ms, parent.cPointer()) return newQSaveFile(ret) } @@ -79,38 +82,40 @@ func (this *QSaveFile) MetaObject() *QMetaObject { func (this *QSaveFile) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QSaveFile_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QSaveFile_Metacast(this.h, param1_Cstring)) } func QSaveFile_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QSaveFile_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSaveFile_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QSaveFile_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QSaveFile_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSaveFile_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QSaveFile) FileName() string { - var _ms *C.struct_miqt_string = C.QSaveFile_FileName(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSaveFile_FileName(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QSaveFile) SetFileName(name string) { - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - C.QSaveFile_SetFileName(this.h, (*C.struct_miqt_string)(name_ms)) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + C.QSaveFile_SetFileName(this.h, name_ms) } func (this *QSaveFile) Open(flags QIODevice__OpenModeFlag) bool { @@ -138,9 +143,9 @@ func QSaveFile_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSaveFile_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSaveFile_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -149,9 +154,9 @@ func QSaveFile_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSaveFile_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSaveFile_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -160,9 +165,9 @@ func QSaveFile_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSaveFile_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSaveFile_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -171,9 +176,9 @@ func QSaveFile_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSaveFile_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSaveFile_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qsavefile.h b/qt/gen_qsavefile.h index 481bd88a..0d53dc9b 100644 --- a/qt/gen_qsavefile.h +++ b/qt/gen_qsavefile.h @@ -23,25 +23,25 @@ typedef struct QObject QObject; typedef struct QSaveFile QSaveFile; #endif -QSaveFile* QSaveFile_new(struct miqt_string* name); +QSaveFile* QSaveFile_new(struct miqt_string name); QSaveFile* QSaveFile_new2(); -QSaveFile* QSaveFile_new3(struct miqt_string* name, QObject* parent); +QSaveFile* QSaveFile_new3(struct miqt_string name, QObject* parent); QSaveFile* QSaveFile_new4(QObject* parent); QMetaObject* QSaveFile_MetaObject(const QSaveFile* self); void* QSaveFile_Metacast(QSaveFile* self, const char* param1); -struct miqt_string* QSaveFile_Tr(const char* s); -struct miqt_string* QSaveFile_TrUtf8(const char* s); -struct miqt_string* QSaveFile_FileName(const QSaveFile* self); -void QSaveFile_SetFileName(QSaveFile* self, struct miqt_string* name); +struct miqt_string QSaveFile_Tr(const char* s); +struct miqt_string QSaveFile_TrUtf8(const char* s); +struct miqt_string QSaveFile_FileName(const QSaveFile* self); +void QSaveFile_SetFileName(QSaveFile* self, struct miqt_string name); bool QSaveFile_Open(QSaveFile* self, int flags); bool QSaveFile_Commit(QSaveFile* self); void QSaveFile_CancelWriting(QSaveFile* self); void QSaveFile_SetDirectWriteFallback(QSaveFile* self, bool enabled); bool QSaveFile_DirectWriteFallback(const QSaveFile* self); -struct miqt_string* QSaveFile_Tr2(const char* s, const char* c); -struct miqt_string* QSaveFile_Tr3(const char* s, const char* c, int n); -struct miqt_string* QSaveFile_TrUtf82(const char* s, const char* c); -struct miqt_string* QSaveFile_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QSaveFile_Tr2(const char* s, const char* c); +struct miqt_string QSaveFile_Tr3(const char* s, const char* c, int n); +struct miqt_string QSaveFile_TrUtf82(const char* s, const char* c); +struct miqt_string QSaveFile_TrUtf83(const char* s, const char* c, int n); void QSaveFile_Delete(QSaveFile* self); #ifdef __cplusplus diff --git a/qt/gen_qscreen.cpp b/qt/gen_qscreen.cpp index 2b08f727..ce065ec7 100644 --- a/qt/gen_qscreen.cpp +++ b/qt/gen_qscreen.cpp @@ -22,46 +22,70 @@ void* QScreen_Metacast(QScreen* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QScreen_Tr(const char* s) { +struct miqt_string QScreen_Tr(const char* s) { QString _ret = QScreen::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QScreen_TrUtf8(const char* s) { +struct miqt_string QScreen_TrUtf8(const char* s) { QString _ret = QScreen::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QScreen_Name(const QScreen* self) { +struct miqt_string QScreen_Name(const QScreen* self) { QString _ret = self->name(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QScreen_Manufacturer(const QScreen* self) { +struct miqt_string QScreen_Manufacturer(const QScreen* self) { QString _ret = self->manufacturer(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QScreen_Model(const QScreen* self) { +struct miqt_string QScreen_Model(const QScreen* self) { QString _ret = self->model(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QScreen_SerialNumber(const QScreen* self) { +struct miqt_string QScreen_SerialNumber(const QScreen* self) { QString _ret = self->serialNumber(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QScreen_Depth(const QScreen* self) { @@ -321,32 +345,48 @@ void QScreen_connect_RefreshRateChanged(QScreen* self, intptr_t slot) { }); } -struct miqt_string* QScreen_Tr2(const char* s, const char* c) { +struct miqt_string QScreen_Tr2(const char* s, const char* c) { QString _ret = QScreen::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QScreen_Tr3(const char* s, const char* c, int n) { +struct miqt_string QScreen_Tr3(const char* s, const char* c, int n) { QString _ret = QScreen::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QScreen_TrUtf82(const char* s, const char* c) { +struct miqt_string QScreen_TrUtf82(const char* s, const char* c) { QString _ret = QScreen::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QScreen_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QScreen_TrUtf83(const char* s, const char* c, int n) { QString _ret = QScreen::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QPixmap* QScreen_GrabWindow2(QScreen* self, uintptr_t window, int x) { diff --git a/qt/gen_qscreen.go b/qt/gen_qscreen.go index 92cf46b7..0d15dc04 100644 --- a/qt/gen_qscreen.go +++ b/qt/gen_qscreen.go @@ -51,52 +51,52 @@ func (this *QScreen) MetaObject() *QMetaObject { func (this *QScreen) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QScreen_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QScreen_Metacast(this.h, param1_Cstring)) } func QScreen_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QScreen_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QScreen_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QScreen_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QScreen_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QScreen_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QScreen) Name() string { - var _ms *C.struct_miqt_string = C.QScreen_Name(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QScreen_Name(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QScreen) Manufacturer() string { - var _ms *C.struct_miqt_string = C.QScreen_Manufacturer(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QScreen_Manufacturer(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QScreen) Model() string { - var _ms *C.struct_miqt_string = C.QScreen_Model(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QScreen_Model(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QScreen) SerialNumber() string { - var _ms *C.struct_miqt_string = C.QScreen_SerialNumber(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QScreen_SerialNumber(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -452,9 +452,9 @@ func QScreen_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QScreen_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QScreen_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -463,9 +463,9 @@ func QScreen_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QScreen_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QScreen_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -474,9 +474,9 @@ func QScreen_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QScreen_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QScreen_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -485,9 +485,9 @@ func QScreen_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QScreen_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QScreen_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qscreen.h b/qt/gen_qscreen.h index 0f3d67ee..96846c69 100644 --- a/qt/gen_qscreen.h +++ b/qt/gen_qscreen.h @@ -35,12 +35,12 @@ typedef struct QTransform QTransform; QMetaObject* QScreen_MetaObject(const QScreen* self); void* QScreen_Metacast(QScreen* self, const char* param1); -struct miqt_string* QScreen_Tr(const char* s); -struct miqt_string* QScreen_TrUtf8(const char* s); -struct miqt_string* QScreen_Name(const QScreen* self); -struct miqt_string* QScreen_Manufacturer(const QScreen* self); -struct miqt_string* QScreen_Model(const QScreen* self); -struct miqt_string* QScreen_SerialNumber(const QScreen* self); +struct miqt_string QScreen_Tr(const char* s); +struct miqt_string QScreen_TrUtf8(const char* s); +struct miqt_string QScreen_Name(const QScreen* self); +struct miqt_string QScreen_Manufacturer(const QScreen* self); +struct miqt_string QScreen_Model(const QScreen* self); +struct miqt_string QScreen_SerialNumber(const QScreen* self); int QScreen_Depth(const QScreen* self); QSize* QScreen_Size(const QScreen* self); QRect* QScreen_Geometry(const QScreen* self); @@ -90,10 +90,10 @@ void QScreen_OrientationChanged(QScreen* self, int orientation); void QScreen_connect_OrientationChanged(QScreen* self, intptr_t slot); void QScreen_RefreshRateChanged(QScreen* self, double refreshRate); void QScreen_connect_RefreshRateChanged(QScreen* self, intptr_t slot); -struct miqt_string* QScreen_Tr2(const char* s, const char* c); -struct miqt_string* QScreen_Tr3(const char* s, const char* c, int n); -struct miqt_string* QScreen_TrUtf82(const char* s, const char* c); -struct miqt_string* QScreen_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QScreen_Tr2(const char* s, const char* c); +struct miqt_string QScreen_Tr3(const char* s, const char* c, int n); +struct miqt_string QScreen_TrUtf82(const char* s, const char* c); +struct miqt_string QScreen_TrUtf83(const char* s, const char* c, int n); QPixmap* QScreen_GrabWindow2(QScreen* self, uintptr_t window, int x); QPixmap* QScreen_GrabWindow3(QScreen* self, uintptr_t window, int x, int y); QPixmap* QScreen_GrabWindow4(QScreen* self, uintptr_t window, int x, int y, int w); diff --git a/qt/gen_qscrollarea.cpp b/qt/gen_qscrollarea.cpp index 72d14ac0..cf774468 100644 --- a/qt/gen_qscrollarea.cpp +++ b/qt/gen_qscrollarea.cpp @@ -25,18 +25,26 @@ void* QScrollArea_Metacast(QScrollArea* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QScrollArea_Tr(const char* s) { +struct miqt_string QScrollArea_Tr(const char* s) { QString _ret = QScrollArea::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QScrollArea_TrUtf8(const char* s) { +struct miqt_string QScrollArea_TrUtf8(const char* s) { QString _ret = QScrollArea::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QWidget* QScrollArea_Widget(const QScrollArea* self) { @@ -84,32 +92,48 @@ void QScrollArea_EnsureWidgetVisible(QScrollArea* self, QWidget* childWidget) { self->ensureWidgetVisible(childWidget); } -struct miqt_string* QScrollArea_Tr2(const char* s, const char* c) { +struct miqt_string QScrollArea_Tr2(const char* s, const char* c) { QString _ret = QScrollArea::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QScrollArea_Tr3(const char* s, const char* c, int n) { +struct miqt_string QScrollArea_Tr3(const char* s, const char* c, int n) { QString _ret = QScrollArea::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QScrollArea_TrUtf82(const char* s, const char* c) { +struct miqt_string QScrollArea_TrUtf82(const char* s, const char* c) { QString _ret = QScrollArea::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QScrollArea_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QScrollArea_TrUtf83(const char* s, const char* c, int n) { QString _ret = QScrollArea::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QScrollArea_EnsureVisible3(QScrollArea* self, int x, int y, int xmargin) { diff --git a/qt/gen_qscrollarea.go b/qt/gen_qscrollarea.go index ddf184b4..77309a8b 100644 --- a/qt/gen_qscrollarea.go +++ b/qt/gen_qscrollarea.go @@ -62,24 +62,24 @@ func (this *QScrollArea) MetaObject() *QMetaObject { func (this *QScrollArea) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QScrollArea_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QScrollArea_Metacast(this.h, param1_Cstring)) } func QScrollArea_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QScrollArea_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QScrollArea_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QScrollArea_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QScrollArea_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QScrollArea_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -135,9 +135,9 @@ func QScrollArea_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QScrollArea_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QScrollArea_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -146,9 +146,9 @@ func QScrollArea_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QScrollArea_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QScrollArea_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -157,9 +157,9 @@ func QScrollArea_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QScrollArea_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QScrollArea_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -168,9 +168,9 @@ func QScrollArea_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QScrollArea_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QScrollArea_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qscrollarea.h b/qt/gen_qscrollarea.h index 2e814c2b..ab884154 100644 --- a/qt/gen_qscrollarea.h +++ b/qt/gen_qscrollarea.h @@ -29,8 +29,8 @@ QScrollArea* QScrollArea_new(); QScrollArea* QScrollArea_new2(QWidget* parent); QMetaObject* QScrollArea_MetaObject(const QScrollArea* self); void* QScrollArea_Metacast(QScrollArea* self, const char* param1); -struct miqt_string* QScrollArea_Tr(const char* s); -struct miqt_string* QScrollArea_TrUtf8(const char* s); +struct miqt_string QScrollArea_Tr(const char* s); +struct miqt_string QScrollArea_TrUtf8(const char* s); QWidget* QScrollArea_Widget(const QScrollArea* self); void QScrollArea_SetWidget(QScrollArea* self, QWidget* widget); QWidget* QScrollArea_TakeWidget(QScrollArea* self); @@ -42,10 +42,10 @@ int QScrollArea_Alignment(const QScrollArea* self); void QScrollArea_SetAlignment(QScrollArea* self, int alignment); void QScrollArea_EnsureVisible(QScrollArea* self, int x, int y); void QScrollArea_EnsureWidgetVisible(QScrollArea* self, QWidget* childWidget); -struct miqt_string* QScrollArea_Tr2(const char* s, const char* c); -struct miqt_string* QScrollArea_Tr3(const char* s, const char* c, int n); -struct miqt_string* QScrollArea_TrUtf82(const char* s, const char* c); -struct miqt_string* QScrollArea_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QScrollArea_Tr2(const char* s, const char* c); +struct miqt_string QScrollArea_Tr3(const char* s, const char* c, int n); +struct miqt_string QScrollArea_TrUtf82(const char* s, const char* c); +struct miqt_string QScrollArea_TrUtf83(const char* s, const char* c, int n); void QScrollArea_EnsureVisible3(QScrollArea* self, int x, int y, int xmargin); void QScrollArea_EnsureVisible4(QScrollArea* self, int x, int y, int xmargin, int ymargin); void QScrollArea_EnsureWidgetVisible2(QScrollArea* self, QWidget* childWidget, int xmargin); diff --git a/qt/gen_qscrollbar.cpp b/qt/gen_qscrollbar.cpp index 27ebaced..5886be66 100644 --- a/qt/gen_qscrollbar.cpp +++ b/qt/gen_qscrollbar.cpp @@ -34,18 +34,26 @@ void* QScrollBar_Metacast(QScrollBar* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QScrollBar_Tr(const char* s) { +struct miqt_string QScrollBar_Tr(const char* s) { QString _ret = QScrollBar::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QScrollBar_TrUtf8(const char* s) { +struct miqt_string QScrollBar_TrUtf8(const char* s) { QString _ret = QScrollBar::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QSize* QScrollBar_SizeHint(const QScrollBar* self) { @@ -56,32 +64,48 @@ bool QScrollBar_Event(QScrollBar* self, QEvent* event) { return self->event(event); } -struct miqt_string* QScrollBar_Tr2(const char* s, const char* c) { +struct miqt_string QScrollBar_Tr2(const char* s, const char* c) { QString _ret = QScrollBar::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QScrollBar_Tr3(const char* s, const char* c, int n) { +struct miqt_string QScrollBar_Tr3(const char* s, const char* c, int n) { QString _ret = QScrollBar::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QScrollBar_TrUtf82(const char* s, const char* c) { +struct miqt_string QScrollBar_TrUtf82(const char* s, const char* c) { QString _ret = QScrollBar::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QScrollBar_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QScrollBar_TrUtf83(const char* s, const char* c, int n) { QString _ret = QScrollBar::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QScrollBar_Delete(QScrollBar* self) { diff --git a/qt/gen_qscrollbar.go b/qt/gen_qscrollbar.go index fae93495..fa27cc23 100644 --- a/qt/gen_qscrollbar.go +++ b/qt/gen_qscrollbar.go @@ -74,24 +74,24 @@ func (this *QScrollBar) MetaObject() *QMetaObject { func (this *QScrollBar) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QScrollBar_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QScrollBar_Metacast(this.h, param1_Cstring)) } func QScrollBar_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QScrollBar_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QScrollBar_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QScrollBar_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QScrollBar_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QScrollBar_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -111,9 +111,9 @@ func QScrollBar_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QScrollBar_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QScrollBar_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -122,9 +122,9 @@ func QScrollBar_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QScrollBar_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QScrollBar_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -133,9 +133,9 @@ func QScrollBar_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QScrollBar_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QScrollBar_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -144,9 +144,9 @@ func QScrollBar_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QScrollBar_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QScrollBar_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qscrollbar.h b/qt/gen_qscrollbar.h index 475d0722..24ac5e05 100644 --- a/qt/gen_qscrollbar.h +++ b/qt/gen_qscrollbar.h @@ -33,14 +33,14 @@ QScrollBar* QScrollBar_new3(QWidget* parent); QScrollBar* QScrollBar_new4(int param1, QWidget* parent); QMetaObject* QScrollBar_MetaObject(const QScrollBar* self); void* QScrollBar_Metacast(QScrollBar* self, const char* param1); -struct miqt_string* QScrollBar_Tr(const char* s); -struct miqt_string* QScrollBar_TrUtf8(const char* s); +struct miqt_string QScrollBar_Tr(const char* s); +struct miqt_string QScrollBar_TrUtf8(const char* s); QSize* QScrollBar_SizeHint(const QScrollBar* self); bool QScrollBar_Event(QScrollBar* self, QEvent* event); -struct miqt_string* QScrollBar_Tr2(const char* s, const char* c); -struct miqt_string* QScrollBar_Tr3(const char* s, const char* c, int n); -struct miqt_string* QScrollBar_TrUtf82(const char* s, const char* c); -struct miqt_string* QScrollBar_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QScrollBar_Tr2(const char* s, const char* c); +struct miqt_string QScrollBar_Tr3(const char* s, const char* c, int n); +struct miqt_string QScrollBar_TrUtf82(const char* s, const char* c); +struct miqt_string QScrollBar_TrUtf83(const char* s, const char* c, int n); void QScrollBar_Delete(QScrollBar* self); #ifdef __cplusplus diff --git a/qt/gen_qscroller.cpp b/qt/gen_qscroller.cpp index 848861d9..82fbdc3a 100644 --- a/qt/gen_qscroller.cpp +++ b/qt/gen_qscroller.cpp @@ -20,18 +20,26 @@ void* QScroller_Metacast(QScroller* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QScroller_Tr(const char* s) { +struct miqt_string QScroller_Tr(const char* s) { QString _ret = QScroller::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QScroller_TrUtf8(const char* s) { +struct miqt_string QScroller_TrUtf8(const char* s) { QString _ret = QScroller::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } bool QScroller_HasScroller(QObject* target) { @@ -183,32 +191,48 @@ void QScroller_connect_ScrollerPropertiesChanged(QScroller* self, intptr_t slot) }); } -struct miqt_string* QScroller_Tr2(const char* s, const char* c) { +struct miqt_string QScroller_Tr2(const char* s, const char* c) { QString _ret = QScroller::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QScroller_Tr3(const char* s, const char* c, int n) { +struct miqt_string QScroller_Tr3(const char* s, const char* c, int n) { QString _ret = QScroller::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QScroller_TrUtf82(const char* s, const char* c) { +struct miqt_string QScroller_TrUtf82(const char* s, const char* c) { QString _ret = QScroller::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QScroller_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QScroller_TrUtf83(const char* s, const char* c, int n) { QString _ret = QScroller::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QScroller_GrabGesture2(QObject* target, int gestureType) { diff --git a/qt/gen_qscroller.go b/qt/gen_qscroller.go index 4c235cf3..d7fee1e7 100644 --- a/qt/gen_qscroller.go +++ b/qt/gen_qscroller.go @@ -77,24 +77,24 @@ func (this *QScroller) MetaObject() *QMetaObject { func (this *QScroller) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QScroller_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QScroller_Metacast(this.h, param1_Cstring)) } func QScroller_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QScroller_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QScroller_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QScroller_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QScroller_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QScroller_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -278,9 +278,9 @@ func QScroller_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QScroller_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QScroller_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -289,9 +289,9 @@ func QScroller_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QScroller_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QScroller_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -300,9 +300,9 @@ func QScroller_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QScroller_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QScroller_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -311,9 +311,9 @@ func QScroller_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QScroller_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QScroller_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qscroller.h b/qt/gen_qscroller.h index 12c0c515..82eb523f 100644 --- a/qt/gen_qscroller.h +++ b/qt/gen_qscroller.h @@ -31,8 +31,8 @@ typedef struct QScrollerProperties QScrollerProperties; QMetaObject* QScroller_MetaObject(const QScroller* self); void* QScroller_Metacast(QScroller* self, const char* param1); -struct miqt_string* QScroller_Tr(const char* s); -struct miqt_string* QScroller_TrUtf8(const char* s); +struct miqt_string QScroller_Tr(const char* s); +struct miqt_string QScroller_TrUtf8(const char* s); bool QScroller_HasScroller(QObject* target); QScroller* QScroller_Scroller(QObject* target); QScroller* QScroller_ScrollerWithTarget(QObject* target); @@ -62,10 +62,10 @@ void QScroller_StateChanged(QScroller* self, int newstate); void QScroller_connect_StateChanged(QScroller* self, intptr_t slot); void QScroller_ScrollerPropertiesChanged(QScroller* self, QScrollerProperties* param1); void QScroller_connect_ScrollerPropertiesChanged(QScroller* self, intptr_t slot); -struct miqt_string* QScroller_Tr2(const char* s, const char* c); -struct miqt_string* QScroller_Tr3(const char* s, const char* c, int n); -struct miqt_string* QScroller_TrUtf82(const char* s, const char* c); -struct miqt_string* QScroller_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QScroller_Tr2(const char* s, const char* c); +struct miqt_string QScroller_Tr3(const char* s, const char* c, int n); +struct miqt_string QScroller_TrUtf82(const char* s, const char* c); +struct miqt_string QScroller_TrUtf83(const char* s, const char* c, int n); int QScroller_GrabGesture2(QObject* target, int gestureType); bool QScroller_HandleInput3(QScroller* self, int input, QPointF* position, long long timestamp); diff --git a/qt/gen_qsequentialanimationgroup.cpp b/qt/gen_qsequentialanimationgroup.cpp index bcdab3f1..a8c4df61 100644 --- a/qt/gen_qsequentialanimationgroup.cpp +++ b/qt/gen_qsequentialanimationgroup.cpp @@ -26,18 +26,26 @@ void* QSequentialAnimationGroup_Metacast(QSequentialAnimationGroup* self, const return self->qt_metacast(param1); } -struct miqt_string* QSequentialAnimationGroup_Tr(const char* s) { +struct miqt_string QSequentialAnimationGroup_Tr(const char* s) { QString _ret = QSequentialAnimationGroup::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSequentialAnimationGroup_TrUtf8(const char* s) { +struct miqt_string QSequentialAnimationGroup_TrUtf8(const char* s) { QString _ret = QSequentialAnimationGroup::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QPauseAnimation* QSequentialAnimationGroup_AddPause(QSequentialAnimationGroup* self, int msecs) { @@ -67,32 +75,48 @@ void QSequentialAnimationGroup_connect_CurrentAnimationChanged(QSequentialAnimat }); } -struct miqt_string* QSequentialAnimationGroup_Tr2(const char* s, const char* c) { +struct miqt_string QSequentialAnimationGroup_Tr2(const char* s, const char* c) { QString _ret = QSequentialAnimationGroup::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSequentialAnimationGroup_Tr3(const char* s, const char* c, int n) { +struct miqt_string QSequentialAnimationGroup_Tr3(const char* s, const char* c, int n) { QString _ret = QSequentialAnimationGroup::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSequentialAnimationGroup_TrUtf82(const char* s, const char* c) { +struct miqt_string QSequentialAnimationGroup_TrUtf82(const char* s, const char* c) { QString _ret = QSequentialAnimationGroup::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSequentialAnimationGroup_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QSequentialAnimationGroup_TrUtf83(const char* s, const char* c, int n) { QString _ret = QSequentialAnimationGroup::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QSequentialAnimationGroup_Delete(QSequentialAnimationGroup* self) { diff --git a/qt/gen_qsequentialanimationgroup.go b/qt/gen_qsequentialanimationgroup.go index 908ab7ae..81f9a64e 100644 --- a/qt/gen_qsequentialanimationgroup.go +++ b/qt/gen_qsequentialanimationgroup.go @@ -63,24 +63,24 @@ func (this *QSequentialAnimationGroup) MetaObject() *QMetaObject { func (this *QSequentialAnimationGroup) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QSequentialAnimationGroup_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QSequentialAnimationGroup_Metacast(this.h, param1_Cstring)) } func QSequentialAnimationGroup_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QSequentialAnimationGroup_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSequentialAnimationGroup_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QSequentialAnimationGroup_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QSequentialAnimationGroup_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSequentialAnimationGroup_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -125,9 +125,9 @@ func QSequentialAnimationGroup_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSequentialAnimationGroup_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSequentialAnimationGroup_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -136,9 +136,9 @@ func QSequentialAnimationGroup_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSequentialAnimationGroup_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSequentialAnimationGroup_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -147,9 +147,9 @@ func QSequentialAnimationGroup_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSequentialAnimationGroup_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSequentialAnimationGroup_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -158,9 +158,9 @@ func QSequentialAnimationGroup_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSequentialAnimationGroup_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSequentialAnimationGroup_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qsequentialanimationgroup.h b/qt/gen_qsequentialanimationgroup.h index cce2f476..512e318e 100644 --- a/qt/gen_qsequentialanimationgroup.h +++ b/qt/gen_qsequentialanimationgroup.h @@ -31,18 +31,18 @@ QSequentialAnimationGroup* QSequentialAnimationGroup_new(); QSequentialAnimationGroup* QSequentialAnimationGroup_new2(QObject* parent); QMetaObject* QSequentialAnimationGroup_MetaObject(const QSequentialAnimationGroup* self); void* QSequentialAnimationGroup_Metacast(QSequentialAnimationGroup* self, const char* param1); -struct miqt_string* QSequentialAnimationGroup_Tr(const char* s); -struct miqt_string* QSequentialAnimationGroup_TrUtf8(const char* s); +struct miqt_string QSequentialAnimationGroup_Tr(const char* s); +struct miqt_string QSequentialAnimationGroup_TrUtf8(const char* s); QPauseAnimation* QSequentialAnimationGroup_AddPause(QSequentialAnimationGroup* self, int msecs); QPauseAnimation* QSequentialAnimationGroup_InsertPause(QSequentialAnimationGroup* self, int index, int msecs); QAbstractAnimation* QSequentialAnimationGroup_CurrentAnimation(const QSequentialAnimationGroup* self); int QSequentialAnimationGroup_Duration(const QSequentialAnimationGroup* self); void QSequentialAnimationGroup_CurrentAnimationChanged(QSequentialAnimationGroup* self, QAbstractAnimation* current); void QSequentialAnimationGroup_connect_CurrentAnimationChanged(QSequentialAnimationGroup* self, intptr_t slot); -struct miqt_string* QSequentialAnimationGroup_Tr2(const char* s, const char* c); -struct miqt_string* QSequentialAnimationGroup_Tr3(const char* s, const char* c, int n); -struct miqt_string* QSequentialAnimationGroup_TrUtf82(const char* s, const char* c); -struct miqt_string* QSequentialAnimationGroup_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QSequentialAnimationGroup_Tr2(const char* s, const char* c); +struct miqt_string QSequentialAnimationGroup_Tr3(const char* s, const char* c, int n); +struct miqt_string QSequentialAnimationGroup_TrUtf82(const char* s, const char* c); +struct miqt_string QSequentialAnimationGroup_TrUtf83(const char* s, const char* c, int n); void QSequentialAnimationGroup_Delete(QSequentialAnimationGroup* self); #ifdef __cplusplus diff --git a/qt/gen_qsessionmanager.cpp b/qt/gen_qsessionmanager.cpp index 47d735f0..8b3c0ceb 100644 --- a/qt/gen_qsessionmanager.cpp +++ b/qt/gen_qsessionmanager.cpp @@ -16,32 +16,48 @@ void* QSessionManager_Metacast(QSessionManager* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QSessionManager_Tr(const char* s) { +struct miqt_string QSessionManager_Tr(const char* s) { QString _ret = QSessionManager::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSessionManager_TrUtf8(const char* s) { +struct miqt_string QSessionManager_TrUtf8(const char* s) { QString _ret = QSessionManager::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSessionManager_SessionId(const QSessionManager* self) { +struct miqt_string QSessionManager_SessionId(const QSessionManager* self) { QString _ret = self->sessionId(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSessionManager_SessionKey(const QSessionManager* self) { +struct miqt_string QSessionManager_SessionKey(const QSessionManager* self) { QString _ret = self->sessionKey(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } bool QSessionManager_AllowsInteraction(QSessionManager* self) { @@ -69,12 +85,12 @@ int QSessionManager_RestartHint(const QSessionManager* self) { return static_cast(_ret); } -void QSessionManager_SetRestartCommand(QSessionManager* self, struct miqt_array* /* of struct miqt_string* */ restartCommand) { +void QSessionManager_SetRestartCommand(QSessionManager* self, struct miqt_array* /* of struct miqt_string */ restartCommand) { QStringList restartCommand_QList; restartCommand_QList.reserve(restartCommand->len); - struct miqt_string** restartCommand_arr = static_cast(restartCommand->data); + struct miqt_string* restartCommand_arr = static_cast(restartCommand->data); for(size_t i = 0; i < restartCommand->len; ++i) { - QString restartCommand_arr_i_QString = QString::fromUtf8(&restartCommand_arr[i]->data, restartCommand_arr[i]->len); + QString restartCommand_arr_i_QString = QString::fromUtf8(restartCommand_arr[i].data, restartCommand_arr[i].len); restartCommand_QList.push_back(restartCommand_arr_i_QString); } self->setRestartCommand(restartCommand_QList); @@ -83,12 +99,16 @@ void QSessionManager_SetRestartCommand(QSessionManager* self, struct miqt_array* struct miqt_array* QSessionManager_RestartCommand(const QSessionManager* self) { QStringList _ret = self->restartCommand(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -96,12 +116,12 @@ struct miqt_array* QSessionManager_RestartCommand(const QSessionManager* self) { return _out; } -void QSessionManager_SetDiscardCommand(QSessionManager* self, struct miqt_array* /* of struct miqt_string* */ discardCommand) { +void QSessionManager_SetDiscardCommand(QSessionManager* self, struct miqt_array* /* of struct miqt_string */ discardCommand) { QStringList discardCommand_QList; discardCommand_QList.reserve(discardCommand->len); - struct miqt_string** discardCommand_arr = static_cast(discardCommand->data); + struct miqt_string* discardCommand_arr = static_cast(discardCommand->data); for(size_t i = 0; i < discardCommand->len; ++i) { - QString discardCommand_arr_i_QString = QString::fromUtf8(&discardCommand_arr[i]->data, discardCommand_arr[i]->len); + QString discardCommand_arr_i_QString = QString::fromUtf8(discardCommand_arr[i].data, discardCommand_arr[i].len); discardCommand_QList.push_back(discardCommand_arr_i_QString); } self->setDiscardCommand(discardCommand_QList); @@ -110,12 +130,16 @@ void QSessionManager_SetDiscardCommand(QSessionManager* self, struct miqt_array* struct miqt_array* QSessionManager_DiscardCommand(const QSessionManager* self) { QStringList _ret = self->discardCommand(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -123,19 +147,19 @@ struct miqt_array* QSessionManager_DiscardCommand(const QSessionManager* self) { return _out; } -void QSessionManager_SetManagerProperty(QSessionManager* self, struct miqt_string* name, struct miqt_string* value) { - QString name_QString = QString::fromUtf8(&name->data, name->len); - QString value_QString = QString::fromUtf8(&value->data, value->len); +void QSessionManager_SetManagerProperty(QSessionManager* self, struct miqt_string name, struct miqt_string value) { + QString name_QString = QString::fromUtf8(name.data, name.len); + QString value_QString = QString::fromUtf8(value.data, value.len); self->setManagerProperty(name_QString, value_QString); } -void QSessionManager_SetManagerProperty2(QSessionManager* self, struct miqt_string* name, struct miqt_array* /* of struct miqt_string* */ value) { - QString name_QString = QString::fromUtf8(&name->data, name->len); +void QSessionManager_SetManagerProperty2(QSessionManager* self, struct miqt_string name, struct miqt_array* /* of struct miqt_string */ value) { + QString name_QString = QString::fromUtf8(name.data, name.len); QStringList value_QList; value_QList.reserve(value->len); - struct miqt_string** value_arr = static_cast(value->data); + struct miqt_string* value_arr = static_cast(value->data); for(size_t i = 0; i < value->len; ++i) { - QString value_arr_i_QString = QString::fromUtf8(&value_arr[i]->data, value_arr[i]->len); + QString value_arr_i_QString = QString::fromUtf8(value_arr[i].data, value_arr[i].len); value_QList.push_back(value_arr_i_QString); } self->setManagerProperty(name_QString, value_QList); @@ -149,31 +173,47 @@ void QSessionManager_RequestPhase2(QSessionManager* self) { self->requestPhase2(); } -struct miqt_string* QSessionManager_Tr2(const char* s, const char* c) { +struct miqt_string QSessionManager_Tr2(const char* s, const char* c) { QString _ret = QSessionManager::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSessionManager_Tr3(const char* s, const char* c, int n) { +struct miqt_string QSessionManager_Tr3(const char* s, const char* c, int n) { QString _ret = QSessionManager::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSessionManager_TrUtf82(const char* s, const char* c) { +struct miqt_string QSessionManager_TrUtf82(const char* s, const char* c) { QString _ret = QSessionManager::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSessionManager_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QSessionManager_TrUtf83(const char* s, const char* c, int n) { QString _ret = QSessionManager::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } diff --git a/qt/gen_qsessionmanager.go b/qt/gen_qsessionmanager.go index 39dfb9f7..35e76325 100644 --- a/qt/gen_qsessionmanager.go +++ b/qt/gen_qsessionmanager.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -60,38 +59,38 @@ func (this *QSessionManager) MetaObject() *QMetaObject { func (this *QSessionManager) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QSessionManager_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QSessionManager_Metacast(this.h, param1_Cstring)) } func QSessionManager_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QSessionManager_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSessionManager_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QSessionManager_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QSessionManager_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSessionManager_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QSessionManager) SessionId() string { - var _ms *C.struct_miqt_string = C.QSessionManager_SessionId(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSessionManager_SessionId(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QSessionManager) SessionKey() string { - var _ms *C.struct_miqt_string = C.QSessionManager_SessionKey(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSessionManager_SessionKey(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -121,12 +120,14 @@ func (this *QSessionManager) RestartHint() QSessionManager__RestartHint { func (this *QSessionManager) SetRestartCommand(restartCommand []string) { // For the C ABI, malloc a C array of raw pointers - restartCommand_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(restartCommand)))) + restartCommand_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(restartCommand)))) defer C.free(unsafe.Pointer(restartCommand_CArray)) for i := range restartCommand { - restartCommand_i_ms := libmiqt.Strdupg(restartCommand[i]) - defer C.free(restartCommand_i_ms) - restartCommand_CArray[i] = (*C.struct_miqt_string)(restartCommand_i_ms) + restartCommand_i_ms := C.struct_miqt_string{} + restartCommand_i_ms.data = C.CString(restartCommand[i]) + restartCommand_i_ms.len = C.size_t(len(restartCommand[i])) + defer C.free(unsafe.Pointer(restartCommand_i_ms.data)) + restartCommand_CArray[i] = restartCommand_i_ms } restartCommand_ma := &C.struct_miqt_array{len: C.size_t(len(restartCommand)), data: unsafe.Pointer(restartCommand_CArray)} defer runtime.KeepAlive(unsafe.Pointer(restartCommand_ma)) @@ -136,11 +137,11 @@ func (this *QSessionManager) SetRestartCommand(restartCommand []string) { func (this *QSessionManager) RestartCommand() []string { var _ma *C.struct_miqt_array = C.QSessionManager_RestartCommand(this.h) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -149,12 +150,14 @@ func (this *QSessionManager) RestartCommand() []string { func (this *QSessionManager) SetDiscardCommand(discardCommand []string) { // For the C ABI, malloc a C array of raw pointers - discardCommand_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(discardCommand)))) + discardCommand_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(discardCommand)))) defer C.free(unsafe.Pointer(discardCommand_CArray)) for i := range discardCommand { - discardCommand_i_ms := libmiqt.Strdupg(discardCommand[i]) - defer C.free(discardCommand_i_ms) - discardCommand_CArray[i] = (*C.struct_miqt_string)(discardCommand_i_ms) + discardCommand_i_ms := C.struct_miqt_string{} + discardCommand_i_ms.data = C.CString(discardCommand[i]) + discardCommand_i_ms.len = C.size_t(len(discardCommand[i])) + defer C.free(unsafe.Pointer(discardCommand_i_ms.data)) + discardCommand_CArray[i] = discardCommand_i_ms } discardCommand_ma := &C.struct_miqt_array{len: C.size_t(len(discardCommand)), data: unsafe.Pointer(discardCommand_CArray)} defer runtime.KeepAlive(unsafe.Pointer(discardCommand_ma)) @@ -164,11 +167,11 @@ func (this *QSessionManager) SetDiscardCommand(discardCommand []string) { func (this *QSessionManager) DiscardCommand() []string { var _ma *C.struct_miqt_array = C.QSessionManager_DiscardCommand(this.h) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -176,27 +179,35 @@ func (this *QSessionManager) DiscardCommand() []string { } func (this *QSessionManager) SetManagerProperty(name string, value string) { - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - value_ms := libmiqt.Strdupg(value) - defer C.free(value_ms) - C.QSessionManager_SetManagerProperty(this.h, (*C.struct_miqt_string)(name_ms), (*C.struct_miqt_string)(value_ms)) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + value_ms := C.struct_miqt_string{} + value_ms.data = C.CString(value) + value_ms.len = C.size_t(len(value)) + defer C.free(unsafe.Pointer(value_ms.data)) + C.QSessionManager_SetManagerProperty(this.h, name_ms, value_ms) } func (this *QSessionManager) SetManagerProperty2(name string, value []string) { - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) // For the C ABI, malloc a C array of raw pointers - value_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(value)))) + value_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(value)))) defer C.free(unsafe.Pointer(value_CArray)) for i := range value { - value_i_ms := libmiqt.Strdupg(value[i]) - defer C.free(value_i_ms) - value_CArray[i] = (*C.struct_miqt_string)(value_i_ms) + value_i_ms := C.struct_miqt_string{} + value_i_ms.data = C.CString(value[i]) + value_i_ms.len = C.size_t(len(value[i])) + defer C.free(unsafe.Pointer(value_i_ms.data)) + value_CArray[i] = value_i_ms } value_ma := &C.struct_miqt_array{len: C.size_t(len(value)), data: unsafe.Pointer(value_CArray)} defer runtime.KeepAlive(unsafe.Pointer(value_ma)) - C.QSessionManager_SetManagerProperty2(this.h, (*C.struct_miqt_string)(name_ms), value_ma) + C.QSessionManager_SetManagerProperty2(this.h, name_ms, value_ma) } func (this *QSessionManager) IsPhase2() bool { @@ -212,9 +223,9 @@ func QSessionManager_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSessionManager_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSessionManager_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -223,9 +234,9 @@ func QSessionManager_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSessionManager_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSessionManager_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -234,9 +245,9 @@ func QSessionManager_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSessionManager_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSessionManager_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -245,8 +256,8 @@ func QSessionManager_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSessionManager_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSessionManager_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qsessionmanager.h b/qt/gen_qsessionmanager.h index f2283e5a..01fc3639 100644 --- a/qt/gen_qsessionmanager.h +++ b/qt/gen_qsessionmanager.h @@ -23,28 +23,28 @@ typedef struct QSessionManager QSessionManager; QMetaObject* QSessionManager_MetaObject(const QSessionManager* self); void* QSessionManager_Metacast(QSessionManager* self, const char* param1); -struct miqt_string* QSessionManager_Tr(const char* s); -struct miqt_string* QSessionManager_TrUtf8(const char* s); -struct miqt_string* QSessionManager_SessionId(const QSessionManager* self); -struct miqt_string* QSessionManager_SessionKey(const QSessionManager* self); +struct miqt_string QSessionManager_Tr(const char* s); +struct miqt_string QSessionManager_TrUtf8(const char* s); +struct miqt_string QSessionManager_SessionId(const QSessionManager* self); +struct miqt_string QSessionManager_SessionKey(const QSessionManager* self); bool QSessionManager_AllowsInteraction(QSessionManager* self); bool QSessionManager_AllowsErrorInteraction(QSessionManager* self); void QSessionManager_Release(QSessionManager* self); void QSessionManager_Cancel(QSessionManager* self); void QSessionManager_SetRestartHint(QSessionManager* self, int restartHint); int QSessionManager_RestartHint(const QSessionManager* self); -void QSessionManager_SetRestartCommand(QSessionManager* self, struct miqt_array* /* of struct miqt_string* */ restartCommand); +void QSessionManager_SetRestartCommand(QSessionManager* self, struct miqt_array* /* of struct miqt_string */ restartCommand); struct miqt_array* QSessionManager_RestartCommand(const QSessionManager* self); -void QSessionManager_SetDiscardCommand(QSessionManager* self, struct miqt_array* /* of struct miqt_string* */ discardCommand); +void QSessionManager_SetDiscardCommand(QSessionManager* self, struct miqt_array* /* of struct miqt_string */ discardCommand); struct miqt_array* QSessionManager_DiscardCommand(const QSessionManager* self); -void QSessionManager_SetManagerProperty(QSessionManager* self, struct miqt_string* name, struct miqt_string* value); -void QSessionManager_SetManagerProperty2(QSessionManager* self, struct miqt_string* name, struct miqt_array* /* of struct miqt_string* */ value); +void QSessionManager_SetManagerProperty(QSessionManager* self, struct miqt_string name, struct miqt_string value); +void QSessionManager_SetManagerProperty2(QSessionManager* self, struct miqt_string name, struct miqt_array* /* of struct miqt_string */ value); bool QSessionManager_IsPhase2(const QSessionManager* self); void QSessionManager_RequestPhase2(QSessionManager* self); -struct miqt_string* QSessionManager_Tr2(const char* s, const char* c); -struct miqt_string* QSessionManager_Tr3(const char* s, const char* c, int n); -struct miqt_string* QSessionManager_TrUtf82(const char* s, const char* c); -struct miqt_string* QSessionManager_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QSessionManager_Tr2(const char* s, const char* c); +struct miqt_string QSessionManager_Tr3(const char* s, const char* c, int n); +struct miqt_string QSessionManager_TrUtf82(const char* s, const char* c); +struct miqt_string QSessionManager_TrUtf83(const char* s, const char* c, int n); #ifdef __cplusplus } /* extern C */ diff --git a/qt/gen_qsettings.cpp b/qt/gen_qsettings.cpp index d61fd295..a84f45cf 100644 --- a/qt/gen_qsettings.cpp +++ b/qt/gen_qsettings.cpp @@ -11,23 +11,23 @@ #include "gen_qsettings.h" #include "_cgo_export.h" -QSettings* QSettings_new(struct miqt_string* organization) { - QString organization_QString = QString::fromUtf8(&organization->data, organization->len); +QSettings* QSettings_new(struct miqt_string organization) { + QString organization_QString = QString::fromUtf8(organization.data, organization.len); return new QSettings(organization_QString); } -QSettings* QSettings_new2(int scope, struct miqt_string* organization) { - QString organization_QString = QString::fromUtf8(&organization->data, organization->len); +QSettings* QSettings_new2(int scope, struct miqt_string organization) { + QString organization_QString = QString::fromUtf8(organization.data, organization.len); return new QSettings(static_cast(scope), organization_QString); } -QSettings* QSettings_new3(int format, int scope, struct miqt_string* organization) { - QString organization_QString = QString::fromUtf8(&organization->data, organization->len); +QSettings* QSettings_new3(int format, int scope, struct miqt_string organization) { + QString organization_QString = QString::fromUtf8(organization.data, organization.len); return new QSettings(static_cast(format), static_cast(scope), organization_QString); } -QSettings* QSettings_new4(struct miqt_string* fileName, int format) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +QSettings* QSettings_new4(struct miqt_string fileName, int format) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); return new QSettings(fileName_QString, static_cast(format)); } @@ -39,44 +39,44 @@ QSettings* QSettings_new6(int scope) { return new QSettings(static_cast(scope)); } -QSettings* QSettings_new7(struct miqt_string* organization, struct miqt_string* application) { - QString organization_QString = QString::fromUtf8(&organization->data, organization->len); - QString application_QString = QString::fromUtf8(&application->data, application->len); +QSettings* QSettings_new7(struct miqt_string organization, struct miqt_string application) { + QString organization_QString = QString::fromUtf8(organization.data, organization.len); + QString application_QString = QString::fromUtf8(application.data, application.len); return new QSettings(organization_QString, application_QString); } -QSettings* QSettings_new8(struct miqt_string* organization, struct miqt_string* application, QObject* parent) { - QString organization_QString = QString::fromUtf8(&organization->data, organization->len); - QString application_QString = QString::fromUtf8(&application->data, application->len); +QSettings* QSettings_new8(struct miqt_string organization, struct miqt_string application, QObject* parent) { + QString organization_QString = QString::fromUtf8(organization.data, organization.len); + QString application_QString = QString::fromUtf8(application.data, application.len); return new QSettings(organization_QString, application_QString, parent); } -QSettings* QSettings_new9(int scope, struct miqt_string* organization, struct miqt_string* application) { - QString organization_QString = QString::fromUtf8(&organization->data, organization->len); - QString application_QString = QString::fromUtf8(&application->data, application->len); +QSettings* QSettings_new9(int scope, struct miqt_string organization, struct miqt_string application) { + QString organization_QString = QString::fromUtf8(organization.data, organization.len); + QString application_QString = QString::fromUtf8(application.data, application.len); return new QSettings(static_cast(scope), organization_QString, application_QString); } -QSettings* QSettings_new10(int scope, struct miqt_string* organization, struct miqt_string* application, QObject* parent) { - QString organization_QString = QString::fromUtf8(&organization->data, organization->len); - QString application_QString = QString::fromUtf8(&application->data, application->len); +QSettings* QSettings_new10(int scope, struct miqt_string organization, struct miqt_string application, QObject* parent) { + QString organization_QString = QString::fromUtf8(organization.data, organization.len); + QString application_QString = QString::fromUtf8(application.data, application.len); return new QSettings(static_cast(scope), organization_QString, application_QString, parent); } -QSettings* QSettings_new11(int format, int scope, struct miqt_string* organization, struct miqt_string* application) { - QString organization_QString = QString::fromUtf8(&organization->data, organization->len); - QString application_QString = QString::fromUtf8(&application->data, application->len); +QSettings* QSettings_new11(int format, int scope, struct miqt_string organization, struct miqt_string application) { + QString organization_QString = QString::fromUtf8(organization.data, organization.len); + QString application_QString = QString::fromUtf8(application.data, application.len); return new QSettings(static_cast(format), static_cast(scope), organization_QString, application_QString); } -QSettings* QSettings_new12(int format, int scope, struct miqt_string* organization, struct miqt_string* application, QObject* parent) { - QString organization_QString = QString::fromUtf8(&organization->data, organization->len); - QString application_QString = QString::fromUtf8(&application->data, application->len); +QSettings* QSettings_new12(int format, int scope, struct miqt_string organization, struct miqt_string application, QObject* parent) { + QString organization_QString = QString::fromUtf8(organization.data, organization.len); + QString application_QString = QString::fromUtf8(application.data, application.len); return new QSettings(static_cast(format), static_cast(scope), organization_QString, application_QString, parent); } -QSettings* QSettings_new13(struct miqt_string* fileName, int format, QObject* parent) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +QSettings* QSettings_new13(struct miqt_string fileName, int format, QObject* parent) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); return new QSettings(fileName_QString, static_cast(format), parent); } @@ -96,18 +96,26 @@ void* QSettings_Metacast(QSettings* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QSettings_Tr(const char* s) { +struct miqt_string QSettings_Tr(const char* s) { QString _ret = QSettings::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSettings_TrUtf8(const char* s) { +struct miqt_string QSettings_TrUtf8(const char* s) { QString _ret = QSettings::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QSettings_Clear(QSettings* self) { @@ -131,8 +139,8 @@ void QSettings_SetAtomicSyncRequired(QSettings* self, bool enable) { self->setAtomicSyncRequired(enable); } -void QSettings_BeginGroup(QSettings* self, struct miqt_string* prefix) { - QString prefix_QString = QString::fromUtf8(&prefix->data, prefix->len); +void QSettings_BeginGroup(QSettings* self, struct miqt_string prefix) { + QString prefix_QString = QString::fromUtf8(prefix.data, prefix.len); self->beginGroup(prefix_QString); } @@ -140,20 +148,24 @@ void QSettings_EndGroup(QSettings* self) { self->endGroup(); } -struct miqt_string* QSettings_Group(const QSettings* self) { +struct miqt_string QSettings_Group(const QSettings* self) { QString _ret = self->group(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -int QSettings_BeginReadArray(QSettings* self, struct miqt_string* prefix) { - QString prefix_QString = QString::fromUtf8(&prefix->data, prefix->len); +int QSettings_BeginReadArray(QSettings* self, struct miqt_string prefix) { + QString prefix_QString = QString::fromUtf8(prefix.data, prefix.len); return self->beginReadArray(prefix_QString); } -void QSettings_BeginWriteArray(QSettings* self, struct miqt_string* prefix) { - QString prefix_QString = QString::fromUtf8(&prefix->data, prefix->len); +void QSettings_BeginWriteArray(QSettings* self, struct miqt_string prefix) { + QString prefix_QString = QString::fromUtf8(prefix.data, prefix.len); self->beginWriteArray(prefix_QString); } @@ -168,12 +180,16 @@ void QSettings_SetArrayIndex(QSettings* self, int i) { struct miqt_array* QSettings_AllKeys(const QSettings* self) { QStringList _ret = self->allKeys(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -184,12 +200,16 @@ struct miqt_array* QSettings_AllKeys(const QSettings* self) { struct miqt_array* QSettings_ChildKeys(const QSettings* self) { QStringList _ret = self->childKeys(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -200,12 +220,16 @@ struct miqt_array* QSettings_ChildKeys(const QSettings* self) { struct miqt_array* QSettings_ChildGroups(const QSettings* self) { QStringList _ret = self->childGroups(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -217,23 +241,23 @@ bool QSettings_IsWritable(const QSettings* self) { return self->isWritable(); } -void QSettings_SetValue(QSettings* self, struct miqt_string* key, QVariant* value) { - QString key_QString = QString::fromUtf8(&key->data, key->len); +void QSettings_SetValue(QSettings* self, struct miqt_string key, QVariant* value) { + QString key_QString = QString::fromUtf8(key.data, key.len); self->setValue(key_QString, *value); } -QVariant* QSettings_Value(const QSettings* self, struct miqt_string* key) { - QString key_QString = QString::fromUtf8(&key->data, key->len); +QVariant* QSettings_Value(const QSettings* self, struct miqt_string key) { + QString key_QString = QString::fromUtf8(key.data, key.len); return new QVariant(self->value(key_QString)); } -void QSettings_Remove(QSettings* self, struct miqt_string* key) { - QString key_QString = QString::fromUtf8(&key->data, key->len); +void QSettings_Remove(QSettings* self, struct miqt_string key) { + QString key_QString = QString::fromUtf8(key.data, key.len); self->remove(key_QString); } -bool QSettings_Contains(const QSettings* self, struct miqt_string* key) { - QString key_QString = QString::fromUtf8(&key->data, key->len); +bool QSettings_Contains(const QSettings* self, struct miqt_string key) { + QString key_QString = QString::fromUtf8(key.data, key.len); return self->contains(key_QString); } @@ -245,11 +269,15 @@ bool QSettings_FallbacksEnabled(const QSettings* self) { return self->fallbacksEnabled(); } -struct miqt_string* QSettings_FileName(const QSettings* self) { +struct miqt_string QSettings_FileName(const QSettings* self) { QString _ret = self->fileName(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QSettings_Format(const QSettings* self) { @@ -262,18 +290,26 @@ int QSettings_Scope(const QSettings* self) { return static_cast(_ret); } -struct miqt_string* QSettings_OrganizationName(const QSettings* self) { +struct miqt_string QSettings_OrganizationName(const QSettings* self) { QString _ret = self->organizationName(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSettings_ApplicationName(const QSettings* self) { +struct miqt_string QSettings_ApplicationName(const QSettings* self) { QString _ret = self->applicationName(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QSettings_SetIniCodec(QSettings* self, QTextCodec* codec) { @@ -297,56 +333,72 @@ int QSettings_DefaultFormat() { return static_cast(_ret); } -void QSettings_SetSystemIniPath(struct miqt_string* dir) { - QString dir_QString = QString::fromUtf8(&dir->data, dir->len); +void QSettings_SetSystemIniPath(struct miqt_string dir) { + QString dir_QString = QString::fromUtf8(dir.data, dir.len); QSettings::setSystemIniPath(dir_QString); } -void QSettings_SetUserIniPath(struct miqt_string* dir) { - QString dir_QString = QString::fromUtf8(&dir->data, dir->len); +void QSettings_SetUserIniPath(struct miqt_string dir) { + QString dir_QString = QString::fromUtf8(dir.data, dir.len); QSettings::setUserIniPath(dir_QString); } -void QSettings_SetPath(int format, int scope, struct miqt_string* path) { - QString path_QString = QString::fromUtf8(&path->data, path->len); +void QSettings_SetPath(int format, int scope, struct miqt_string path) { + QString path_QString = QString::fromUtf8(path.data, path.len); QSettings::setPath(static_cast(format), static_cast(scope), path_QString); } -struct miqt_string* QSettings_Tr2(const char* s, const char* c) { +struct miqt_string QSettings_Tr2(const char* s, const char* c) { QString _ret = QSettings::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSettings_Tr3(const char* s, const char* c, int n) { +struct miqt_string QSettings_Tr3(const char* s, const char* c, int n) { QString _ret = QSettings::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSettings_TrUtf82(const char* s, const char* c) { +struct miqt_string QSettings_TrUtf82(const char* s, const char* c) { QString _ret = QSettings::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSettings_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QSettings_TrUtf83(const char* s, const char* c, int n) { QString _ret = QSettings::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QSettings_BeginWriteArray2(QSettings* self, struct miqt_string* prefix, int size) { - QString prefix_QString = QString::fromUtf8(&prefix->data, prefix->len); +void QSettings_BeginWriteArray2(QSettings* self, struct miqt_string prefix, int size) { + QString prefix_QString = QString::fromUtf8(prefix.data, prefix.len); self->beginWriteArray(prefix_QString, static_cast(size)); } -QVariant* QSettings_Value2(const QSettings* self, struct miqt_string* key, QVariant* defaultValue) { - QString key_QString = QString::fromUtf8(&key->data, key->len); +QVariant* QSettings_Value2(const QSettings* self, struct miqt_string key, QVariant* defaultValue) { + QString key_QString = QString::fromUtf8(key.data, key.len); return new QVariant(self->value(key_QString, *defaultValue)); } diff --git a/qt/gen_qsettings.go b/qt/gen_qsettings.go index 4326574d..7e1e5895 100644 --- a/qt/gen_qsettings.go +++ b/qt/gen_qsettings.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -85,33 +84,41 @@ func UnsafeNewQSettings(h unsafe.Pointer) *QSettings { // NewQSettings constructs a new QSettings object. func NewQSettings(organization string) *QSettings { - organization_ms := libmiqt.Strdupg(organization) - defer C.free(organization_ms) - ret := C.QSettings_new((*C.struct_miqt_string)(organization_ms)) + organization_ms := C.struct_miqt_string{} + organization_ms.data = C.CString(organization) + organization_ms.len = C.size_t(len(organization)) + defer C.free(unsafe.Pointer(organization_ms.data)) + ret := C.QSettings_new(organization_ms) return newQSettings(ret) } // NewQSettings2 constructs a new QSettings object. func NewQSettings2(scope QSettings__Scope, organization string) *QSettings { - organization_ms := libmiqt.Strdupg(organization) - defer C.free(organization_ms) - ret := C.QSettings_new2((C.int)(scope), (*C.struct_miqt_string)(organization_ms)) + organization_ms := C.struct_miqt_string{} + organization_ms.data = C.CString(organization) + organization_ms.len = C.size_t(len(organization)) + defer C.free(unsafe.Pointer(organization_ms.data)) + ret := C.QSettings_new2((C.int)(scope), organization_ms) return newQSettings(ret) } // NewQSettings3 constructs a new QSettings object. func NewQSettings3(format QSettings__Format, scope QSettings__Scope, organization string) *QSettings { - organization_ms := libmiqt.Strdupg(organization) - defer C.free(organization_ms) - ret := C.QSettings_new3((C.int)(format), (C.int)(scope), (*C.struct_miqt_string)(organization_ms)) + organization_ms := C.struct_miqt_string{} + organization_ms.data = C.CString(organization) + organization_ms.len = C.size_t(len(organization)) + defer C.free(unsafe.Pointer(organization_ms.data)) + ret := C.QSettings_new3((C.int)(format), (C.int)(scope), organization_ms) return newQSettings(ret) } // NewQSettings4 constructs a new QSettings object. func NewQSettings4(fileName string, format QSettings__Format) *QSettings { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - ret := C.QSettings_new4((*C.struct_miqt_string)(fileName_ms), (C.int)(format)) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + ret := C.QSettings_new4(fileName_ms, (C.int)(format)) return newQSettings(ret) } @@ -129,69 +136,95 @@ func NewQSettings6(scope QSettings__Scope) *QSettings { // NewQSettings7 constructs a new QSettings object. func NewQSettings7(organization string, application string) *QSettings { - organization_ms := libmiqt.Strdupg(organization) - defer C.free(organization_ms) - application_ms := libmiqt.Strdupg(application) - defer C.free(application_ms) - ret := C.QSettings_new7((*C.struct_miqt_string)(organization_ms), (*C.struct_miqt_string)(application_ms)) + organization_ms := C.struct_miqt_string{} + organization_ms.data = C.CString(organization) + organization_ms.len = C.size_t(len(organization)) + defer C.free(unsafe.Pointer(organization_ms.data)) + application_ms := C.struct_miqt_string{} + application_ms.data = C.CString(application) + application_ms.len = C.size_t(len(application)) + defer C.free(unsafe.Pointer(application_ms.data)) + ret := C.QSettings_new7(organization_ms, application_ms) return newQSettings(ret) } // NewQSettings8 constructs a new QSettings object. func NewQSettings8(organization string, application string, parent *QObject) *QSettings { - organization_ms := libmiqt.Strdupg(organization) - defer C.free(organization_ms) - application_ms := libmiqt.Strdupg(application) - defer C.free(application_ms) - ret := C.QSettings_new8((*C.struct_miqt_string)(organization_ms), (*C.struct_miqt_string)(application_ms), parent.cPointer()) + organization_ms := C.struct_miqt_string{} + organization_ms.data = C.CString(organization) + organization_ms.len = C.size_t(len(organization)) + defer C.free(unsafe.Pointer(organization_ms.data)) + application_ms := C.struct_miqt_string{} + application_ms.data = C.CString(application) + application_ms.len = C.size_t(len(application)) + defer C.free(unsafe.Pointer(application_ms.data)) + ret := C.QSettings_new8(organization_ms, application_ms, parent.cPointer()) return newQSettings(ret) } // NewQSettings9 constructs a new QSettings object. func NewQSettings9(scope QSettings__Scope, organization string, application string) *QSettings { - organization_ms := libmiqt.Strdupg(organization) - defer C.free(organization_ms) - application_ms := libmiqt.Strdupg(application) - defer C.free(application_ms) - ret := C.QSettings_new9((C.int)(scope), (*C.struct_miqt_string)(organization_ms), (*C.struct_miqt_string)(application_ms)) + organization_ms := C.struct_miqt_string{} + organization_ms.data = C.CString(organization) + organization_ms.len = C.size_t(len(organization)) + defer C.free(unsafe.Pointer(organization_ms.data)) + application_ms := C.struct_miqt_string{} + application_ms.data = C.CString(application) + application_ms.len = C.size_t(len(application)) + defer C.free(unsafe.Pointer(application_ms.data)) + ret := C.QSettings_new9((C.int)(scope), organization_ms, application_ms) return newQSettings(ret) } // NewQSettings10 constructs a new QSettings object. func NewQSettings10(scope QSettings__Scope, organization string, application string, parent *QObject) *QSettings { - organization_ms := libmiqt.Strdupg(organization) - defer C.free(organization_ms) - application_ms := libmiqt.Strdupg(application) - defer C.free(application_ms) - ret := C.QSettings_new10((C.int)(scope), (*C.struct_miqt_string)(organization_ms), (*C.struct_miqt_string)(application_ms), parent.cPointer()) + organization_ms := C.struct_miqt_string{} + organization_ms.data = C.CString(organization) + organization_ms.len = C.size_t(len(organization)) + defer C.free(unsafe.Pointer(organization_ms.data)) + application_ms := C.struct_miqt_string{} + application_ms.data = C.CString(application) + application_ms.len = C.size_t(len(application)) + defer C.free(unsafe.Pointer(application_ms.data)) + ret := C.QSettings_new10((C.int)(scope), organization_ms, application_ms, parent.cPointer()) return newQSettings(ret) } // NewQSettings11 constructs a new QSettings object. func NewQSettings11(format QSettings__Format, scope QSettings__Scope, organization string, application string) *QSettings { - organization_ms := libmiqt.Strdupg(organization) - defer C.free(organization_ms) - application_ms := libmiqt.Strdupg(application) - defer C.free(application_ms) - ret := C.QSettings_new11((C.int)(format), (C.int)(scope), (*C.struct_miqt_string)(organization_ms), (*C.struct_miqt_string)(application_ms)) + organization_ms := C.struct_miqt_string{} + organization_ms.data = C.CString(organization) + organization_ms.len = C.size_t(len(organization)) + defer C.free(unsafe.Pointer(organization_ms.data)) + application_ms := C.struct_miqt_string{} + application_ms.data = C.CString(application) + application_ms.len = C.size_t(len(application)) + defer C.free(unsafe.Pointer(application_ms.data)) + ret := C.QSettings_new11((C.int)(format), (C.int)(scope), organization_ms, application_ms) return newQSettings(ret) } // NewQSettings12 constructs a new QSettings object. func NewQSettings12(format QSettings__Format, scope QSettings__Scope, organization string, application string, parent *QObject) *QSettings { - organization_ms := libmiqt.Strdupg(organization) - defer C.free(organization_ms) - application_ms := libmiqt.Strdupg(application) - defer C.free(application_ms) - ret := C.QSettings_new12((C.int)(format), (C.int)(scope), (*C.struct_miqt_string)(organization_ms), (*C.struct_miqt_string)(application_ms), parent.cPointer()) + organization_ms := C.struct_miqt_string{} + organization_ms.data = C.CString(organization) + organization_ms.len = C.size_t(len(organization)) + defer C.free(unsafe.Pointer(organization_ms.data)) + application_ms := C.struct_miqt_string{} + application_ms.data = C.CString(application) + application_ms.len = C.size_t(len(application)) + defer C.free(unsafe.Pointer(application_ms.data)) + ret := C.QSettings_new12((C.int)(format), (C.int)(scope), organization_ms, application_ms, parent.cPointer()) return newQSettings(ret) } // NewQSettings13 constructs a new QSettings object. func NewQSettings13(fileName string, format QSettings__Format, parent *QObject) *QSettings { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - ret := C.QSettings_new13((*C.struct_miqt_string)(fileName_ms), (C.int)(format), parent.cPointer()) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + ret := C.QSettings_new13(fileName_ms, (C.int)(format), parent.cPointer()) return newQSettings(ret) } @@ -214,24 +247,24 @@ func (this *QSettings) MetaObject() *QMetaObject { func (this *QSettings) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QSettings_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QSettings_Metacast(this.h, param1_Cstring)) } func QSettings_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QSettings_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSettings_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QSettings_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QSettings_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSettings_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -256,9 +289,11 @@ func (this *QSettings) SetAtomicSyncRequired(enable bool) { } func (this *QSettings) BeginGroup(prefix string) { - prefix_ms := libmiqt.Strdupg(prefix) - defer C.free(prefix_ms) - C.QSettings_BeginGroup(this.h, (*C.struct_miqt_string)(prefix_ms)) + prefix_ms := C.struct_miqt_string{} + prefix_ms.data = C.CString(prefix) + prefix_ms.len = C.size_t(len(prefix)) + defer C.free(unsafe.Pointer(prefix_ms.data)) + C.QSettings_BeginGroup(this.h, prefix_ms) } func (this *QSettings) EndGroup() { @@ -266,22 +301,26 @@ func (this *QSettings) EndGroup() { } func (this *QSettings) Group() string { - var _ms *C.struct_miqt_string = C.QSettings_Group(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSettings_Group(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QSettings) BeginReadArray(prefix string) int { - prefix_ms := libmiqt.Strdupg(prefix) - defer C.free(prefix_ms) - return (int)(C.QSettings_BeginReadArray(this.h, (*C.struct_miqt_string)(prefix_ms))) + prefix_ms := C.struct_miqt_string{} + prefix_ms.data = C.CString(prefix) + prefix_ms.len = C.size_t(len(prefix)) + defer C.free(unsafe.Pointer(prefix_ms.data)) + return (int)(C.QSettings_BeginReadArray(this.h, prefix_ms)) } func (this *QSettings) BeginWriteArray(prefix string) { - prefix_ms := libmiqt.Strdupg(prefix) - defer C.free(prefix_ms) - C.QSettings_BeginWriteArray(this.h, (*C.struct_miqt_string)(prefix_ms)) + prefix_ms := C.struct_miqt_string{} + prefix_ms.data = C.CString(prefix) + prefix_ms.len = C.size_t(len(prefix)) + defer C.free(unsafe.Pointer(prefix_ms.data)) + C.QSettings_BeginWriteArray(this.h, prefix_ms) } func (this *QSettings) EndArray() { @@ -295,11 +334,11 @@ func (this *QSettings) SetArrayIndex(i int) { func (this *QSettings) AllKeys() []string { var _ma *C.struct_miqt_array = C.QSettings_AllKeys(this.h) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -309,11 +348,11 @@ func (this *QSettings) AllKeys() []string { func (this *QSettings) ChildKeys() []string { var _ma *C.struct_miqt_array = C.QSettings_ChildKeys(this.h) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -323,11 +362,11 @@ func (this *QSettings) ChildKeys() []string { func (this *QSettings) ChildGroups() []string { var _ma *C.struct_miqt_array = C.QSettings_ChildGroups(this.h) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -339,30 +378,38 @@ func (this *QSettings) IsWritable() bool { } func (this *QSettings) SetValue(key string, value *QVariant) { - key_ms := libmiqt.Strdupg(key) - defer C.free(key_ms) - C.QSettings_SetValue(this.h, (*C.struct_miqt_string)(key_ms), value.cPointer()) + key_ms := C.struct_miqt_string{} + key_ms.data = C.CString(key) + key_ms.len = C.size_t(len(key)) + defer C.free(unsafe.Pointer(key_ms.data)) + C.QSettings_SetValue(this.h, key_ms, value.cPointer()) } func (this *QSettings) Value(key string) *QVariant { - key_ms := libmiqt.Strdupg(key) - defer C.free(key_ms) - _ret := C.QSettings_Value(this.h, (*C.struct_miqt_string)(key_ms)) + key_ms := C.struct_miqt_string{} + key_ms.data = C.CString(key) + key_ms.len = C.size_t(len(key)) + defer C.free(unsafe.Pointer(key_ms.data)) + _ret := C.QSettings_Value(this.h, key_ms) _goptr := newQVariant(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QSettings) Remove(key string) { - key_ms := libmiqt.Strdupg(key) - defer C.free(key_ms) - C.QSettings_Remove(this.h, (*C.struct_miqt_string)(key_ms)) + key_ms := C.struct_miqt_string{} + key_ms.data = C.CString(key) + key_ms.len = C.size_t(len(key)) + defer C.free(unsafe.Pointer(key_ms.data)) + C.QSettings_Remove(this.h, key_ms) } func (this *QSettings) Contains(key string) bool { - key_ms := libmiqt.Strdupg(key) - defer C.free(key_ms) - return (bool)(C.QSettings_Contains(this.h, (*C.struct_miqt_string)(key_ms))) + key_ms := C.struct_miqt_string{} + key_ms.data = C.CString(key) + key_ms.len = C.size_t(len(key)) + defer C.free(unsafe.Pointer(key_ms.data)) + return (bool)(C.QSettings_Contains(this.h, key_ms)) } func (this *QSettings) SetFallbacksEnabled(b bool) { @@ -374,9 +421,9 @@ func (this *QSettings) FallbacksEnabled() bool { } func (this *QSettings) FileName() string { - var _ms *C.struct_miqt_string = C.QSettings_FileName(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSettings_FileName(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -389,16 +436,16 @@ func (this *QSettings) Scope() QSettings__Scope { } func (this *QSettings) OrganizationName() string { - var _ms *C.struct_miqt_string = C.QSettings_OrganizationName(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSettings_OrganizationName(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QSettings) ApplicationName() string { - var _ms *C.struct_miqt_string = C.QSettings_ApplicationName(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSettings_ApplicationName(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -425,21 +472,27 @@ func QSettings_DefaultFormat() QSettings__Format { } func QSettings_SetSystemIniPath(dir string) { - dir_ms := libmiqt.Strdupg(dir) - defer C.free(dir_ms) - C.QSettings_SetSystemIniPath((*C.struct_miqt_string)(dir_ms)) + dir_ms := C.struct_miqt_string{} + dir_ms.data = C.CString(dir) + dir_ms.len = C.size_t(len(dir)) + defer C.free(unsafe.Pointer(dir_ms.data)) + C.QSettings_SetSystemIniPath(dir_ms) } func QSettings_SetUserIniPath(dir string) { - dir_ms := libmiqt.Strdupg(dir) - defer C.free(dir_ms) - C.QSettings_SetUserIniPath((*C.struct_miqt_string)(dir_ms)) + dir_ms := C.struct_miqt_string{} + dir_ms.data = C.CString(dir) + dir_ms.len = C.size_t(len(dir)) + defer C.free(unsafe.Pointer(dir_ms.data)) + C.QSettings_SetUserIniPath(dir_ms) } func QSettings_SetPath(format QSettings__Format, scope QSettings__Scope, path string) { - path_ms := libmiqt.Strdupg(path) - defer C.free(path_ms) - C.QSettings_SetPath((C.int)(format), (C.int)(scope), (*C.struct_miqt_string)(path_ms)) + path_ms := C.struct_miqt_string{} + path_ms.data = C.CString(path) + path_ms.len = C.size_t(len(path)) + defer C.free(unsafe.Pointer(path_ms.data)) + C.QSettings_SetPath((C.int)(format), (C.int)(scope), path_ms) } func QSettings_Tr2(s string, c string) string { @@ -447,9 +500,9 @@ func QSettings_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSettings_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSettings_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -458,9 +511,9 @@ func QSettings_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSettings_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSettings_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -469,9 +522,9 @@ func QSettings_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSettings_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSettings_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -480,22 +533,26 @@ func QSettings_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSettings_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSettings_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QSettings) BeginWriteArray2(prefix string, size int) { - prefix_ms := libmiqt.Strdupg(prefix) - defer C.free(prefix_ms) - C.QSettings_BeginWriteArray2(this.h, (*C.struct_miqt_string)(prefix_ms), (C.int)(size)) + prefix_ms := C.struct_miqt_string{} + prefix_ms.data = C.CString(prefix) + prefix_ms.len = C.size_t(len(prefix)) + defer C.free(unsafe.Pointer(prefix_ms.data)) + C.QSettings_BeginWriteArray2(this.h, prefix_ms, (C.int)(size)) } func (this *QSettings) Value2(key string, defaultValue *QVariant) *QVariant { - key_ms := libmiqt.Strdupg(key) - defer C.free(key_ms) - _ret := C.QSettings_Value2(this.h, (*C.struct_miqt_string)(key_ms), defaultValue.cPointer()) + key_ms := C.struct_miqt_string{} + key_ms.data = C.CString(key) + key_ms.len = C.size_t(len(key)) + defer C.free(unsafe.Pointer(key_ms.data)) + _ret := C.QSettings_Value2(this.h, key_ms, defaultValue.cPointer()) _goptr := newQVariant(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr diff --git a/qt/gen_qsettings.h b/qt/gen_qsettings.h index 554f2c30..cd9fcc2b 100644 --- a/qt/gen_qsettings.h +++ b/qt/gen_qsettings.h @@ -27,66 +27,66 @@ typedef struct QTextCodec QTextCodec; typedef struct QVariant QVariant; #endif -QSettings* QSettings_new(struct miqt_string* organization); -QSettings* QSettings_new2(int scope, struct miqt_string* organization); -QSettings* QSettings_new3(int format, int scope, struct miqt_string* organization); -QSettings* QSettings_new4(struct miqt_string* fileName, int format); +QSettings* QSettings_new(struct miqt_string organization); +QSettings* QSettings_new2(int scope, struct miqt_string organization); +QSettings* QSettings_new3(int format, int scope, struct miqt_string organization); +QSettings* QSettings_new4(struct miqt_string fileName, int format); QSettings* QSettings_new5(); QSettings* QSettings_new6(int scope); -QSettings* QSettings_new7(struct miqt_string* organization, struct miqt_string* application); -QSettings* QSettings_new8(struct miqt_string* organization, struct miqt_string* application, QObject* parent); -QSettings* QSettings_new9(int scope, struct miqt_string* organization, struct miqt_string* application); -QSettings* QSettings_new10(int scope, struct miqt_string* organization, struct miqt_string* application, QObject* parent); -QSettings* QSettings_new11(int format, int scope, struct miqt_string* organization, struct miqt_string* application); -QSettings* QSettings_new12(int format, int scope, struct miqt_string* organization, struct miqt_string* application, QObject* parent); -QSettings* QSettings_new13(struct miqt_string* fileName, int format, QObject* parent); +QSettings* QSettings_new7(struct miqt_string organization, struct miqt_string application); +QSettings* QSettings_new8(struct miqt_string organization, struct miqt_string application, QObject* parent); +QSettings* QSettings_new9(int scope, struct miqt_string organization, struct miqt_string application); +QSettings* QSettings_new10(int scope, struct miqt_string organization, struct miqt_string application, QObject* parent); +QSettings* QSettings_new11(int format, int scope, struct miqt_string organization, struct miqt_string application); +QSettings* QSettings_new12(int format, int scope, struct miqt_string organization, struct miqt_string application, QObject* parent); +QSettings* QSettings_new13(struct miqt_string fileName, int format, QObject* parent); QSettings* QSettings_new14(QObject* parent); QSettings* QSettings_new15(int scope, QObject* parent); QMetaObject* QSettings_MetaObject(const QSettings* self); void* QSettings_Metacast(QSettings* self, const char* param1); -struct miqt_string* QSettings_Tr(const char* s); -struct miqt_string* QSettings_TrUtf8(const char* s); +struct miqt_string QSettings_Tr(const char* s); +struct miqt_string QSettings_TrUtf8(const char* s); void QSettings_Clear(QSettings* self); void QSettings_Sync(QSettings* self); int QSettings_Status(const QSettings* self); bool QSettings_IsAtomicSyncRequired(const QSettings* self); void QSettings_SetAtomicSyncRequired(QSettings* self, bool enable); -void QSettings_BeginGroup(QSettings* self, struct miqt_string* prefix); +void QSettings_BeginGroup(QSettings* self, struct miqt_string prefix); void QSettings_EndGroup(QSettings* self); -struct miqt_string* QSettings_Group(const QSettings* self); -int QSettings_BeginReadArray(QSettings* self, struct miqt_string* prefix); -void QSettings_BeginWriteArray(QSettings* self, struct miqt_string* prefix); +struct miqt_string QSettings_Group(const QSettings* self); +int QSettings_BeginReadArray(QSettings* self, struct miqt_string prefix); +void QSettings_BeginWriteArray(QSettings* self, struct miqt_string prefix); void QSettings_EndArray(QSettings* self); void QSettings_SetArrayIndex(QSettings* self, int i); struct miqt_array* QSettings_AllKeys(const QSettings* self); struct miqt_array* QSettings_ChildKeys(const QSettings* self); struct miqt_array* QSettings_ChildGroups(const QSettings* self); bool QSettings_IsWritable(const QSettings* self); -void QSettings_SetValue(QSettings* self, struct miqt_string* key, QVariant* value); -QVariant* QSettings_Value(const QSettings* self, struct miqt_string* key); -void QSettings_Remove(QSettings* self, struct miqt_string* key); -bool QSettings_Contains(const QSettings* self, struct miqt_string* key); +void QSettings_SetValue(QSettings* self, struct miqt_string key, QVariant* value); +QVariant* QSettings_Value(const QSettings* self, struct miqt_string key); +void QSettings_Remove(QSettings* self, struct miqt_string key); +bool QSettings_Contains(const QSettings* self, struct miqt_string key); void QSettings_SetFallbacksEnabled(QSettings* self, bool b); bool QSettings_FallbacksEnabled(const QSettings* self); -struct miqt_string* QSettings_FileName(const QSettings* self); +struct miqt_string QSettings_FileName(const QSettings* self); int QSettings_Format(const QSettings* self); int QSettings_Scope(const QSettings* self); -struct miqt_string* QSettings_OrganizationName(const QSettings* self); -struct miqt_string* QSettings_ApplicationName(const QSettings* self); +struct miqt_string QSettings_OrganizationName(const QSettings* self); +struct miqt_string QSettings_ApplicationName(const QSettings* self); void QSettings_SetIniCodec(QSettings* self, QTextCodec* codec); void QSettings_SetIniCodecWithCodecName(QSettings* self, const char* codecName); QTextCodec* QSettings_IniCodec(const QSettings* self); void QSettings_SetDefaultFormat(int format); int QSettings_DefaultFormat(); -void QSettings_SetSystemIniPath(struct miqt_string* dir); -void QSettings_SetUserIniPath(struct miqt_string* dir); -void QSettings_SetPath(int format, int scope, struct miqt_string* path); -struct miqt_string* QSettings_Tr2(const char* s, const char* c); -struct miqt_string* QSettings_Tr3(const char* s, const char* c, int n); -struct miqt_string* QSettings_TrUtf82(const char* s, const char* c); -struct miqt_string* QSettings_TrUtf83(const char* s, const char* c, int n); -void QSettings_BeginWriteArray2(QSettings* self, struct miqt_string* prefix, int size); -QVariant* QSettings_Value2(const QSettings* self, struct miqt_string* key, QVariant* defaultValue); +void QSettings_SetSystemIniPath(struct miqt_string dir); +void QSettings_SetUserIniPath(struct miqt_string dir); +void QSettings_SetPath(int format, int scope, struct miqt_string path); +struct miqt_string QSettings_Tr2(const char* s, const char* c); +struct miqt_string QSettings_Tr3(const char* s, const char* c, int n); +struct miqt_string QSettings_TrUtf82(const char* s, const char* c); +struct miqt_string QSettings_TrUtf83(const char* s, const char* c, int n); +void QSettings_BeginWriteArray2(QSettings* self, struct miqt_string prefix, int size); +QVariant* QSettings_Value2(const QSettings* self, struct miqt_string key, QVariant* defaultValue); void QSettings_Delete(QSettings* self); #ifdef __cplusplus diff --git a/qt/gen_qsharedmemory.cpp b/qt/gen_qsharedmemory.cpp index 80c0866e..c7f7fc39 100644 --- a/qt/gen_qsharedmemory.cpp +++ b/qt/gen_qsharedmemory.cpp @@ -12,8 +12,8 @@ QSharedMemory* QSharedMemory_new() { return new QSharedMemory(); } -QSharedMemory* QSharedMemory_new2(struct miqt_string* key) { - QString key_QString = QString::fromUtf8(&key->data, key->len); +QSharedMemory* QSharedMemory_new2(struct miqt_string key) { + QString key_QString = QString::fromUtf8(key.data, key.len); return new QSharedMemory(key_QString); } @@ -21,8 +21,8 @@ QSharedMemory* QSharedMemory_new3(QObject* parent) { return new QSharedMemory(parent); } -QSharedMemory* QSharedMemory_new4(struct miqt_string* key, QObject* parent) { - QString key_QString = QString::fromUtf8(&key->data, key->len); +QSharedMemory* QSharedMemory_new4(struct miqt_string key, QObject* parent) { + QString key_QString = QString::fromUtf8(key.data, key.len); return new QSharedMemory(key_QString, parent); } @@ -34,42 +34,58 @@ void* QSharedMemory_Metacast(QSharedMemory* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QSharedMemory_Tr(const char* s) { +struct miqt_string QSharedMemory_Tr(const char* s) { QString _ret = QSharedMemory::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSharedMemory_TrUtf8(const char* s) { +struct miqt_string QSharedMemory_TrUtf8(const char* s) { QString _ret = QSharedMemory::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QSharedMemory_SetKey(QSharedMemory* self, struct miqt_string* key) { - QString key_QString = QString::fromUtf8(&key->data, key->len); +void QSharedMemory_SetKey(QSharedMemory* self, struct miqt_string key) { + QString key_QString = QString::fromUtf8(key.data, key.len); self->setKey(key_QString); } -struct miqt_string* QSharedMemory_Key(const QSharedMemory* self) { +struct miqt_string QSharedMemory_Key(const QSharedMemory* self) { QString _ret = self->key(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QSharedMemory_SetNativeKey(QSharedMemory* self, struct miqt_string* key) { - QString key_QString = QString::fromUtf8(&key->data, key->len); +void QSharedMemory_SetNativeKey(QSharedMemory* self, struct miqt_string key) { + QString key_QString = QString::fromUtf8(key.data, key.len); self->setNativeKey(key_QString); } -struct miqt_string* QSharedMemory_NativeKey(const QSharedMemory* self) { +struct miqt_string QSharedMemory_NativeKey(const QSharedMemory* self) { QString _ret = self->nativeKey(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } bool QSharedMemory_Create(QSharedMemory* self, int size) { @@ -117,39 +133,59 @@ int QSharedMemory_Error(const QSharedMemory* self) { return static_cast(_ret); } -struct miqt_string* QSharedMemory_ErrorString(const QSharedMemory* self) { +struct miqt_string QSharedMemory_ErrorString(const QSharedMemory* self) { QString _ret = self->errorString(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSharedMemory_Tr2(const char* s, const char* c) { +struct miqt_string QSharedMemory_Tr2(const char* s, const char* c) { QString _ret = QSharedMemory::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSharedMemory_Tr3(const char* s, const char* c, int n) { +struct miqt_string QSharedMemory_Tr3(const char* s, const char* c, int n) { QString _ret = QSharedMemory::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSharedMemory_TrUtf82(const char* s, const char* c) { +struct miqt_string QSharedMemory_TrUtf82(const char* s, const char* c) { QString _ret = QSharedMemory::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSharedMemory_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QSharedMemory_TrUtf83(const char* s, const char* c, int n) { QString _ret = QSharedMemory::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } bool QSharedMemory_Create2(QSharedMemory* self, int size, int mode) { diff --git a/qt/gen_qsharedmemory.go b/qt/gen_qsharedmemory.go index d5eafb39..5a297ac4 100644 --- a/qt/gen_qsharedmemory.go +++ b/qt/gen_qsharedmemory.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -73,9 +72,11 @@ func NewQSharedMemory() *QSharedMemory { // NewQSharedMemory2 constructs a new QSharedMemory object. func NewQSharedMemory2(key string) *QSharedMemory { - key_ms := libmiqt.Strdupg(key) - defer C.free(key_ms) - ret := C.QSharedMemory_new2((*C.struct_miqt_string)(key_ms)) + key_ms := C.struct_miqt_string{} + key_ms.data = C.CString(key) + key_ms.len = C.size_t(len(key)) + defer C.free(unsafe.Pointer(key_ms.data)) + ret := C.QSharedMemory_new2(key_ms) return newQSharedMemory(ret) } @@ -87,9 +88,11 @@ func NewQSharedMemory3(parent *QObject) *QSharedMemory { // NewQSharedMemory4 constructs a new QSharedMemory object. func NewQSharedMemory4(key string, parent *QObject) *QSharedMemory { - key_ms := libmiqt.Strdupg(key) - defer C.free(key_ms) - ret := C.QSharedMemory_new4((*C.struct_miqt_string)(key_ms), parent.cPointer()) + key_ms := C.struct_miqt_string{} + key_ms.data = C.CString(key) + key_ms.len = C.size_t(len(key)) + defer C.free(unsafe.Pointer(key_ms.data)) + ret := C.QSharedMemory_new4(key_ms, parent.cPointer()) return newQSharedMemory(ret) } @@ -100,50 +103,54 @@ func (this *QSharedMemory) MetaObject() *QMetaObject { func (this *QSharedMemory) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QSharedMemory_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QSharedMemory_Metacast(this.h, param1_Cstring)) } func QSharedMemory_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QSharedMemory_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSharedMemory_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QSharedMemory_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QSharedMemory_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSharedMemory_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QSharedMemory) SetKey(key string) { - key_ms := libmiqt.Strdupg(key) - defer C.free(key_ms) - C.QSharedMemory_SetKey(this.h, (*C.struct_miqt_string)(key_ms)) + key_ms := C.struct_miqt_string{} + key_ms.data = C.CString(key) + key_ms.len = C.size_t(len(key)) + defer C.free(unsafe.Pointer(key_ms.data)) + C.QSharedMemory_SetKey(this.h, key_ms) } func (this *QSharedMemory) Key() string { - var _ms *C.struct_miqt_string = C.QSharedMemory_Key(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSharedMemory_Key(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QSharedMemory) SetNativeKey(key string) { - key_ms := libmiqt.Strdupg(key) - defer C.free(key_ms) - C.QSharedMemory_SetNativeKey(this.h, (*C.struct_miqt_string)(key_ms)) + key_ms := C.struct_miqt_string{} + key_ms.data = C.CString(key) + key_ms.len = C.size_t(len(key)) + defer C.free(unsafe.Pointer(key_ms.data)) + C.QSharedMemory_SetNativeKey(this.h, key_ms) } func (this *QSharedMemory) NativeKey() string { - var _ms *C.struct_miqt_string = C.QSharedMemory_NativeKey(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSharedMemory_NativeKey(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -168,15 +175,15 @@ func (this *QSharedMemory) Detach() bool { } func (this *QSharedMemory) Data() unsafe.Pointer { - return C.QSharedMemory_Data(this.h) + return (unsafe.Pointer)(C.QSharedMemory_Data(this.h)) } func (this *QSharedMemory) ConstData() unsafe.Pointer { - return C.QSharedMemory_ConstData(this.h) + return (unsafe.Pointer)(C.QSharedMemory_ConstData(this.h)) } func (this *QSharedMemory) Data2() unsafe.Pointer { - return C.QSharedMemory_Data2(this.h) + return (unsafe.Pointer)(C.QSharedMemory_Data2(this.h)) } func (this *QSharedMemory) Lock() bool { @@ -192,9 +199,9 @@ func (this *QSharedMemory) Error() QSharedMemory__SharedMemoryError { } func (this *QSharedMemory) ErrorString() string { - var _ms *C.struct_miqt_string = C.QSharedMemory_ErrorString(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSharedMemory_ErrorString(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -203,9 +210,9 @@ func QSharedMemory_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSharedMemory_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSharedMemory_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -214,9 +221,9 @@ func QSharedMemory_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSharedMemory_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSharedMemory_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -225,9 +232,9 @@ func QSharedMemory_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSharedMemory_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSharedMemory_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -236,9 +243,9 @@ func QSharedMemory_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSharedMemory_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSharedMemory_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qsharedmemory.h b/qt/gen_qsharedmemory.h index 17ccca49..fef42dd1 100644 --- a/qt/gen_qsharedmemory.h +++ b/qt/gen_qsharedmemory.h @@ -24,17 +24,17 @@ typedef struct QSharedMemory QSharedMemory; #endif QSharedMemory* QSharedMemory_new(); -QSharedMemory* QSharedMemory_new2(struct miqt_string* key); +QSharedMemory* QSharedMemory_new2(struct miqt_string key); QSharedMemory* QSharedMemory_new3(QObject* parent); -QSharedMemory* QSharedMemory_new4(struct miqt_string* key, QObject* parent); +QSharedMemory* QSharedMemory_new4(struct miqt_string key, QObject* parent); QMetaObject* QSharedMemory_MetaObject(const QSharedMemory* self); void* QSharedMemory_Metacast(QSharedMemory* self, const char* param1); -struct miqt_string* QSharedMemory_Tr(const char* s); -struct miqt_string* QSharedMemory_TrUtf8(const char* s); -void QSharedMemory_SetKey(QSharedMemory* self, struct miqt_string* key); -struct miqt_string* QSharedMemory_Key(const QSharedMemory* self); -void QSharedMemory_SetNativeKey(QSharedMemory* self, struct miqt_string* key); -struct miqt_string* QSharedMemory_NativeKey(const QSharedMemory* self); +struct miqt_string QSharedMemory_Tr(const char* s); +struct miqt_string QSharedMemory_TrUtf8(const char* s); +void QSharedMemory_SetKey(QSharedMemory* self, struct miqt_string key); +struct miqt_string QSharedMemory_Key(const QSharedMemory* self); +void QSharedMemory_SetNativeKey(QSharedMemory* self, struct miqt_string key); +struct miqt_string QSharedMemory_NativeKey(const QSharedMemory* self); bool QSharedMemory_Create(QSharedMemory* self, int size); int QSharedMemory_Size(const QSharedMemory* self); bool QSharedMemory_Attach(QSharedMemory* self); @@ -46,11 +46,11 @@ const void* QSharedMemory_Data2(const QSharedMemory* self); bool QSharedMemory_Lock(QSharedMemory* self); bool QSharedMemory_Unlock(QSharedMemory* self); int QSharedMemory_Error(const QSharedMemory* self); -struct miqt_string* QSharedMemory_ErrorString(const QSharedMemory* self); -struct miqt_string* QSharedMemory_Tr2(const char* s, const char* c); -struct miqt_string* QSharedMemory_Tr3(const char* s, const char* c, int n); -struct miqt_string* QSharedMemory_TrUtf82(const char* s, const char* c); -struct miqt_string* QSharedMemory_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QSharedMemory_ErrorString(const QSharedMemory* self); +struct miqt_string QSharedMemory_Tr2(const char* s, const char* c); +struct miqt_string QSharedMemory_Tr3(const char* s, const char* c, int n); +struct miqt_string QSharedMemory_TrUtf82(const char* s, const char* c); +struct miqt_string QSharedMemory_TrUtf83(const char* s, const char* c, int n); bool QSharedMemory_Create2(QSharedMemory* self, int size, int mode); bool QSharedMemory_Attach1(QSharedMemory* self, int mode); void QSharedMemory_Delete(QSharedMemory* self); diff --git a/qt/gen_qshortcut.cpp b/qt/gen_qshortcut.cpp index 36bfb7cd..11c1ba74 100644 --- a/qt/gen_qshortcut.cpp +++ b/qt/gen_qshortcut.cpp @@ -37,18 +37,26 @@ void* QShortcut_Metacast(QShortcut* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QShortcut_Tr(const char* s) { +struct miqt_string QShortcut_Tr(const char* s) { QString _ret = QShortcut::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QShortcut_TrUtf8(const char* s) { +struct miqt_string QShortcut_TrUtf8(const char* s) { QString _ret = QShortcut::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QShortcut_SetKey(QShortcut* self, QKeySequence* key) { @@ -76,16 +84,20 @@ int QShortcut_Context(const QShortcut* self) { return static_cast(_ret); } -void QShortcut_SetWhatsThis(QShortcut* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QShortcut_SetWhatsThis(QShortcut* self, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->setWhatsThis(text_QString); } -struct miqt_string* QShortcut_WhatsThis(const QShortcut* self) { +struct miqt_string QShortcut_WhatsThis(const QShortcut* self) { QString _ret = self->whatsThis(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QShortcut_SetAutoRepeat(QShortcut* self, bool on) { @@ -124,32 +136,48 @@ void QShortcut_connect_ActivatedAmbiguously(QShortcut* self, intptr_t slot) { }); } -struct miqt_string* QShortcut_Tr2(const char* s, const char* c) { +struct miqt_string QShortcut_Tr2(const char* s, const char* c) { QString _ret = QShortcut::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QShortcut_Tr3(const char* s, const char* c, int n) { +struct miqt_string QShortcut_Tr3(const char* s, const char* c, int n) { QString _ret = QShortcut::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QShortcut_TrUtf82(const char* s, const char* c) { +struct miqt_string QShortcut_TrUtf82(const char* s, const char* c) { QString _ret = QShortcut::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QShortcut_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QShortcut_TrUtf83(const char* s, const char* c, int n) { QString _ret = QShortcut::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QShortcut_Delete(QShortcut* self) { diff --git a/qt/gen_qshortcut.go b/qt/gen_qshortcut.go index 0a2eceb8..23529047 100644 --- a/qt/gen_qshortcut.go +++ b/qt/gen_qshortcut.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "runtime/cgo" "unsafe" @@ -92,24 +91,24 @@ func (this *QShortcut) MetaObject() *QMetaObject { func (this *QShortcut) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QShortcut_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QShortcut_Metacast(this.h, param1_Cstring)) } func QShortcut_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QShortcut_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QShortcut_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QShortcut_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QShortcut_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QShortcut_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -141,15 +140,17 @@ func (this *QShortcut) Context() ShortcutContext { } func (this *QShortcut) SetWhatsThis(text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QShortcut_SetWhatsThis(this.h, (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QShortcut_SetWhatsThis(this.h, text_ms) } func (this *QShortcut) WhatsThis() string { - var _ms *C.struct_miqt_string = C.QShortcut_WhatsThis(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QShortcut_WhatsThis(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -208,9 +209,9 @@ func QShortcut_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QShortcut_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QShortcut_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -219,9 +220,9 @@ func QShortcut_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QShortcut_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QShortcut_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -230,9 +231,9 @@ func QShortcut_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QShortcut_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QShortcut_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -241,9 +242,9 @@ func QShortcut_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QShortcut_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QShortcut_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qshortcut.h b/qt/gen_qshortcut.h index a5bee2a7..64858cbc 100644 --- a/qt/gen_qshortcut.h +++ b/qt/gen_qshortcut.h @@ -32,16 +32,16 @@ QShortcut* QShortcut_new4(QKeySequence* key, QWidget* parent, const char* member QShortcut* QShortcut_new5(QKeySequence* key, QWidget* parent, const char* member, const char* ambiguousMember, int shortcutContext); QMetaObject* QShortcut_MetaObject(const QShortcut* self); void* QShortcut_Metacast(QShortcut* self, const char* param1); -struct miqt_string* QShortcut_Tr(const char* s); -struct miqt_string* QShortcut_TrUtf8(const char* s); +struct miqt_string QShortcut_Tr(const char* s); +struct miqt_string QShortcut_TrUtf8(const char* s); void QShortcut_SetKey(QShortcut* self, QKeySequence* key); QKeySequence* QShortcut_Key(const QShortcut* self); void QShortcut_SetEnabled(QShortcut* self, bool enable); bool QShortcut_IsEnabled(const QShortcut* self); void QShortcut_SetContext(QShortcut* self, int context); int QShortcut_Context(const QShortcut* self); -void QShortcut_SetWhatsThis(QShortcut* self, struct miqt_string* text); -struct miqt_string* QShortcut_WhatsThis(const QShortcut* self); +void QShortcut_SetWhatsThis(QShortcut* self, struct miqt_string text); +struct miqt_string QShortcut_WhatsThis(const QShortcut* self); void QShortcut_SetAutoRepeat(QShortcut* self, bool on); bool QShortcut_AutoRepeat(const QShortcut* self); int QShortcut_Id(const QShortcut* self); @@ -50,10 +50,10 @@ void QShortcut_Activated(QShortcut* self); void QShortcut_connect_Activated(QShortcut* self, intptr_t slot); void QShortcut_ActivatedAmbiguously(QShortcut* self); void QShortcut_connect_ActivatedAmbiguously(QShortcut* self, intptr_t slot); -struct miqt_string* QShortcut_Tr2(const char* s, const char* c); -struct miqt_string* QShortcut_Tr3(const char* s, const char* c, int n); -struct miqt_string* QShortcut_TrUtf82(const char* s, const char* c); -struct miqt_string* QShortcut_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QShortcut_Tr2(const char* s, const char* c); +struct miqt_string QShortcut_Tr3(const char* s, const char* c, int n); +struct miqt_string QShortcut_TrUtf82(const char* s, const char* c); +struct miqt_string QShortcut_TrUtf83(const char* s, const char* c, int n); void QShortcut_Delete(QShortcut* self); #ifdef __cplusplus diff --git a/qt/gen_qsignalmapper.cpp b/qt/gen_qsignalmapper.cpp index fb90c73a..fec0ffcc 100644 --- a/qt/gen_qsignalmapper.cpp +++ b/qt/gen_qsignalmapper.cpp @@ -25,26 +25,34 @@ void* QSignalMapper_Metacast(QSignalMapper* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QSignalMapper_Tr(const char* s) { +struct miqt_string QSignalMapper_Tr(const char* s) { QString _ret = QSignalMapper::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSignalMapper_TrUtf8(const char* s) { +struct miqt_string QSignalMapper_TrUtf8(const char* s) { QString _ret = QSignalMapper::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QSignalMapper_SetMapping(QSignalMapper* self, QObject* sender, int id) { self->setMapping(sender, static_cast(id)); } -void QSignalMapper_SetMapping2(QSignalMapper* self, QObject* sender, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QSignalMapper_SetMapping2(QSignalMapper* self, QObject* sender, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->setMapping(sender, text_QString); } @@ -64,8 +72,8 @@ QObject* QSignalMapper_Mapping(const QSignalMapper* self, int id) { return self->mapping(static_cast(id)); } -QObject* QSignalMapper_MappingWithText(const QSignalMapper* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QObject* QSignalMapper_MappingWithText(const QSignalMapper* self, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); return self->mapping(text_QString); } @@ -88,8 +96,8 @@ void QSignalMapper_connect_Mapped(QSignalMapper* self, intptr_t slot) { }); } -void QSignalMapper_MappedWithQString(QSignalMapper* self, struct miqt_string* param1) { - QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); +void QSignalMapper_MappedWithQString(QSignalMapper* self, struct miqt_string param1) { + QString param1_QString = QString::fromUtf8(param1.data, param1.len); self->mapped(param1_QString); } @@ -98,7 +106,11 @@ void QSignalMapper_connect_MappedWithQString(QSignalMapper* self, intptr_t slot) const QString param1_ret = param1; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray param1_b = param1_ret.toUtf8(); - struct miqt_string* sigval1 = miqt_strdup(param1_b.data(), param1_b.length()); + struct miqt_string param1_ms; + param1_ms.len = param1_b.length(); + param1_ms.data = static_cast(malloc(param1_ms.len)); + memcpy(param1_ms.data, param1_b.data(), param1_ms.len); + struct miqt_string sigval1 = param1_ms; miqt_exec_callback_QSignalMapper_MappedWithQString(slot, sigval1); }); } @@ -136,8 +148,8 @@ void QSignalMapper_connect_MappedInt(QSignalMapper* self, intptr_t slot) { }); } -void QSignalMapper_MappedString(QSignalMapper* self, struct miqt_string* param1) { - QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); +void QSignalMapper_MappedString(QSignalMapper* self, struct miqt_string param1) { + QString param1_QString = QString::fromUtf8(param1.data, param1.len); self->mappedString(param1_QString); } @@ -146,7 +158,11 @@ void QSignalMapper_connect_MappedString(QSignalMapper* self, intptr_t slot) { const QString param1_ret = param1; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray param1_b = param1_ret.toUtf8(); - struct miqt_string* sigval1 = miqt_strdup(param1_b.data(), param1_b.length()); + struct miqt_string param1_ms; + param1_ms.len = param1_b.length(); + param1_ms.data = static_cast(malloc(param1_ms.len)); + memcpy(param1_ms.data, param1_b.data(), param1_ms.len); + struct miqt_string sigval1 = param1_ms; miqt_exec_callback_QSignalMapper_MappedString(slot, sigval1); }); } @@ -181,32 +197,48 @@ void QSignalMapper_MapWithSender(QSignalMapper* self, QObject* sender) { self->map(sender); } -struct miqt_string* QSignalMapper_Tr2(const char* s, const char* c) { +struct miqt_string QSignalMapper_Tr2(const char* s, const char* c) { QString _ret = QSignalMapper::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSignalMapper_Tr3(const char* s, const char* c, int n) { +struct miqt_string QSignalMapper_Tr3(const char* s, const char* c, int n) { QString _ret = QSignalMapper::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSignalMapper_TrUtf82(const char* s, const char* c) { +struct miqt_string QSignalMapper_TrUtf82(const char* s, const char* c) { QString _ret = QSignalMapper::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSignalMapper_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QSignalMapper_TrUtf83(const char* s, const char* c, int n) { QString _ret = QSignalMapper::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QSignalMapper_Delete(QSignalMapper* self) { diff --git a/qt/gen_qsignalmapper.go b/qt/gen_qsignalmapper.go index 87074d04..71127ce9 100644 --- a/qt/gen_qsignalmapper.go +++ b/qt/gen_qsignalmapper.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "runtime/cgo" "unsafe" @@ -64,24 +63,24 @@ func (this *QSignalMapper) MetaObject() *QMetaObject { func (this *QSignalMapper) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QSignalMapper_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QSignalMapper_Metacast(this.h, param1_Cstring)) } func QSignalMapper_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QSignalMapper_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSignalMapper_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QSignalMapper_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QSignalMapper_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSignalMapper_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -90,9 +89,11 @@ func (this *QSignalMapper) SetMapping(sender *QObject, id int) { } func (this *QSignalMapper) SetMapping2(sender *QObject, text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QSignalMapper_SetMapping2(this.h, sender.cPointer(), (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QSignalMapper_SetMapping2(this.h, sender.cPointer(), text_ms) } func (this *QSignalMapper) SetMapping3(sender *QObject, widget *QWidget) { @@ -112,9 +113,11 @@ func (this *QSignalMapper) Mapping(id int) *QObject { } func (this *QSignalMapper) MappingWithText(text string) *QObject { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - return UnsafeNewQObject(unsafe.Pointer(C.QSignalMapper_MappingWithText(this.h, (*C.struct_miqt_string)(text_ms)))) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + return UnsafeNewQObject(unsafe.Pointer(C.QSignalMapper_MappingWithText(this.h, text_ms))) } func (this *QSignalMapper) MappingWithWidget(widget *QWidget) *QObject { @@ -146,25 +149,27 @@ func miqt_exec_callback_QSignalMapper_Mapped(cb C.intptr_t, param1 C.int) { } func (this *QSignalMapper) MappedWithQString(param1 string) { - param1_ms := libmiqt.Strdupg(param1) - defer C.free(param1_ms) - C.QSignalMapper_MappedWithQString(this.h, (*C.struct_miqt_string)(param1_ms)) + param1_ms := C.struct_miqt_string{} + param1_ms.data = C.CString(param1) + param1_ms.len = C.size_t(len(param1)) + defer C.free(unsafe.Pointer(param1_ms.data)) + C.QSignalMapper_MappedWithQString(this.h, param1_ms) } func (this *QSignalMapper) OnMappedWithQString(slot func(param1 string)) { C.QSignalMapper_connect_MappedWithQString(this.h, C.intptr_t(cgo.NewHandle(slot))) } //export miqt_exec_callback_QSignalMapper_MappedWithQString -func miqt_exec_callback_QSignalMapper_MappedWithQString(cb C.intptr_t, param1 *C.struct_miqt_string) { +func miqt_exec_callback_QSignalMapper_MappedWithQString(cb C.intptr_t, param1 C.struct_miqt_string) { gofunc, ok := cgo.Handle(cb).Value().(func(param1 string)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") } // Convert all CABI parameters to Go parameters - var param1_ms *C.struct_miqt_string = param1 - param1_ret := C.GoStringN(¶m1_ms.data, C.int(int64(param1_ms.len))) - C.free(unsafe.Pointer(param1_ms)) + var param1_ms C.struct_miqt_string = param1 + param1_ret := C.GoStringN(param1_ms.data, C.int(int64(param1_ms.len))) + C.free(unsafe.Pointer(param1_ms.data)) slotval1 := param1_ret gofunc(slotval1) @@ -231,25 +236,27 @@ func miqt_exec_callback_QSignalMapper_MappedInt(cb C.intptr_t, param1 C.int) { } func (this *QSignalMapper) MappedString(param1 string) { - param1_ms := libmiqt.Strdupg(param1) - defer C.free(param1_ms) - C.QSignalMapper_MappedString(this.h, (*C.struct_miqt_string)(param1_ms)) + param1_ms := C.struct_miqt_string{} + param1_ms.data = C.CString(param1) + param1_ms.len = C.size_t(len(param1)) + defer C.free(unsafe.Pointer(param1_ms.data)) + C.QSignalMapper_MappedString(this.h, param1_ms) } func (this *QSignalMapper) OnMappedString(slot func(param1 string)) { C.QSignalMapper_connect_MappedString(this.h, C.intptr_t(cgo.NewHandle(slot))) } //export miqt_exec_callback_QSignalMapper_MappedString -func miqt_exec_callback_QSignalMapper_MappedString(cb C.intptr_t, param1 *C.struct_miqt_string) { +func miqt_exec_callback_QSignalMapper_MappedString(cb C.intptr_t, param1 C.struct_miqt_string) { gofunc, ok := cgo.Handle(cb).Value().(func(param1 string)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") } // Convert all CABI parameters to Go parameters - var param1_ms *C.struct_miqt_string = param1 - param1_ret := C.GoStringN(¶m1_ms.data, C.int(int64(param1_ms.len))) - C.free(unsafe.Pointer(param1_ms)) + var param1_ms C.struct_miqt_string = param1 + param1_ret := C.GoStringN(param1_ms.data, C.int(int64(param1_ms.len))) + C.free(unsafe.Pointer(param1_ms.data)) slotval1 := param1_ret gofunc(slotval1) @@ -308,9 +315,9 @@ func QSignalMapper_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSignalMapper_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSignalMapper_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -319,9 +326,9 @@ func QSignalMapper_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSignalMapper_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSignalMapper_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -330,9 +337,9 @@ func QSignalMapper_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSignalMapper_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSignalMapper_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -341,9 +348,9 @@ func QSignalMapper_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSignalMapper_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSignalMapper_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qsignalmapper.h b/qt/gen_qsignalmapper.h index 0ed3774f..1a564112 100644 --- a/qt/gen_qsignalmapper.h +++ b/qt/gen_qsignalmapper.h @@ -29,20 +29,20 @@ QSignalMapper* QSignalMapper_new(); QSignalMapper* QSignalMapper_new2(QObject* parent); QMetaObject* QSignalMapper_MetaObject(const QSignalMapper* self); void* QSignalMapper_Metacast(QSignalMapper* self, const char* param1); -struct miqt_string* QSignalMapper_Tr(const char* s); -struct miqt_string* QSignalMapper_TrUtf8(const char* s); +struct miqt_string QSignalMapper_Tr(const char* s); +struct miqt_string QSignalMapper_TrUtf8(const char* s); void QSignalMapper_SetMapping(QSignalMapper* self, QObject* sender, int id); -void QSignalMapper_SetMapping2(QSignalMapper* self, QObject* sender, struct miqt_string* text); +void QSignalMapper_SetMapping2(QSignalMapper* self, QObject* sender, struct miqt_string text); void QSignalMapper_SetMapping3(QSignalMapper* self, QObject* sender, QWidget* widget); void QSignalMapper_SetMapping4(QSignalMapper* self, QObject* sender, QObject* object); void QSignalMapper_RemoveMappings(QSignalMapper* self, QObject* sender); QObject* QSignalMapper_Mapping(const QSignalMapper* self, int id); -QObject* QSignalMapper_MappingWithText(const QSignalMapper* self, struct miqt_string* text); +QObject* QSignalMapper_MappingWithText(const QSignalMapper* self, struct miqt_string text); QObject* QSignalMapper_MappingWithWidget(const QSignalMapper* self, QWidget* widget); QObject* QSignalMapper_MappingWithObject(const QSignalMapper* self, QObject* object); void QSignalMapper_Mapped(QSignalMapper* self, int param1); void QSignalMapper_connect_Mapped(QSignalMapper* self, intptr_t slot); -void QSignalMapper_MappedWithQString(QSignalMapper* self, struct miqt_string* param1); +void QSignalMapper_MappedWithQString(QSignalMapper* self, struct miqt_string param1); void QSignalMapper_connect_MappedWithQString(QSignalMapper* self, intptr_t slot); void QSignalMapper_MappedWithQWidget(QSignalMapper* self, QWidget* param1); void QSignalMapper_connect_MappedWithQWidget(QSignalMapper* self, intptr_t slot); @@ -50,7 +50,7 @@ void QSignalMapper_MappedWithQObject(QSignalMapper* self, QObject* param1); void QSignalMapper_connect_MappedWithQObject(QSignalMapper* self, intptr_t slot); void QSignalMapper_MappedInt(QSignalMapper* self, int param1); void QSignalMapper_connect_MappedInt(QSignalMapper* self, intptr_t slot); -void QSignalMapper_MappedString(QSignalMapper* self, struct miqt_string* param1); +void QSignalMapper_MappedString(QSignalMapper* self, struct miqt_string param1); void QSignalMapper_connect_MappedString(QSignalMapper* self, intptr_t slot); void QSignalMapper_MappedWidget(QSignalMapper* self, QWidget* param1); void QSignalMapper_connect_MappedWidget(QSignalMapper* self, intptr_t slot); @@ -58,10 +58,10 @@ void QSignalMapper_MappedObject(QSignalMapper* self, QObject* param1); void QSignalMapper_connect_MappedObject(QSignalMapper* self, intptr_t slot); void QSignalMapper_Map(QSignalMapper* self); void QSignalMapper_MapWithSender(QSignalMapper* self, QObject* sender); -struct miqt_string* QSignalMapper_Tr2(const char* s, const char* c); -struct miqt_string* QSignalMapper_Tr3(const char* s, const char* c, int n); -struct miqt_string* QSignalMapper_TrUtf82(const char* s, const char* c); -struct miqt_string* QSignalMapper_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QSignalMapper_Tr2(const char* s, const char* c); +struct miqt_string QSignalMapper_Tr3(const char* s, const char* c, int n); +struct miqt_string QSignalMapper_TrUtf82(const char* s, const char* c); +struct miqt_string QSignalMapper_TrUtf83(const char* s, const char* c, int n); void QSignalMapper_Delete(QSignalMapper* self); #ifdef __cplusplus diff --git a/qt/gen_qsignaltransition.cpp b/qt/gen_qsignaltransition.cpp index 82048e68..02e7dcf9 100644 --- a/qt/gen_qsignaltransition.cpp +++ b/qt/gen_qsignaltransition.cpp @@ -34,18 +34,26 @@ void* QSignalTransition_Metacast(QSignalTransition* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QSignalTransition_Tr(const char* s) { +struct miqt_string QSignalTransition_Tr(const char* s) { QString _ret = QSignalTransition::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSignalTransition_TrUtf8(const char* s) { +struct miqt_string QSignalTransition_TrUtf8(const char* s) { QString _ret = QSignalTransition::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QObject* QSignalTransition_SenderObject(const QSignalTransition* self) { @@ -56,40 +64,62 @@ void QSignalTransition_SetSenderObject(QSignalTransition* self, QObject* sender) self->setSenderObject(sender); } -QByteArray* QSignalTransition_Signal(const QSignalTransition* self) { - return new QByteArray(self->signal()); +struct miqt_string QSignalTransition_Signal(const QSignalTransition* self) { + QByteArray _qb = self->signal(); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } -void QSignalTransition_SetSignal(QSignalTransition* self, QByteArray* signal) { - self->setSignal(*signal); +void QSignalTransition_SetSignal(QSignalTransition* self, struct miqt_string signal) { + QByteArray signal_QByteArray(signal.data, signal.len); + self->setSignal(signal_QByteArray); } -struct miqt_string* QSignalTransition_Tr2(const char* s, const char* c) { +struct miqt_string QSignalTransition_Tr2(const char* s, const char* c) { QString _ret = QSignalTransition::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSignalTransition_Tr3(const char* s, const char* c, int n) { +struct miqt_string QSignalTransition_Tr3(const char* s, const char* c, int n) { QString _ret = QSignalTransition::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSignalTransition_TrUtf82(const char* s, const char* c) { +struct miqt_string QSignalTransition_TrUtf82(const char* s, const char* c) { QString _ret = QSignalTransition::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSignalTransition_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QSignalTransition_TrUtf83(const char* s, const char* c, int n) { QString _ret = QSignalTransition::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QSignalTransition_Delete(QSignalTransition* self) { diff --git a/qt/gen_qsignaltransition.go b/qt/gen_qsignaltransition.go index a72b1b7f..24de3999 100644 --- a/qt/gen_qsignaltransition.go +++ b/qt/gen_qsignaltransition.go @@ -78,24 +78,24 @@ func (this *QSignalTransition) MetaObject() *QMetaObject { func (this *QSignalTransition) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QSignalTransition_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QSignalTransition_Metacast(this.h, param1_Cstring)) } func QSignalTransition_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QSignalTransition_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSignalTransition_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QSignalTransition_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QSignalTransition_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSignalTransition_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -107,15 +107,18 @@ func (this *QSignalTransition) SetSenderObject(sender *QObject) { C.QSignalTransition_SetSenderObject(this.h, sender.cPointer()) } -func (this *QSignalTransition) Signal() *QByteArray { - _ret := C.QSignalTransition_Signal(this.h) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QSignalTransition) Signal() []byte { + var _bytearray C.struct_miqt_string = C.QSignalTransition_Signal(this.h) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } -func (this *QSignalTransition) SetSignal(signal *QByteArray) { - C.QSignalTransition_SetSignal(this.h, signal.cPointer()) +func (this *QSignalTransition) SetSignal(signal []byte) { + signal_alias := C.struct_miqt_string{} + signal_alias.data = (*C.char)(unsafe.Pointer(&signal[0])) + signal_alias.len = C.size_t(len(signal)) + C.QSignalTransition_SetSignal(this.h, signal_alias) } func QSignalTransition_Tr2(s string, c string) string { @@ -123,9 +126,9 @@ func QSignalTransition_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSignalTransition_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSignalTransition_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -134,9 +137,9 @@ func QSignalTransition_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSignalTransition_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSignalTransition_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -145,9 +148,9 @@ func QSignalTransition_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSignalTransition_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSignalTransition_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -156,9 +159,9 @@ func QSignalTransition_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSignalTransition_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSignalTransition_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qsignaltransition.h b/qt/gen_qsignaltransition.h index 217773d9..de99edb2 100644 --- a/qt/gen_qsignaltransition.h +++ b/qt/gen_qsignaltransition.h @@ -33,16 +33,16 @@ QSignalTransition* QSignalTransition_new3(QState* sourceState); QSignalTransition* QSignalTransition_new4(QObject* sender, const char* signal, QState* sourceState); QMetaObject* QSignalTransition_MetaObject(const QSignalTransition* self); void* QSignalTransition_Metacast(QSignalTransition* self, const char* param1); -struct miqt_string* QSignalTransition_Tr(const char* s); -struct miqt_string* QSignalTransition_TrUtf8(const char* s); +struct miqt_string QSignalTransition_Tr(const char* s); +struct miqt_string QSignalTransition_TrUtf8(const char* s); QObject* QSignalTransition_SenderObject(const QSignalTransition* self); void QSignalTransition_SetSenderObject(QSignalTransition* self, QObject* sender); -QByteArray* QSignalTransition_Signal(const QSignalTransition* self); -void QSignalTransition_SetSignal(QSignalTransition* self, QByteArray* signal); -struct miqt_string* QSignalTransition_Tr2(const char* s, const char* c); -struct miqt_string* QSignalTransition_Tr3(const char* s, const char* c, int n); -struct miqt_string* QSignalTransition_TrUtf82(const char* s, const char* c); -struct miqt_string* QSignalTransition_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QSignalTransition_Signal(const QSignalTransition* self); +void QSignalTransition_SetSignal(QSignalTransition* self, struct miqt_string signal); +struct miqt_string QSignalTransition_Tr2(const char* s, const char* c); +struct miqt_string QSignalTransition_Tr3(const char* s, const char* c, int n); +struct miqt_string QSignalTransition_TrUtf82(const char* s, const char* c); +struct miqt_string QSignalTransition_TrUtf83(const char* s, const char* c, int n); void QSignalTransition_Delete(QSignalTransition* self); #ifdef __cplusplus diff --git a/qt/gen_qsizegrip.cpp b/qt/gen_qsizegrip.cpp index 8cf50755..d2f5f62c 100644 --- a/qt/gen_qsizegrip.cpp +++ b/qt/gen_qsizegrip.cpp @@ -21,18 +21,26 @@ void* QSizeGrip_Metacast(QSizeGrip* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QSizeGrip_Tr(const char* s) { +struct miqt_string QSizeGrip_Tr(const char* s) { QString _ret = QSizeGrip::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSizeGrip_TrUtf8(const char* s) { +struct miqt_string QSizeGrip_TrUtf8(const char* s) { QString _ret = QSizeGrip::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QSize* QSizeGrip_SizeHint(const QSizeGrip* self) { @@ -43,32 +51,48 @@ void QSizeGrip_SetVisible(QSizeGrip* self, bool visible) { self->setVisible(visible); } -struct miqt_string* QSizeGrip_Tr2(const char* s, const char* c) { +struct miqt_string QSizeGrip_Tr2(const char* s, const char* c) { QString _ret = QSizeGrip::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSizeGrip_Tr3(const char* s, const char* c, int n) { +struct miqt_string QSizeGrip_Tr3(const char* s, const char* c, int n) { QString _ret = QSizeGrip::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSizeGrip_TrUtf82(const char* s, const char* c) { +struct miqt_string QSizeGrip_TrUtf82(const char* s, const char* c) { QString _ret = QSizeGrip::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSizeGrip_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QSizeGrip_TrUtf83(const char* s, const char* c, int n) { QString _ret = QSizeGrip::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QSizeGrip_Delete(QSizeGrip* self) { diff --git a/qt/gen_qsizegrip.go b/qt/gen_qsizegrip.go index 65ecb96e..b76caa89 100644 --- a/qt/gen_qsizegrip.go +++ b/qt/gen_qsizegrip.go @@ -56,24 +56,24 @@ func (this *QSizeGrip) MetaObject() *QMetaObject { func (this *QSizeGrip) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QSizeGrip_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QSizeGrip_Metacast(this.h, param1_Cstring)) } func QSizeGrip_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QSizeGrip_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSizeGrip_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QSizeGrip_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QSizeGrip_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSizeGrip_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -93,9 +93,9 @@ func QSizeGrip_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSizeGrip_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSizeGrip_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -104,9 +104,9 @@ func QSizeGrip_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSizeGrip_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSizeGrip_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -115,9 +115,9 @@ func QSizeGrip_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSizeGrip_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSizeGrip_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -126,9 +126,9 @@ func QSizeGrip_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSizeGrip_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSizeGrip_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qsizegrip.h b/qt/gen_qsizegrip.h index 3459ce59..880977e0 100644 --- a/qt/gen_qsizegrip.h +++ b/qt/gen_qsizegrip.h @@ -28,14 +28,14 @@ typedef struct QWidget QWidget; QSizeGrip* QSizeGrip_new(QWidget* parent); QMetaObject* QSizeGrip_MetaObject(const QSizeGrip* self); void* QSizeGrip_Metacast(QSizeGrip* self, const char* param1); -struct miqt_string* QSizeGrip_Tr(const char* s); -struct miqt_string* QSizeGrip_TrUtf8(const char* s); +struct miqt_string QSizeGrip_Tr(const char* s); +struct miqt_string QSizeGrip_TrUtf8(const char* s); QSize* QSizeGrip_SizeHint(const QSizeGrip* self); void QSizeGrip_SetVisible(QSizeGrip* self, bool visible); -struct miqt_string* QSizeGrip_Tr2(const char* s, const char* c); -struct miqt_string* QSizeGrip_Tr3(const char* s, const char* c, int n); -struct miqt_string* QSizeGrip_TrUtf82(const char* s, const char* c); -struct miqt_string* QSizeGrip_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QSizeGrip_Tr2(const char* s, const char* c); +struct miqt_string QSizeGrip_Tr3(const char* s, const char* c, int n); +struct miqt_string QSizeGrip_TrUtf82(const char* s, const char* c); +struct miqt_string QSizeGrip_TrUtf83(const char* s, const char* c, int n); void QSizeGrip_Delete(QSizeGrip* self); #ifdef __cplusplus diff --git a/qt/gen_qslider.cpp b/qt/gen_qslider.cpp index 39421136..cc68b463 100644 --- a/qt/gen_qslider.cpp +++ b/qt/gen_qslider.cpp @@ -34,18 +34,26 @@ void* QSlider_Metacast(QSlider* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QSlider_Tr(const char* s) { +struct miqt_string QSlider_Tr(const char* s) { QString _ret = QSlider::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSlider_TrUtf8(const char* s) { +struct miqt_string QSlider_TrUtf8(const char* s) { QString _ret = QSlider::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QSize* QSlider_SizeHint(const QSlider* self) { @@ -77,32 +85,48 @@ bool QSlider_Event(QSlider* self, QEvent* event) { return self->event(event); } -struct miqt_string* QSlider_Tr2(const char* s, const char* c) { +struct miqt_string QSlider_Tr2(const char* s, const char* c) { QString _ret = QSlider::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSlider_Tr3(const char* s, const char* c, int n) { +struct miqt_string QSlider_Tr3(const char* s, const char* c, int n) { QString _ret = QSlider::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSlider_TrUtf82(const char* s, const char* c) { +struct miqt_string QSlider_TrUtf82(const char* s, const char* c) { QString _ret = QSlider::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSlider_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QSlider_TrUtf83(const char* s, const char* c, int n) { QString _ret = QSlider::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QSlider_Delete(QSlider* self) { diff --git a/qt/gen_qslider.go b/qt/gen_qslider.go index fd97ec4b..bf1f8809 100644 --- a/qt/gen_qslider.go +++ b/qt/gen_qslider.go @@ -85,24 +85,24 @@ func (this *QSlider) MetaObject() *QMetaObject { func (this *QSlider) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QSlider_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QSlider_Metacast(this.h, param1_Cstring)) } func QSlider_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QSlider_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSlider_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QSlider_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QSlider_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSlider_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -145,9 +145,9 @@ func QSlider_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSlider_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSlider_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -156,9 +156,9 @@ func QSlider_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSlider_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSlider_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -167,9 +167,9 @@ func QSlider_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSlider_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSlider_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -178,9 +178,9 @@ func QSlider_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSlider_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSlider_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qslider.h b/qt/gen_qslider.h index ebf84ff5..ef534630 100644 --- a/qt/gen_qslider.h +++ b/qt/gen_qslider.h @@ -33,8 +33,8 @@ QSlider* QSlider_new3(QWidget* parent); QSlider* QSlider_new4(int orientation, QWidget* parent); QMetaObject* QSlider_MetaObject(const QSlider* self); void* QSlider_Metacast(QSlider* self, const char* param1); -struct miqt_string* QSlider_Tr(const char* s); -struct miqt_string* QSlider_TrUtf8(const char* s); +struct miqt_string QSlider_Tr(const char* s); +struct miqt_string QSlider_TrUtf8(const char* s); QSize* QSlider_SizeHint(const QSlider* self); QSize* QSlider_MinimumSizeHint(const QSlider* self); void QSlider_SetTickPosition(QSlider* self, int position); @@ -42,10 +42,10 @@ int QSlider_TickPosition(const QSlider* self); void QSlider_SetTickInterval(QSlider* self, int ti); int QSlider_TickInterval(const QSlider* self); bool QSlider_Event(QSlider* self, QEvent* event); -struct miqt_string* QSlider_Tr2(const char* s, const char* c); -struct miqt_string* QSlider_Tr3(const char* s, const char* c, int n); -struct miqt_string* QSlider_TrUtf82(const char* s, const char* c); -struct miqt_string* QSlider_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QSlider_Tr2(const char* s, const char* c); +struct miqt_string QSlider_Tr3(const char* s, const char* c, int n); +struct miqt_string QSlider_TrUtf82(const char* s, const char* c); +struct miqt_string QSlider_TrUtf83(const char* s, const char* c, int n); void QSlider_Delete(QSlider* self); #ifdef __cplusplus diff --git a/qt/gen_qsocketnotifier.cpp b/qt/gen_qsocketnotifier.cpp index 123f5b6e..88029c0f 100644 --- a/qt/gen_qsocketnotifier.cpp +++ b/qt/gen_qsocketnotifier.cpp @@ -25,18 +25,26 @@ void* QSocketNotifier_Metacast(QSocketNotifier* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QSocketNotifier_Tr(const char* s) { +struct miqt_string QSocketNotifier_Tr(const char* s) { QString _ret = QSocketNotifier::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSocketNotifier_TrUtf8(const char* s) { +struct miqt_string QSocketNotifier_TrUtf8(const char* s) { QString _ret = QSocketNotifier::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } intptr_t QSocketNotifier_Socket(const QSocketNotifier* self) { @@ -57,32 +65,48 @@ void QSocketNotifier_SetEnabled(QSocketNotifier* self, bool enabled) { self->setEnabled(enabled); } -struct miqt_string* QSocketNotifier_Tr2(const char* s, const char* c) { +struct miqt_string QSocketNotifier_Tr2(const char* s, const char* c) { QString _ret = QSocketNotifier::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSocketNotifier_Tr3(const char* s, const char* c, int n) { +struct miqt_string QSocketNotifier_Tr3(const char* s, const char* c, int n) { QString _ret = QSocketNotifier::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSocketNotifier_TrUtf82(const char* s, const char* c) { +struct miqt_string QSocketNotifier_TrUtf82(const char* s, const char* c) { QString _ret = QSocketNotifier::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSocketNotifier_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QSocketNotifier_TrUtf83(const char* s, const char* c, int n) { QString _ret = QSocketNotifier::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QSocketNotifier_Delete(QSocketNotifier* self) { diff --git a/qt/gen_qsocketnotifier.go b/qt/gen_qsocketnotifier.go index 278b9dc0..e85fa45d 100644 --- a/qt/gen_qsocketnotifier.go +++ b/qt/gen_qsocketnotifier.go @@ -70,24 +70,24 @@ func (this *QSocketNotifier) MetaObject() *QMetaObject { func (this *QSocketNotifier) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QSocketNotifier_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QSocketNotifier_Metacast(this.h, param1_Cstring)) } func QSocketNotifier_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QSocketNotifier_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSocketNotifier_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QSocketNotifier_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QSocketNotifier_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSocketNotifier_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -112,9 +112,9 @@ func QSocketNotifier_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSocketNotifier_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSocketNotifier_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -123,9 +123,9 @@ func QSocketNotifier_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSocketNotifier_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSocketNotifier_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -134,9 +134,9 @@ func QSocketNotifier_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSocketNotifier_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSocketNotifier_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -145,9 +145,9 @@ func QSocketNotifier_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSocketNotifier_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSocketNotifier_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qsocketnotifier.h b/qt/gen_qsocketnotifier.h index 1d1249cf..b3a02720 100644 --- a/qt/gen_qsocketnotifier.h +++ b/qt/gen_qsocketnotifier.h @@ -29,16 +29,16 @@ QSocketNotifier* QSocketNotifier_new(intptr_t socket, int param2); QSocketNotifier* QSocketNotifier_new2(intptr_t socket, int param2, QObject* parent); QMetaObject* QSocketNotifier_MetaObject(const QSocketNotifier* self); void* QSocketNotifier_Metacast(QSocketNotifier* self, const char* param1); -struct miqt_string* QSocketNotifier_Tr(const char* s); -struct miqt_string* QSocketNotifier_TrUtf8(const char* s); +struct miqt_string QSocketNotifier_Tr(const char* s); +struct miqt_string QSocketNotifier_TrUtf8(const char* s); intptr_t QSocketNotifier_Socket(const QSocketNotifier* self); int QSocketNotifier_Type(const QSocketNotifier* self); bool QSocketNotifier_IsEnabled(const QSocketNotifier* self); void QSocketNotifier_SetEnabled(QSocketNotifier* self, bool enabled); -struct miqt_string* QSocketNotifier_Tr2(const char* s, const char* c); -struct miqt_string* QSocketNotifier_Tr3(const char* s, const char* c, int n); -struct miqt_string* QSocketNotifier_TrUtf82(const char* s, const char* c); -struct miqt_string* QSocketNotifier_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QSocketNotifier_Tr2(const char* s, const char* c); +struct miqt_string QSocketNotifier_Tr3(const char* s, const char* c, int n); +struct miqt_string QSocketNotifier_TrUtf82(const char* s, const char* c); +struct miqt_string QSocketNotifier_TrUtf83(const char* s, const char* c, int n); void QSocketNotifier_Delete(QSocketNotifier* self); QSocketDescriptor* QSocketDescriptor_new(); diff --git a/qt/gen_qsortfilterproxymodel.cpp b/qt/gen_qsortfilterproxymodel.cpp index 66614934..3f233c30 100644 --- a/qt/gen_qsortfilterproxymodel.cpp +++ b/qt/gen_qsortfilterproxymodel.cpp @@ -32,18 +32,26 @@ void* QSortFilterProxyModel_Metacast(QSortFilterProxyModel* self, const char* pa return self->qt_metacast(param1); } -struct miqt_string* QSortFilterProxyModel_Tr(const char* s) { +struct miqt_string QSortFilterProxyModel_Tr(const char* s) { QString _ret = QSortFilterProxyModel::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSortFilterProxyModel_TrUtf8(const char* s) { +struct miqt_string QSortFilterProxyModel_TrUtf8(const char* s) { QString _ret = QSortFilterProxyModel::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QSortFilterProxyModel_SetSourceModel(QSortFilterProxyModel* self, QAbstractItemModel* sourceModel) { @@ -141,8 +149,8 @@ void QSortFilterProxyModel_SetRecursiveFilteringEnabled(QSortFilterProxyModel* s self->setRecursiveFilteringEnabled(recursive); } -void QSortFilterProxyModel_SetFilterRegExp(QSortFilterProxyModel* self, struct miqt_string* pattern) { - QString pattern_QString = QString::fromUtf8(&pattern->data, pattern->len); +void QSortFilterProxyModel_SetFilterRegExp(QSortFilterProxyModel* self, struct miqt_string pattern) { + QString pattern_QString = QString::fromUtf8(pattern.data, pattern.len); self->setFilterRegExp(pattern_QString); } @@ -150,8 +158,8 @@ void QSortFilterProxyModel_SetFilterRegExpWithRegExp(QSortFilterProxyModel* self self->setFilterRegExp(*regExp); } -void QSortFilterProxyModel_SetFilterRegularExpression(QSortFilterProxyModel* self, struct miqt_string* pattern) { - QString pattern_QString = QString::fromUtf8(&pattern->data, pattern->len); +void QSortFilterProxyModel_SetFilterRegularExpression(QSortFilterProxyModel* self, struct miqt_string pattern) { + QString pattern_QString = QString::fromUtf8(pattern.data, pattern.len); self->setFilterRegularExpression(pattern_QString); } @@ -159,13 +167,13 @@ void QSortFilterProxyModel_SetFilterRegularExpressionWithRegularExpression(QSort self->setFilterRegularExpression(*regularExpression); } -void QSortFilterProxyModel_SetFilterWildcard(QSortFilterProxyModel* self, struct miqt_string* pattern) { - QString pattern_QString = QString::fromUtf8(&pattern->data, pattern->len); +void QSortFilterProxyModel_SetFilterWildcard(QSortFilterProxyModel* self, struct miqt_string pattern) { + QString pattern_QString = QString::fromUtf8(pattern.data, pattern.len); self->setFilterWildcard(pattern_QString); } -void QSortFilterProxyModel_SetFilterFixedString(QSortFilterProxyModel* self, struct miqt_string* pattern) { - QString pattern_QString = QString::fromUtf8(&pattern->data, pattern->len); +void QSortFilterProxyModel_SetFilterFixedString(QSortFilterProxyModel* self, struct miqt_string pattern) { + QString pattern_QString = QString::fromUtf8(pattern.data, pattern.len); self->setFilterFixedString(pattern_QString); } @@ -288,12 +296,16 @@ void QSortFilterProxyModel_Sort(QSortFilterProxyModel* self, int column) { struct miqt_array* QSortFilterProxyModel_MimeTypes(const QSortFilterProxyModel* self) { QStringList _ret = self->mimeTypes(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -385,32 +397,48 @@ void QSortFilterProxyModel_connect_RecursiveFilteringEnabledChanged(QSortFilterP }); } -struct miqt_string* QSortFilterProxyModel_Tr2(const char* s, const char* c) { +struct miqt_string QSortFilterProxyModel_Tr2(const char* s, const char* c) { QString _ret = QSortFilterProxyModel::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSortFilterProxyModel_Tr3(const char* s, const char* c, int n) { +struct miqt_string QSortFilterProxyModel_Tr3(const char* s, const char* c, int n) { QString _ret = QSortFilterProxyModel::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSortFilterProxyModel_TrUtf82(const char* s, const char* c) { +struct miqt_string QSortFilterProxyModel_TrUtf82(const char* s, const char* c) { QString _ret = QSortFilterProxyModel::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSortFilterProxyModel_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QSortFilterProxyModel_TrUtf83(const char* s, const char* c, int n) { QString _ret = QSortFilterProxyModel::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QModelIndex* QSortFilterProxyModel_Index3(const QSortFilterProxyModel* self, int row, int column, QModelIndex* parent) { diff --git a/qt/gen_qsortfilterproxymodel.go b/qt/gen_qsortfilterproxymodel.go index edeeff86..d5392867 100644 --- a/qt/gen_qsortfilterproxymodel.go +++ b/qt/gen_qsortfilterproxymodel.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "runtime/cgo" "unsafe" @@ -64,24 +63,24 @@ func (this *QSortFilterProxyModel) MetaObject() *QMetaObject { func (this *QSortFilterProxyModel) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QSortFilterProxyModel_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QSortFilterProxyModel_Metacast(this.h, param1_Cstring)) } func QSortFilterProxyModel_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QSortFilterProxyModel_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSortFilterProxyModel_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QSortFilterProxyModel_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QSortFilterProxyModel_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSortFilterProxyModel_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -190,9 +189,11 @@ func (this *QSortFilterProxyModel) SetRecursiveFilteringEnabled(recursive bool) } func (this *QSortFilterProxyModel) SetFilterRegExp(pattern string) { - pattern_ms := libmiqt.Strdupg(pattern) - defer C.free(pattern_ms) - C.QSortFilterProxyModel_SetFilterRegExp(this.h, (*C.struct_miqt_string)(pattern_ms)) + pattern_ms := C.struct_miqt_string{} + pattern_ms.data = C.CString(pattern) + pattern_ms.len = C.size_t(len(pattern)) + defer C.free(unsafe.Pointer(pattern_ms.data)) + C.QSortFilterProxyModel_SetFilterRegExp(this.h, pattern_ms) } func (this *QSortFilterProxyModel) SetFilterRegExpWithRegExp(regExp *QRegExp) { @@ -200,9 +201,11 @@ func (this *QSortFilterProxyModel) SetFilterRegExpWithRegExp(regExp *QRegExp) { } func (this *QSortFilterProxyModel) SetFilterRegularExpression(pattern string) { - pattern_ms := libmiqt.Strdupg(pattern) - defer C.free(pattern_ms) - C.QSortFilterProxyModel_SetFilterRegularExpression(this.h, (*C.struct_miqt_string)(pattern_ms)) + pattern_ms := C.struct_miqt_string{} + pattern_ms.data = C.CString(pattern) + pattern_ms.len = C.size_t(len(pattern)) + defer C.free(unsafe.Pointer(pattern_ms.data)) + C.QSortFilterProxyModel_SetFilterRegularExpression(this.h, pattern_ms) } func (this *QSortFilterProxyModel) SetFilterRegularExpressionWithRegularExpression(regularExpression *QRegularExpression) { @@ -210,15 +213,19 @@ func (this *QSortFilterProxyModel) SetFilterRegularExpressionWithRegularExpressi } func (this *QSortFilterProxyModel) SetFilterWildcard(pattern string) { - pattern_ms := libmiqt.Strdupg(pattern) - defer C.free(pattern_ms) - C.QSortFilterProxyModel_SetFilterWildcard(this.h, (*C.struct_miqt_string)(pattern_ms)) + pattern_ms := C.struct_miqt_string{} + pattern_ms.data = C.CString(pattern) + pattern_ms.len = C.size_t(len(pattern)) + defer C.free(unsafe.Pointer(pattern_ms.data)) + C.QSortFilterProxyModel_SetFilterWildcard(this.h, pattern_ms) } func (this *QSortFilterProxyModel) SetFilterFixedString(pattern string) { - pattern_ms := libmiqt.Strdupg(pattern) - defer C.free(pattern_ms) - C.QSortFilterProxyModel_SetFilterFixedString(this.h, (*C.struct_miqt_string)(pattern_ms)) + pattern_ms := C.struct_miqt_string{} + pattern_ms.data = C.CString(pattern) + pattern_ms.len = C.size_t(len(pattern)) + defer C.free(unsafe.Pointer(pattern_ms.data)) + C.QSortFilterProxyModel_SetFilterFixedString(this.h, pattern_ms) } func (this *QSortFilterProxyModel) Clear() { @@ -363,11 +370,11 @@ func (this *QSortFilterProxyModel) Sort(column int) { func (this *QSortFilterProxyModel) MimeTypes() []string { var _ma *C.struct_miqt_array = C.QSortFilterProxyModel_MimeTypes(this.h) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -523,9 +530,9 @@ func QSortFilterProxyModel_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSortFilterProxyModel_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSortFilterProxyModel_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -534,9 +541,9 @@ func QSortFilterProxyModel_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSortFilterProxyModel_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSortFilterProxyModel_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -545,9 +552,9 @@ func QSortFilterProxyModel_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSortFilterProxyModel_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSortFilterProxyModel_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -556,9 +563,9 @@ func QSortFilterProxyModel_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSortFilterProxyModel_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSortFilterProxyModel_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qsortfilterproxymodel.h b/qt/gen_qsortfilterproxymodel.h index 66520903..b847ee56 100644 --- a/qt/gen_qsortfilterproxymodel.h +++ b/qt/gen_qsortfilterproxymodel.h @@ -41,8 +41,8 @@ QSortFilterProxyModel* QSortFilterProxyModel_new(); QSortFilterProxyModel* QSortFilterProxyModel_new2(QObject* parent); QMetaObject* QSortFilterProxyModel_MetaObject(const QSortFilterProxyModel* self); void* QSortFilterProxyModel_Metacast(QSortFilterProxyModel* self, const char* param1); -struct miqt_string* QSortFilterProxyModel_Tr(const char* s); -struct miqt_string* QSortFilterProxyModel_TrUtf8(const char* s); +struct miqt_string QSortFilterProxyModel_Tr(const char* s); +struct miqt_string QSortFilterProxyModel_TrUtf8(const char* s); void QSortFilterProxyModel_SetSourceModel(QSortFilterProxyModel* self, QAbstractItemModel* sourceModel); QModelIndex* QSortFilterProxyModel_MapToSource(const QSortFilterProxyModel* self, QModelIndex* proxyIndex); QModelIndex* QSortFilterProxyModel_MapFromSource(const QSortFilterProxyModel* self, QModelIndex* sourceIndex); @@ -66,12 +66,12 @@ int QSortFilterProxyModel_FilterRole(const QSortFilterProxyModel* self); void QSortFilterProxyModel_SetFilterRole(QSortFilterProxyModel* self, int role); bool QSortFilterProxyModel_IsRecursiveFilteringEnabled(const QSortFilterProxyModel* self); void QSortFilterProxyModel_SetRecursiveFilteringEnabled(QSortFilterProxyModel* self, bool recursive); -void QSortFilterProxyModel_SetFilterRegExp(QSortFilterProxyModel* self, struct miqt_string* pattern); +void QSortFilterProxyModel_SetFilterRegExp(QSortFilterProxyModel* self, struct miqt_string pattern); void QSortFilterProxyModel_SetFilterRegExpWithRegExp(QSortFilterProxyModel* self, QRegExp* regExp); -void QSortFilterProxyModel_SetFilterRegularExpression(QSortFilterProxyModel* self, struct miqt_string* pattern); +void QSortFilterProxyModel_SetFilterRegularExpression(QSortFilterProxyModel* self, struct miqt_string pattern); void QSortFilterProxyModel_SetFilterRegularExpressionWithRegularExpression(QSortFilterProxyModel* self, QRegularExpression* regularExpression); -void QSortFilterProxyModel_SetFilterWildcard(QSortFilterProxyModel* self, struct miqt_string* pattern); -void QSortFilterProxyModel_SetFilterFixedString(QSortFilterProxyModel* self, struct miqt_string* pattern); +void QSortFilterProxyModel_SetFilterWildcard(QSortFilterProxyModel* self, struct miqt_string pattern); +void QSortFilterProxyModel_SetFilterFixedString(QSortFilterProxyModel* self, struct miqt_string pattern); void QSortFilterProxyModel_Clear(QSortFilterProxyModel* self); void QSortFilterProxyModel_Invalidate(QSortFilterProxyModel* self); QModelIndex* QSortFilterProxyModel_Index(const QSortFilterProxyModel* self, int row, int column); @@ -113,10 +113,10 @@ void QSortFilterProxyModel_FilterRoleChanged(QSortFilterProxyModel* self, int fi void QSortFilterProxyModel_connect_FilterRoleChanged(QSortFilterProxyModel* self, intptr_t slot); void QSortFilterProxyModel_RecursiveFilteringEnabledChanged(QSortFilterProxyModel* self, bool recursiveFilteringEnabled); void QSortFilterProxyModel_connect_RecursiveFilteringEnabledChanged(QSortFilterProxyModel* self, intptr_t slot); -struct miqt_string* QSortFilterProxyModel_Tr2(const char* s, const char* c); -struct miqt_string* QSortFilterProxyModel_Tr3(const char* s, const char* c, int n); -struct miqt_string* QSortFilterProxyModel_TrUtf82(const char* s, const char* c); -struct miqt_string* QSortFilterProxyModel_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QSortFilterProxyModel_Tr2(const char* s, const char* c); +struct miqt_string QSortFilterProxyModel_Tr3(const char* s, const char* c, int n); +struct miqt_string QSortFilterProxyModel_TrUtf82(const char* s, const char* c); +struct miqt_string QSortFilterProxyModel_TrUtf83(const char* s, const char* c, int n); QModelIndex* QSortFilterProxyModel_Index3(const QSortFilterProxyModel* self, int row, int column, QModelIndex* parent); int QSortFilterProxyModel_RowCount1(const QSortFilterProxyModel* self, QModelIndex* parent); int QSortFilterProxyModel_ColumnCount1(const QSortFilterProxyModel* self, QModelIndex* parent); diff --git a/qt/gen_qspinbox.cpp b/qt/gen_qspinbox.cpp index 507a74af..5a852a77 100644 --- a/qt/gen_qspinbox.cpp +++ b/qt/gen_qspinbox.cpp @@ -25,53 +25,73 @@ void* QSpinBox_Metacast(QSpinBox* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QSpinBox_Tr(const char* s) { +struct miqt_string QSpinBox_Tr(const char* s) { QString _ret = QSpinBox::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSpinBox_TrUtf8(const char* s) { +struct miqt_string QSpinBox_TrUtf8(const char* s) { QString _ret = QSpinBox::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QSpinBox_Value(const QSpinBox* self) { return self->value(); } -struct miqt_string* QSpinBox_Prefix(const QSpinBox* self) { +struct miqt_string QSpinBox_Prefix(const QSpinBox* self) { QString _ret = self->prefix(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QSpinBox_SetPrefix(QSpinBox* self, struct miqt_string* prefix) { - QString prefix_QString = QString::fromUtf8(&prefix->data, prefix->len); +void QSpinBox_SetPrefix(QSpinBox* self, struct miqt_string prefix) { + QString prefix_QString = QString::fromUtf8(prefix.data, prefix.len); self->setPrefix(prefix_QString); } -struct miqt_string* QSpinBox_Suffix(const QSpinBox* self) { +struct miqt_string QSpinBox_Suffix(const QSpinBox* self) { QString _ret = self->suffix(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QSpinBox_SetSuffix(QSpinBox* self, struct miqt_string* suffix) { - QString suffix_QString = QString::fromUtf8(&suffix->data, suffix->len); +void QSpinBox_SetSuffix(QSpinBox* self, struct miqt_string suffix) { + QString suffix_QString = QString::fromUtf8(suffix.data, suffix.len); self->setSuffix(suffix_QString); } -struct miqt_string* QSpinBox_CleanText(const QSpinBox* self) { +struct miqt_string QSpinBox_CleanText(const QSpinBox* self) { QString _ret = self->cleanText(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QSpinBox_SingleStep(const QSpinBox* self) { @@ -134,8 +154,8 @@ void QSpinBox_connect_ValueChanged(QSpinBox* self, intptr_t slot) { }); } -void QSpinBox_TextChanged(QSpinBox* self, struct miqt_string* param1) { - QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); +void QSpinBox_TextChanged(QSpinBox* self, struct miqt_string param1) { + QString param1_QString = QString::fromUtf8(param1.data, param1.len); self->textChanged(param1_QString); } @@ -144,13 +164,17 @@ void QSpinBox_connect_TextChanged(QSpinBox* self, intptr_t slot) { const QString param1_ret = param1; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray param1_b = param1_ret.toUtf8(); - struct miqt_string* sigval1 = miqt_strdup(param1_b.data(), param1_b.length()); + struct miqt_string param1_ms; + param1_ms.len = param1_b.length(); + param1_ms.data = static_cast(malloc(param1_ms.len)); + memcpy(param1_ms.data, param1_b.data(), param1_ms.len); + struct miqt_string sigval1 = param1_ms; miqt_exec_callback_QSpinBox_TextChanged(slot, sigval1); }); } -void QSpinBox_ValueChangedWithQString(QSpinBox* self, struct miqt_string* param1) { - QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); +void QSpinBox_ValueChangedWithQString(QSpinBox* self, struct miqt_string param1) { + QString param1_QString = QString::fromUtf8(param1.data, param1.len); self->valueChanged(param1_QString); } @@ -159,37 +183,57 @@ void QSpinBox_connect_ValueChangedWithQString(QSpinBox* self, intptr_t slot) { const QString param1_ret = param1; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray param1_b = param1_ret.toUtf8(); - struct miqt_string* sigval1 = miqt_strdup(param1_b.data(), param1_b.length()); + struct miqt_string param1_ms; + param1_ms.len = param1_b.length(); + param1_ms.data = static_cast(malloc(param1_ms.len)); + memcpy(param1_ms.data, param1_b.data(), param1_ms.len); + struct miqt_string sigval1 = param1_ms; miqt_exec_callback_QSpinBox_ValueChangedWithQString(slot, sigval1); }); } -struct miqt_string* QSpinBox_Tr2(const char* s, const char* c) { +struct miqt_string QSpinBox_Tr2(const char* s, const char* c) { QString _ret = QSpinBox::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSpinBox_Tr3(const char* s, const char* c, int n) { +struct miqt_string QSpinBox_Tr3(const char* s, const char* c, int n) { QString _ret = QSpinBox::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSpinBox_TrUtf82(const char* s, const char* c) { +struct miqt_string QSpinBox_TrUtf82(const char* s, const char* c) { QString _ret = QSpinBox::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSpinBox_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QSpinBox_TrUtf83(const char* s, const char* c, int n) { QString _ret = QSpinBox::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QSpinBox_Delete(QSpinBox* self) { @@ -212,53 +256,73 @@ void* QDoubleSpinBox_Metacast(QDoubleSpinBox* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QDoubleSpinBox_Tr(const char* s) { +struct miqt_string QDoubleSpinBox_Tr(const char* s) { QString _ret = QDoubleSpinBox::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDoubleSpinBox_TrUtf8(const char* s) { +struct miqt_string QDoubleSpinBox_TrUtf8(const char* s) { QString _ret = QDoubleSpinBox::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } double QDoubleSpinBox_Value(const QDoubleSpinBox* self) { return self->value(); } -struct miqt_string* QDoubleSpinBox_Prefix(const QDoubleSpinBox* self) { +struct miqt_string QDoubleSpinBox_Prefix(const QDoubleSpinBox* self) { QString _ret = self->prefix(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QDoubleSpinBox_SetPrefix(QDoubleSpinBox* self, struct miqt_string* prefix) { - QString prefix_QString = QString::fromUtf8(&prefix->data, prefix->len); +void QDoubleSpinBox_SetPrefix(QDoubleSpinBox* self, struct miqt_string prefix) { + QString prefix_QString = QString::fromUtf8(prefix.data, prefix.len); self->setPrefix(prefix_QString); } -struct miqt_string* QDoubleSpinBox_Suffix(const QDoubleSpinBox* self) { +struct miqt_string QDoubleSpinBox_Suffix(const QDoubleSpinBox* self) { QString _ret = self->suffix(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QDoubleSpinBox_SetSuffix(QDoubleSpinBox* self, struct miqt_string* suffix) { - QString suffix_QString = QString::fromUtf8(&suffix->data, suffix->len); +void QDoubleSpinBox_SetSuffix(QDoubleSpinBox* self, struct miqt_string suffix) { + QString suffix_QString = QString::fromUtf8(suffix.data, suffix.len); self->setSuffix(suffix_QString); } -struct miqt_string* QDoubleSpinBox_CleanText(const QDoubleSpinBox* self) { +struct miqt_string QDoubleSpinBox_CleanText(const QDoubleSpinBox* self) { QString _ret = self->cleanText(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } double QDoubleSpinBox_SingleStep(const QDoubleSpinBox* self) { @@ -306,26 +370,30 @@ void QDoubleSpinBox_SetDecimals(QDoubleSpinBox* self, int prec) { self->setDecimals(static_cast(prec)); } -int QDoubleSpinBox_Validate(const QDoubleSpinBox* self, struct miqt_string* input, int* pos) { - QString input_QString = QString::fromUtf8(&input->data, input->len); +int QDoubleSpinBox_Validate(const QDoubleSpinBox* self, struct miqt_string input, int* pos) { + QString input_QString = QString::fromUtf8(input.data, input.len); QValidator::State _ret = self->validate(input_QString, static_cast(*pos)); return static_cast(_ret); } -double QDoubleSpinBox_ValueFromText(const QDoubleSpinBox* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +double QDoubleSpinBox_ValueFromText(const QDoubleSpinBox* self, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); return self->valueFromText(text_QString); } -struct miqt_string* QDoubleSpinBox_TextFromValue(const QDoubleSpinBox* self, double val) { +struct miqt_string QDoubleSpinBox_TextFromValue(const QDoubleSpinBox* self, double val) { QString _ret = self->textFromValue(static_cast(val)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QDoubleSpinBox_Fixup(const QDoubleSpinBox* self, struct miqt_string* str) { - QString str_QString = QString::fromUtf8(&str->data, str->len); +void QDoubleSpinBox_Fixup(const QDoubleSpinBox* self, struct miqt_string str) { + QString str_QString = QString::fromUtf8(str.data, str.len); self->fixup(str_QString); } @@ -344,8 +412,8 @@ void QDoubleSpinBox_connect_ValueChanged(QDoubleSpinBox* self, intptr_t slot) { }); } -void QDoubleSpinBox_TextChanged(QDoubleSpinBox* self, struct miqt_string* param1) { - QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); +void QDoubleSpinBox_TextChanged(QDoubleSpinBox* self, struct miqt_string param1) { + QString param1_QString = QString::fromUtf8(param1.data, param1.len); self->textChanged(param1_QString); } @@ -354,13 +422,17 @@ void QDoubleSpinBox_connect_TextChanged(QDoubleSpinBox* self, intptr_t slot) { const QString param1_ret = param1; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray param1_b = param1_ret.toUtf8(); - struct miqt_string* sigval1 = miqt_strdup(param1_b.data(), param1_b.length()); + struct miqt_string param1_ms; + param1_ms.len = param1_b.length(); + param1_ms.data = static_cast(malloc(param1_ms.len)); + memcpy(param1_ms.data, param1_b.data(), param1_ms.len); + struct miqt_string sigval1 = param1_ms; miqt_exec_callback_QDoubleSpinBox_TextChanged(slot, sigval1); }); } -void QDoubleSpinBox_ValueChangedWithQString(QDoubleSpinBox* self, struct miqt_string* param1) { - QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); +void QDoubleSpinBox_ValueChangedWithQString(QDoubleSpinBox* self, struct miqt_string param1) { + QString param1_QString = QString::fromUtf8(param1.data, param1.len); self->valueChanged(param1_QString); } @@ -369,37 +441,57 @@ void QDoubleSpinBox_connect_ValueChangedWithQString(QDoubleSpinBox* self, intptr const QString param1_ret = param1; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray param1_b = param1_ret.toUtf8(); - struct miqt_string* sigval1 = miqt_strdup(param1_b.data(), param1_b.length()); + struct miqt_string param1_ms; + param1_ms.len = param1_b.length(); + param1_ms.data = static_cast(malloc(param1_ms.len)); + memcpy(param1_ms.data, param1_b.data(), param1_ms.len); + struct miqt_string sigval1 = param1_ms; miqt_exec_callback_QDoubleSpinBox_ValueChangedWithQString(slot, sigval1); }); } -struct miqt_string* QDoubleSpinBox_Tr2(const char* s, const char* c) { +struct miqt_string QDoubleSpinBox_Tr2(const char* s, const char* c) { QString _ret = QDoubleSpinBox::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDoubleSpinBox_Tr3(const char* s, const char* c, int n) { +struct miqt_string QDoubleSpinBox_Tr3(const char* s, const char* c, int n) { QString _ret = QDoubleSpinBox::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDoubleSpinBox_TrUtf82(const char* s, const char* c) { +struct miqt_string QDoubleSpinBox_TrUtf82(const char* s, const char* c) { QString _ret = QDoubleSpinBox::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDoubleSpinBox_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QDoubleSpinBox_TrUtf83(const char* s, const char* c, int n) { QString _ret = QDoubleSpinBox::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QDoubleSpinBox_Delete(QDoubleSpinBox* self) { diff --git a/qt/gen_qspinbox.go b/qt/gen_qspinbox.go index 6fedfb91..b17e3e8a 100644 --- a/qt/gen_qspinbox.go +++ b/qt/gen_qspinbox.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "runtime/cgo" "unsafe" @@ -64,24 +63,24 @@ func (this *QSpinBox) MetaObject() *QMetaObject { func (this *QSpinBox) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QSpinBox_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QSpinBox_Metacast(this.h, param1_Cstring)) } func QSpinBox_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QSpinBox_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSpinBox_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QSpinBox_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QSpinBox_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSpinBox_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -90,35 +89,39 @@ func (this *QSpinBox) Value() int { } func (this *QSpinBox) Prefix() string { - var _ms *C.struct_miqt_string = C.QSpinBox_Prefix(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSpinBox_Prefix(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QSpinBox) SetPrefix(prefix string) { - prefix_ms := libmiqt.Strdupg(prefix) - defer C.free(prefix_ms) - C.QSpinBox_SetPrefix(this.h, (*C.struct_miqt_string)(prefix_ms)) + prefix_ms := C.struct_miqt_string{} + prefix_ms.data = C.CString(prefix) + prefix_ms.len = C.size_t(len(prefix)) + defer C.free(unsafe.Pointer(prefix_ms.data)) + C.QSpinBox_SetPrefix(this.h, prefix_ms) } func (this *QSpinBox) Suffix() string { - var _ms *C.struct_miqt_string = C.QSpinBox_Suffix(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSpinBox_Suffix(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QSpinBox) SetSuffix(suffix string) { - suffix_ms := libmiqt.Strdupg(suffix) - defer C.free(suffix_ms) - C.QSpinBox_SetSuffix(this.h, (*C.struct_miqt_string)(suffix_ms)) + suffix_ms := C.struct_miqt_string{} + suffix_ms.data = C.CString(suffix) + suffix_ms.len = C.size_t(len(suffix)) + defer C.free(unsafe.Pointer(suffix_ms.data)) + C.QSpinBox_SetSuffix(this.h, suffix_ms) } func (this *QSpinBox) CleanText() string { - var _ms *C.struct_miqt_string = C.QSpinBox_CleanText(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSpinBox_CleanText(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -191,50 +194,54 @@ func miqt_exec_callback_QSpinBox_ValueChanged(cb C.intptr_t, param1 C.int) { } func (this *QSpinBox) TextChanged(param1 string) { - param1_ms := libmiqt.Strdupg(param1) - defer C.free(param1_ms) - C.QSpinBox_TextChanged(this.h, (*C.struct_miqt_string)(param1_ms)) + param1_ms := C.struct_miqt_string{} + param1_ms.data = C.CString(param1) + param1_ms.len = C.size_t(len(param1)) + defer C.free(unsafe.Pointer(param1_ms.data)) + C.QSpinBox_TextChanged(this.h, param1_ms) } func (this *QSpinBox) OnTextChanged(slot func(param1 string)) { C.QSpinBox_connect_TextChanged(this.h, C.intptr_t(cgo.NewHandle(slot))) } //export miqt_exec_callback_QSpinBox_TextChanged -func miqt_exec_callback_QSpinBox_TextChanged(cb C.intptr_t, param1 *C.struct_miqt_string) { +func miqt_exec_callback_QSpinBox_TextChanged(cb C.intptr_t, param1 C.struct_miqt_string) { gofunc, ok := cgo.Handle(cb).Value().(func(param1 string)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") } // Convert all CABI parameters to Go parameters - var param1_ms *C.struct_miqt_string = param1 - param1_ret := C.GoStringN(¶m1_ms.data, C.int(int64(param1_ms.len))) - C.free(unsafe.Pointer(param1_ms)) + var param1_ms C.struct_miqt_string = param1 + param1_ret := C.GoStringN(param1_ms.data, C.int(int64(param1_ms.len))) + C.free(unsafe.Pointer(param1_ms.data)) slotval1 := param1_ret gofunc(slotval1) } func (this *QSpinBox) ValueChangedWithQString(param1 string) { - param1_ms := libmiqt.Strdupg(param1) - defer C.free(param1_ms) - C.QSpinBox_ValueChangedWithQString(this.h, (*C.struct_miqt_string)(param1_ms)) + param1_ms := C.struct_miqt_string{} + param1_ms.data = C.CString(param1) + param1_ms.len = C.size_t(len(param1)) + defer C.free(unsafe.Pointer(param1_ms.data)) + C.QSpinBox_ValueChangedWithQString(this.h, param1_ms) } func (this *QSpinBox) OnValueChangedWithQString(slot func(param1 string)) { C.QSpinBox_connect_ValueChangedWithQString(this.h, C.intptr_t(cgo.NewHandle(slot))) } //export miqt_exec_callback_QSpinBox_ValueChangedWithQString -func miqt_exec_callback_QSpinBox_ValueChangedWithQString(cb C.intptr_t, param1 *C.struct_miqt_string) { +func miqt_exec_callback_QSpinBox_ValueChangedWithQString(cb C.intptr_t, param1 C.struct_miqt_string) { gofunc, ok := cgo.Handle(cb).Value().(func(param1 string)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") } // Convert all CABI parameters to Go parameters - var param1_ms *C.struct_miqt_string = param1 - param1_ret := C.GoStringN(¶m1_ms.data, C.int(int64(param1_ms.len))) - C.free(unsafe.Pointer(param1_ms)) + var param1_ms C.struct_miqt_string = param1 + param1_ret := C.GoStringN(param1_ms.data, C.int(int64(param1_ms.len))) + C.free(unsafe.Pointer(param1_ms.data)) slotval1 := param1_ret gofunc(slotval1) @@ -245,9 +252,9 @@ func QSpinBox_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSpinBox_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSpinBox_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -256,9 +263,9 @@ func QSpinBox_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSpinBox_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSpinBox_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -267,9 +274,9 @@ func QSpinBox_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSpinBox_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSpinBox_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -278,9 +285,9 @@ func QSpinBox_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSpinBox_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSpinBox_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -347,24 +354,24 @@ func (this *QDoubleSpinBox) MetaObject() *QMetaObject { func (this *QDoubleSpinBox) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QDoubleSpinBox_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QDoubleSpinBox_Metacast(this.h, param1_Cstring)) } func QDoubleSpinBox_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QDoubleSpinBox_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDoubleSpinBox_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QDoubleSpinBox_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QDoubleSpinBox_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDoubleSpinBox_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -373,35 +380,39 @@ func (this *QDoubleSpinBox) Value() float64 { } func (this *QDoubleSpinBox) Prefix() string { - var _ms *C.struct_miqt_string = C.QDoubleSpinBox_Prefix(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDoubleSpinBox_Prefix(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QDoubleSpinBox) SetPrefix(prefix string) { - prefix_ms := libmiqt.Strdupg(prefix) - defer C.free(prefix_ms) - C.QDoubleSpinBox_SetPrefix(this.h, (*C.struct_miqt_string)(prefix_ms)) + prefix_ms := C.struct_miqt_string{} + prefix_ms.data = C.CString(prefix) + prefix_ms.len = C.size_t(len(prefix)) + defer C.free(unsafe.Pointer(prefix_ms.data)) + C.QDoubleSpinBox_SetPrefix(this.h, prefix_ms) } func (this *QDoubleSpinBox) Suffix() string { - var _ms *C.struct_miqt_string = C.QDoubleSpinBox_Suffix(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDoubleSpinBox_Suffix(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QDoubleSpinBox) SetSuffix(suffix string) { - suffix_ms := libmiqt.Strdupg(suffix) - defer C.free(suffix_ms) - C.QDoubleSpinBox_SetSuffix(this.h, (*C.struct_miqt_string)(suffix_ms)) + suffix_ms := C.struct_miqt_string{} + suffix_ms.data = C.CString(suffix) + suffix_ms.len = C.size_t(len(suffix)) + defer C.free(unsafe.Pointer(suffix_ms.data)) + C.QDoubleSpinBox_SetSuffix(this.h, suffix_ms) } func (this *QDoubleSpinBox) CleanText() string { - var _ms *C.struct_miqt_string = C.QDoubleSpinBox_CleanText(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDoubleSpinBox_CleanText(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -450,28 +461,34 @@ func (this *QDoubleSpinBox) SetDecimals(prec int) { } func (this *QDoubleSpinBox) Validate(input string, pos *int) QValidator__State { - input_ms := libmiqt.Strdupg(input) - defer C.free(input_ms) - return (QValidator__State)(C.QDoubleSpinBox_Validate(this.h, (*C.struct_miqt_string)(input_ms), (*C.int)(unsafe.Pointer(pos)))) + input_ms := C.struct_miqt_string{} + input_ms.data = C.CString(input) + input_ms.len = C.size_t(len(input)) + defer C.free(unsafe.Pointer(input_ms.data)) + return (QValidator__State)(C.QDoubleSpinBox_Validate(this.h, input_ms, (*C.int)(unsafe.Pointer(pos)))) } func (this *QDoubleSpinBox) ValueFromText(text string) float64 { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - return (float64)(C.QDoubleSpinBox_ValueFromText(this.h, (*C.struct_miqt_string)(text_ms))) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + return (float64)(C.QDoubleSpinBox_ValueFromText(this.h, text_ms)) } func (this *QDoubleSpinBox) TextFromValue(val float64) string { - var _ms *C.struct_miqt_string = C.QDoubleSpinBox_TextFromValue(this.h, (C.double)(val)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDoubleSpinBox_TextFromValue(this.h, (C.double)(val)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QDoubleSpinBox) Fixup(str string) { - str_ms := libmiqt.Strdupg(str) - defer C.free(str_ms) - C.QDoubleSpinBox_Fixup(this.h, (*C.struct_miqt_string)(str_ms)) + str_ms := C.struct_miqt_string{} + str_ms.data = C.CString(str) + str_ms.len = C.size_t(len(str)) + defer C.free(unsafe.Pointer(str_ms.data)) + C.QDoubleSpinBox_Fixup(this.h, str_ms) } func (this *QDoubleSpinBox) SetValue(val float64) { @@ -499,50 +516,54 @@ func miqt_exec_callback_QDoubleSpinBox_ValueChanged(cb C.intptr_t, param1 C.doub } func (this *QDoubleSpinBox) TextChanged(param1 string) { - param1_ms := libmiqt.Strdupg(param1) - defer C.free(param1_ms) - C.QDoubleSpinBox_TextChanged(this.h, (*C.struct_miqt_string)(param1_ms)) + param1_ms := C.struct_miqt_string{} + param1_ms.data = C.CString(param1) + param1_ms.len = C.size_t(len(param1)) + defer C.free(unsafe.Pointer(param1_ms.data)) + C.QDoubleSpinBox_TextChanged(this.h, param1_ms) } func (this *QDoubleSpinBox) OnTextChanged(slot func(param1 string)) { C.QDoubleSpinBox_connect_TextChanged(this.h, C.intptr_t(cgo.NewHandle(slot))) } //export miqt_exec_callback_QDoubleSpinBox_TextChanged -func miqt_exec_callback_QDoubleSpinBox_TextChanged(cb C.intptr_t, param1 *C.struct_miqt_string) { +func miqt_exec_callback_QDoubleSpinBox_TextChanged(cb C.intptr_t, param1 C.struct_miqt_string) { gofunc, ok := cgo.Handle(cb).Value().(func(param1 string)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") } // Convert all CABI parameters to Go parameters - var param1_ms *C.struct_miqt_string = param1 - param1_ret := C.GoStringN(¶m1_ms.data, C.int(int64(param1_ms.len))) - C.free(unsafe.Pointer(param1_ms)) + var param1_ms C.struct_miqt_string = param1 + param1_ret := C.GoStringN(param1_ms.data, C.int(int64(param1_ms.len))) + C.free(unsafe.Pointer(param1_ms.data)) slotval1 := param1_ret gofunc(slotval1) } func (this *QDoubleSpinBox) ValueChangedWithQString(param1 string) { - param1_ms := libmiqt.Strdupg(param1) - defer C.free(param1_ms) - C.QDoubleSpinBox_ValueChangedWithQString(this.h, (*C.struct_miqt_string)(param1_ms)) + param1_ms := C.struct_miqt_string{} + param1_ms.data = C.CString(param1) + param1_ms.len = C.size_t(len(param1)) + defer C.free(unsafe.Pointer(param1_ms.data)) + C.QDoubleSpinBox_ValueChangedWithQString(this.h, param1_ms) } func (this *QDoubleSpinBox) OnValueChangedWithQString(slot func(param1 string)) { C.QDoubleSpinBox_connect_ValueChangedWithQString(this.h, C.intptr_t(cgo.NewHandle(slot))) } //export miqt_exec_callback_QDoubleSpinBox_ValueChangedWithQString -func miqt_exec_callback_QDoubleSpinBox_ValueChangedWithQString(cb C.intptr_t, param1 *C.struct_miqt_string) { +func miqt_exec_callback_QDoubleSpinBox_ValueChangedWithQString(cb C.intptr_t, param1 C.struct_miqt_string) { gofunc, ok := cgo.Handle(cb).Value().(func(param1 string)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") } // Convert all CABI parameters to Go parameters - var param1_ms *C.struct_miqt_string = param1 - param1_ret := C.GoStringN(¶m1_ms.data, C.int(int64(param1_ms.len))) - C.free(unsafe.Pointer(param1_ms)) + var param1_ms C.struct_miqt_string = param1 + param1_ret := C.GoStringN(param1_ms.data, C.int(int64(param1_ms.len))) + C.free(unsafe.Pointer(param1_ms.data)) slotval1 := param1_ret gofunc(slotval1) @@ -553,9 +574,9 @@ func QDoubleSpinBox_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDoubleSpinBox_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDoubleSpinBox_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -564,9 +585,9 @@ func QDoubleSpinBox_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDoubleSpinBox_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDoubleSpinBox_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -575,9 +596,9 @@ func QDoubleSpinBox_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDoubleSpinBox_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDoubleSpinBox_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -586,9 +607,9 @@ func QDoubleSpinBox_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDoubleSpinBox_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDoubleSpinBox_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qspinbox.h b/qt/gen_qspinbox.h index 2248d14a..8378dda9 100644 --- a/qt/gen_qspinbox.h +++ b/qt/gen_qspinbox.h @@ -29,14 +29,14 @@ QSpinBox* QSpinBox_new(); QSpinBox* QSpinBox_new2(QWidget* parent); QMetaObject* QSpinBox_MetaObject(const QSpinBox* self); void* QSpinBox_Metacast(QSpinBox* self, const char* param1); -struct miqt_string* QSpinBox_Tr(const char* s); -struct miqt_string* QSpinBox_TrUtf8(const char* s); +struct miqt_string QSpinBox_Tr(const char* s); +struct miqt_string QSpinBox_TrUtf8(const char* s); int QSpinBox_Value(const QSpinBox* self); -struct miqt_string* QSpinBox_Prefix(const QSpinBox* self); -void QSpinBox_SetPrefix(QSpinBox* self, struct miqt_string* prefix); -struct miqt_string* QSpinBox_Suffix(const QSpinBox* self); -void QSpinBox_SetSuffix(QSpinBox* self, struct miqt_string* suffix); -struct miqt_string* QSpinBox_CleanText(const QSpinBox* self); +struct miqt_string QSpinBox_Prefix(const QSpinBox* self); +void QSpinBox_SetPrefix(QSpinBox* self, struct miqt_string prefix); +struct miqt_string QSpinBox_Suffix(const QSpinBox* self); +void QSpinBox_SetSuffix(QSpinBox* self, struct miqt_string suffix); +struct miqt_string QSpinBox_CleanText(const QSpinBox* self); int QSpinBox_SingleStep(const QSpinBox* self); void QSpinBox_SetSingleStep(QSpinBox* self, int val); int QSpinBox_Minimum(const QSpinBox* self); @@ -51,28 +51,28 @@ void QSpinBox_SetDisplayIntegerBase(QSpinBox* self, int base); void QSpinBox_SetValue(QSpinBox* self, int val); void QSpinBox_ValueChanged(QSpinBox* self, int param1); void QSpinBox_connect_ValueChanged(QSpinBox* self, intptr_t slot); -void QSpinBox_TextChanged(QSpinBox* self, struct miqt_string* param1); +void QSpinBox_TextChanged(QSpinBox* self, struct miqt_string param1); void QSpinBox_connect_TextChanged(QSpinBox* self, intptr_t slot); -void QSpinBox_ValueChangedWithQString(QSpinBox* self, struct miqt_string* param1); +void QSpinBox_ValueChangedWithQString(QSpinBox* self, struct miqt_string param1); void QSpinBox_connect_ValueChangedWithQString(QSpinBox* self, intptr_t slot); -struct miqt_string* QSpinBox_Tr2(const char* s, const char* c); -struct miqt_string* QSpinBox_Tr3(const char* s, const char* c, int n); -struct miqt_string* QSpinBox_TrUtf82(const char* s, const char* c); -struct miqt_string* QSpinBox_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QSpinBox_Tr2(const char* s, const char* c); +struct miqt_string QSpinBox_Tr3(const char* s, const char* c, int n); +struct miqt_string QSpinBox_TrUtf82(const char* s, const char* c); +struct miqt_string QSpinBox_TrUtf83(const char* s, const char* c, int n); void QSpinBox_Delete(QSpinBox* self); QDoubleSpinBox* QDoubleSpinBox_new(); QDoubleSpinBox* QDoubleSpinBox_new2(QWidget* parent); QMetaObject* QDoubleSpinBox_MetaObject(const QDoubleSpinBox* self); void* QDoubleSpinBox_Metacast(QDoubleSpinBox* self, const char* param1); -struct miqt_string* QDoubleSpinBox_Tr(const char* s); -struct miqt_string* QDoubleSpinBox_TrUtf8(const char* s); +struct miqt_string QDoubleSpinBox_Tr(const char* s); +struct miqt_string QDoubleSpinBox_TrUtf8(const char* s); double QDoubleSpinBox_Value(const QDoubleSpinBox* self); -struct miqt_string* QDoubleSpinBox_Prefix(const QDoubleSpinBox* self); -void QDoubleSpinBox_SetPrefix(QDoubleSpinBox* self, struct miqt_string* prefix); -struct miqt_string* QDoubleSpinBox_Suffix(const QDoubleSpinBox* self); -void QDoubleSpinBox_SetSuffix(QDoubleSpinBox* self, struct miqt_string* suffix); -struct miqt_string* QDoubleSpinBox_CleanText(const QDoubleSpinBox* self); +struct miqt_string QDoubleSpinBox_Prefix(const QDoubleSpinBox* self); +void QDoubleSpinBox_SetPrefix(QDoubleSpinBox* self, struct miqt_string prefix); +struct miqt_string QDoubleSpinBox_Suffix(const QDoubleSpinBox* self); +void QDoubleSpinBox_SetSuffix(QDoubleSpinBox* self, struct miqt_string suffix); +struct miqt_string QDoubleSpinBox_CleanText(const QDoubleSpinBox* self); double QDoubleSpinBox_SingleStep(const QDoubleSpinBox* self); void QDoubleSpinBox_SetSingleStep(QDoubleSpinBox* self, double val); double QDoubleSpinBox_Minimum(const QDoubleSpinBox* self); @@ -84,21 +84,21 @@ int QDoubleSpinBox_StepType(const QDoubleSpinBox* self); void QDoubleSpinBox_SetStepType(QDoubleSpinBox* self, int stepType); int QDoubleSpinBox_Decimals(const QDoubleSpinBox* self); void QDoubleSpinBox_SetDecimals(QDoubleSpinBox* self, int prec); -int QDoubleSpinBox_Validate(const QDoubleSpinBox* self, struct miqt_string* input, int* pos); -double QDoubleSpinBox_ValueFromText(const QDoubleSpinBox* self, struct miqt_string* text); -struct miqt_string* QDoubleSpinBox_TextFromValue(const QDoubleSpinBox* self, double val); -void QDoubleSpinBox_Fixup(const QDoubleSpinBox* self, struct miqt_string* str); +int QDoubleSpinBox_Validate(const QDoubleSpinBox* self, struct miqt_string input, int* pos); +double QDoubleSpinBox_ValueFromText(const QDoubleSpinBox* self, struct miqt_string text); +struct miqt_string QDoubleSpinBox_TextFromValue(const QDoubleSpinBox* self, double val); +void QDoubleSpinBox_Fixup(const QDoubleSpinBox* self, struct miqt_string str); void QDoubleSpinBox_SetValue(QDoubleSpinBox* self, double val); void QDoubleSpinBox_ValueChanged(QDoubleSpinBox* self, double param1); void QDoubleSpinBox_connect_ValueChanged(QDoubleSpinBox* self, intptr_t slot); -void QDoubleSpinBox_TextChanged(QDoubleSpinBox* self, struct miqt_string* param1); +void QDoubleSpinBox_TextChanged(QDoubleSpinBox* self, struct miqt_string param1); void QDoubleSpinBox_connect_TextChanged(QDoubleSpinBox* self, intptr_t slot); -void QDoubleSpinBox_ValueChangedWithQString(QDoubleSpinBox* self, struct miqt_string* param1); +void QDoubleSpinBox_ValueChangedWithQString(QDoubleSpinBox* self, struct miqt_string param1); void QDoubleSpinBox_connect_ValueChangedWithQString(QDoubleSpinBox* self, intptr_t slot); -struct miqt_string* QDoubleSpinBox_Tr2(const char* s, const char* c); -struct miqt_string* QDoubleSpinBox_Tr3(const char* s, const char* c, int n); -struct miqt_string* QDoubleSpinBox_TrUtf82(const char* s, const char* c); -struct miqt_string* QDoubleSpinBox_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QDoubleSpinBox_Tr2(const char* s, const char* c); +struct miqt_string QDoubleSpinBox_Tr3(const char* s, const char* c, int n); +struct miqt_string QDoubleSpinBox_TrUtf82(const char* s, const char* c); +struct miqt_string QDoubleSpinBox_TrUtf83(const char* s, const char* c, int n); void QDoubleSpinBox_Delete(QDoubleSpinBox* self); #ifdef __cplusplus diff --git a/qt/gen_qsplashscreen.cpp b/qt/gen_qsplashscreen.cpp index ed9d7c1c..d4a10d8d 100644 --- a/qt/gen_qsplashscreen.cpp +++ b/qt/gen_qsplashscreen.cpp @@ -55,18 +55,26 @@ void* QSplashScreen_Metacast(QSplashScreen* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QSplashScreen_Tr(const char* s) { +struct miqt_string QSplashScreen_Tr(const char* s) { QString _ret = QSplashScreen::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSplashScreen_TrUtf8(const char* s) { +struct miqt_string QSplashScreen_TrUtf8(const char* s) { QString _ret = QSplashScreen::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QSplashScreen_SetPixmap(QSplashScreen* self, QPixmap* pixmap) { @@ -85,15 +93,19 @@ void QSplashScreen_Repaint(QSplashScreen* self) { self->repaint(); } -struct miqt_string* QSplashScreen_Message(const QSplashScreen* self) { +struct miqt_string QSplashScreen_Message(const QSplashScreen* self) { QString _ret = self->message(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QSplashScreen_ShowMessage(QSplashScreen* self, struct miqt_string* message) { - QString message_QString = QString::fromUtf8(&message->data, message->len); +void QSplashScreen_ShowMessage(QSplashScreen* self, struct miqt_string message) { + QString message_QString = QString::fromUtf8(message.data, message.len); self->showMessage(message_QString); } @@ -101,8 +113,8 @@ void QSplashScreen_ClearMessage(QSplashScreen* self) { self->clearMessage(); } -void QSplashScreen_MessageChanged(QSplashScreen* self, struct miqt_string* message) { - QString message_QString = QString::fromUtf8(&message->data, message->len); +void QSplashScreen_MessageChanged(QSplashScreen* self, struct miqt_string message) { + QString message_QString = QString::fromUtf8(message.data, message.len); self->messageChanged(message_QString); } @@ -111,46 +123,66 @@ void QSplashScreen_connect_MessageChanged(QSplashScreen* self, intptr_t slot) { const QString message_ret = message; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray message_b = message_ret.toUtf8(); - struct miqt_string* sigval1 = miqt_strdup(message_b.data(), message_b.length()); + struct miqt_string message_ms; + message_ms.len = message_b.length(); + message_ms.data = static_cast(malloc(message_ms.len)); + memcpy(message_ms.data, message_b.data(), message_ms.len); + struct miqt_string sigval1 = message_ms; miqt_exec_callback_QSplashScreen_MessageChanged(slot, sigval1); }); } -struct miqt_string* QSplashScreen_Tr2(const char* s, const char* c) { +struct miqt_string QSplashScreen_Tr2(const char* s, const char* c) { QString _ret = QSplashScreen::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSplashScreen_Tr3(const char* s, const char* c, int n) { +struct miqt_string QSplashScreen_Tr3(const char* s, const char* c, int n) { QString _ret = QSplashScreen::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSplashScreen_TrUtf82(const char* s, const char* c) { +struct miqt_string QSplashScreen_TrUtf82(const char* s, const char* c) { QString _ret = QSplashScreen::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSplashScreen_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QSplashScreen_TrUtf83(const char* s, const char* c, int n) { QString _ret = QSplashScreen::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QSplashScreen_ShowMessage2(QSplashScreen* self, struct miqt_string* message, int alignment) { - QString message_QString = QString::fromUtf8(&message->data, message->len); +void QSplashScreen_ShowMessage2(QSplashScreen* self, struct miqt_string message, int alignment) { + QString message_QString = QString::fromUtf8(message.data, message.len); self->showMessage(message_QString, static_cast(alignment)); } -void QSplashScreen_ShowMessage3(QSplashScreen* self, struct miqt_string* message, int alignment, QColor* color) { - QString message_QString = QString::fromUtf8(&message->data, message->len); +void QSplashScreen_ShowMessage3(QSplashScreen* self, struct miqt_string message, int alignment, QColor* color) { + QString message_QString = QString::fromUtf8(message.data, message.len); self->showMessage(message_QString, static_cast(alignment), *color); } diff --git a/qt/gen_qsplashscreen.go b/qt/gen_qsplashscreen.go index 7c6aad69..1d375119 100644 --- a/qt/gen_qsplashscreen.go +++ b/qt/gen_qsplashscreen.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "runtime/cgo" "unsafe" @@ -106,24 +105,24 @@ func (this *QSplashScreen) MetaObject() *QMetaObject { func (this *QSplashScreen) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QSplashScreen_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QSplashScreen_Metacast(this.h, param1_Cstring)) } func QSplashScreen_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QSplashScreen_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSplashScreen_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QSplashScreen_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QSplashScreen_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSplashScreen_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -147,16 +146,18 @@ func (this *QSplashScreen) Repaint() { } func (this *QSplashScreen) Message() string { - var _ms *C.struct_miqt_string = C.QSplashScreen_Message(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSplashScreen_Message(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QSplashScreen) ShowMessage(message string) { - message_ms := libmiqt.Strdupg(message) - defer C.free(message_ms) - C.QSplashScreen_ShowMessage(this.h, (*C.struct_miqt_string)(message_ms)) + message_ms := C.struct_miqt_string{} + message_ms.data = C.CString(message) + message_ms.len = C.size_t(len(message)) + defer C.free(unsafe.Pointer(message_ms.data)) + C.QSplashScreen_ShowMessage(this.h, message_ms) } func (this *QSplashScreen) ClearMessage() { @@ -164,25 +165,27 @@ func (this *QSplashScreen) ClearMessage() { } func (this *QSplashScreen) MessageChanged(message string) { - message_ms := libmiqt.Strdupg(message) - defer C.free(message_ms) - C.QSplashScreen_MessageChanged(this.h, (*C.struct_miqt_string)(message_ms)) + message_ms := C.struct_miqt_string{} + message_ms.data = C.CString(message) + message_ms.len = C.size_t(len(message)) + defer C.free(unsafe.Pointer(message_ms.data)) + C.QSplashScreen_MessageChanged(this.h, message_ms) } func (this *QSplashScreen) OnMessageChanged(slot func(message string)) { C.QSplashScreen_connect_MessageChanged(this.h, C.intptr_t(cgo.NewHandle(slot))) } //export miqt_exec_callback_QSplashScreen_MessageChanged -func miqt_exec_callback_QSplashScreen_MessageChanged(cb C.intptr_t, message *C.struct_miqt_string) { +func miqt_exec_callback_QSplashScreen_MessageChanged(cb C.intptr_t, message C.struct_miqt_string) { gofunc, ok := cgo.Handle(cb).Value().(func(message string)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") } // Convert all CABI parameters to Go parameters - var message_ms *C.struct_miqt_string = message - message_ret := C.GoStringN(&message_ms.data, C.int(int64(message_ms.len))) - C.free(unsafe.Pointer(message_ms)) + var message_ms C.struct_miqt_string = message + message_ret := C.GoStringN(message_ms.data, C.int(int64(message_ms.len))) + C.free(unsafe.Pointer(message_ms.data)) slotval1 := message_ret gofunc(slotval1) @@ -193,9 +196,9 @@ func QSplashScreen_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSplashScreen_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSplashScreen_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -204,9 +207,9 @@ func QSplashScreen_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSplashScreen_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSplashScreen_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -215,9 +218,9 @@ func QSplashScreen_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSplashScreen_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSplashScreen_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -226,22 +229,26 @@ func QSplashScreen_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSplashScreen_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSplashScreen_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QSplashScreen) ShowMessage2(message string, alignment int) { - message_ms := libmiqt.Strdupg(message) - defer C.free(message_ms) - C.QSplashScreen_ShowMessage2(this.h, (*C.struct_miqt_string)(message_ms), (C.int)(alignment)) + message_ms := C.struct_miqt_string{} + message_ms.data = C.CString(message) + message_ms.len = C.size_t(len(message)) + defer C.free(unsafe.Pointer(message_ms.data)) + C.QSplashScreen_ShowMessage2(this.h, message_ms, (C.int)(alignment)) } func (this *QSplashScreen) ShowMessage3(message string, alignment int, color *QColor) { - message_ms := libmiqt.Strdupg(message) - defer C.free(message_ms) - C.QSplashScreen_ShowMessage3(this.h, (*C.struct_miqt_string)(message_ms), (C.int)(alignment), color.cPointer()) + message_ms := C.struct_miqt_string{} + message_ms.data = C.CString(message) + message_ms.len = C.size_t(len(message)) + defer C.free(unsafe.Pointer(message_ms.data)) + C.QSplashScreen_ShowMessage3(this.h, message_ms, (C.int)(alignment), color.cPointer()) } // Delete this object from C++ memory. diff --git a/qt/gen_qsplashscreen.h b/qt/gen_qsplashscreen.h index 89ba014b..486c897a 100644 --- a/qt/gen_qsplashscreen.h +++ b/qt/gen_qsplashscreen.h @@ -40,23 +40,23 @@ QSplashScreen* QSplashScreen_new8(QWidget* parent, QPixmap* pixmap); QSplashScreen* QSplashScreen_new9(QWidget* parent, QPixmap* pixmap, int f); QMetaObject* QSplashScreen_MetaObject(const QSplashScreen* self); void* QSplashScreen_Metacast(QSplashScreen* self, const char* param1); -struct miqt_string* QSplashScreen_Tr(const char* s); -struct miqt_string* QSplashScreen_TrUtf8(const char* s); +struct miqt_string QSplashScreen_Tr(const char* s); +struct miqt_string QSplashScreen_TrUtf8(const char* s); void QSplashScreen_SetPixmap(QSplashScreen* self, QPixmap* pixmap); QPixmap* QSplashScreen_Pixmap(const QSplashScreen* self); void QSplashScreen_Finish(QSplashScreen* self, QWidget* w); void QSplashScreen_Repaint(QSplashScreen* self); -struct miqt_string* QSplashScreen_Message(const QSplashScreen* self); -void QSplashScreen_ShowMessage(QSplashScreen* self, struct miqt_string* message); +struct miqt_string QSplashScreen_Message(const QSplashScreen* self); +void QSplashScreen_ShowMessage(QSplashScreen* self, struct miqt_string message); void QSplashScreen_ClearMessage(QSplashScreen* self); -void QSplashScreen_MessageChanged(QSplashScreen* self, struct miqt_string* message); +void QSplashScreen_MessageChanged(QSplashScreen* self, struct miqt_string message); void QSplashScreen_connect_MessageChanged(QSplashScreen* self, intptr_t slot); -struct miqt_string* QSplashScreen_Tr2(const char* s, const char* c); -struct miqt_string* QSplashScreen_Tr3(const char* s, const char* c, int n); -struct miqt_string* QSplashScreen_TrUtf82(const char* s, const char* c); -struct miqt_string* QSplashScreen_TrUtf83(const char* s, const char* c, int n); -void QSplashScreen_ShowMessage2(QSplashScreen* self, struct miqt_string* message, int alignment); -void QSplashScreen_ShowMessage3(QSplashScreen* self, struct miqt_string* message, int alignment, QColor* color); +struct miqt_string QSplashScreen_Tr2(const char* s, const char* c); +struct miqt_string QSplashScreen_Tr3(const char* s, const char* c, int n); +struct miqt_string QSplashScreen_TrUtf82(const char* s, const char* c); +struct miqt_string QSplashScreen_TrUtf83(const char* s, const char* c, int n); +void QSplashScreen_ShowMessage2(QSplashScreen* self, struct miqt_string message, int alignment); +void QSplashScreen_ShowMessage3(QSplashScreen* self, struct miqt_string message, int alignment, QColor* color); void QSplashScreen_Delete(QSplashScreen* self); #ifdef __cplusplus diff --git a/qt/gen_qsplitter.cpp b/qt/gen_qsplitter.cpp index 4bbfc179..6f84a590 100644 --- a/qt/gen_qsplitter.cpp +++ b/qt/gen_qsplitter.cpp @@ -36,18 +36,26 @@ void* QSplitter_Metacast(QSplitter* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QSplitter_Tr(const char* s) { +struct miqt_string QSplitter_Tr(const char* s) { QString _ret = QSplitter::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSplitter_TrUtf8(const char* s) { +struct miqt_string QSplitter_TrUtf8(const char* s) { QString _ret = QSplitter::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QSplitter_AddWidget(QSplitter* self, QWidget* widget) { @@ -130,12 +138,18 @@ void QSplitter_SetSizes(QSplitter* self, struct miqt_array* /* of int */ list) { self->setSizes(list_QList); } -QByteArray* QSplitter_SaveState(const QSplitter* self) { - return new QByteArray(self->saveState()); +struct miqt_string QSplitter_SaveState(const QSplitter* self) { + QByteArray _qb = self->saveState(); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } -bool QSplitter_RestoreState(QSplitter* self, QByteArray* state) { - return self->restoreState(*state); +bool QSplitter_RestoreState(QSplitter* self, struct miqt_string state) { + QByteArray state_QByteArray(state.data, state.len); + return self->restoreState(state_QByteArray); } int QSplitter_HandleWidth(const QSplitter* self) { @@ -182,32 +196,48 @@ void QSplitter_connect_SplitterMoved(QSplitter* self, intptr_t slot) { }); } -struct miqt_string* QSplitter_Tr2(const char* s, const char* c) { +struct miqt_string QSplitter_Tr2(const char* s, const char* c) { QString _ret = QSplitter::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSplitter_Tr3(const char* s, const char* c, int n) { +struct miqt_string QSplitter_Tr3(const char* s, const char* c, int n) { QString _ret = QSplitter::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSplitter_TrUtf82(const char* s, const char* c) { +struct miqt_string QSplitter_TrUtf82(const char* s, const char* c) { QString _ret = QSplitter::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSplitter_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QSplitter_TrUtf83(const char* s, const char* c, int n) { QString _ret = QSplitter::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QSplitter_SetOpaqueResize1(QSplitter* self, bool opaque) { @@ -230,18 +260,26 @@ void* QSplitterHandle_Metacast(QSplitterHandle* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QSplitterHandle_Tr(const char* s) { +struct miqt_string QSplitterHandle_Tr(const char* s) { QString _ret = QSplitterHandle::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSplitterHandle_TrUtf8(const char* s) { +struct miqt_string QSplitterHandle_TrUtf8(const char* s) { QString _ret = QSplitterHandle::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QSplitterHandle_SetOrientation(QSplitterHandle* self, int o) { @@ -265,32 +303,48 @@ QSize* QSplitterHandle_SizeHint(const QSplitterHandle* self) { return new QSize(self->sizeHint()); } -struct miqt_string* QSplitterHandle_Tr2(const char* s, const char* c) { +struct miqt_string QSplitterHandle_Tr2(const char* s, const char* c) { QString _ret = QSplitterHandle::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSplitterHandle_Tr3(const char* s, const char* c, int n) { +struct miqt_string QSplitterHandle_Tr3(const char* s, const char* c, int n) { QString _ret = QSplitterHandle::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSplitterHandle_TrUtf82(const char* s, const char* c) { +struct miqt_string QSplitterHandle_TrUtf82(const char* s, const char* c) { QString _ret = QSplitterHandle::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSplitterHandle_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QSplitterHandle_TrUtf83(const char* s, const char* c, int n) { QString _ret = QSplitterHandle::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QSplitterHandle_Delete(QSplitterHandle* self) { diff --git a/qt/gen_qsplitter.go b/qt/gen_qsplitter.go index 6e405d66..982bbfb7 100644 --- a/qt/gen_qsplitter.go +++ b/qt/gen_qsplitter.go @@ -75,24 +75,24 @@ func (this *QSplitter) MetaObject() *QMetaObject { func (this *QSplitter) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QSplitter_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QSplitter_Metacast(this.h, param1_Cstring)) } func QSplitter_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QSplitter_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSplitter_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QSplitter_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QSplitter_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSplitter_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -181,15 +181,18 @@ func (this *QSplitter) SetSizes(list []int) { C.QSplitter_SetSizes(this.h, list_ma) } -func (this *QSplitter) SaveState() *QByteArray { - _ret := C.QSplitter_SaveState(this.h) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QSplitter) SaveState() []byte { + var _bytearray C.struct_miqt_string = C.QSplitter_SaveState(this.h) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } -func (this *QSplitter) RestoreState(state *QByteArray) bool { - return (bool)(C.QSplitter_RestoreState(this.h, state.cPointer())) +func (this *QSplitter) RestoreState(state []byte) bool { + state_alias := C.struct_miqt_string{} + state_alias.data = (*C.char)(unsafe.Pointer(&state[0])) + state_alias.len = C.size_t(len(state)) + return (bool)(C.QSplitter_RestoreState(this.h, state_alias)) } func (this *QSplitter) HandleWidth() int { @@ -251,9 +254,9 @@ func QSplitter_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSplitter_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSplitter_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -262,9 +265,9 @@ func QSplitter_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSplitter_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSplitter_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -273,9 +276,9 @@ func QSplitter_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSplitter_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSplitter_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -284,9 +287,9 @@ func QSplitter_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSplitter_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSplitter_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -351,24 +354,24 @@ func (this *QSplitterHandle) MetaObject() *QMetaObject { func (this *QSplitterHandle) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QSplitterHandle_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QSplitterHandle_Metacast(this.h, param1_Cstring)) } func QSplitterHandle_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QSplitterHandle_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSplitterHandle_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QSplitterHandle_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QSplitterHandle_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSplitterHandle_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -400,9 +403,9 @@ func QSplitterHandle_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSplitterHandle_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSplitterHandle_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -411,9 +414,9 @@ func QSplitterHandle_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSplitterHandle_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSplitterHandle_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -422,9 +425,9 @@ func QSplitterHandle_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSplitterHandle_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSplitterHandle_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -433,9 +436,9 @@ func QSplitterHandle_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSplitterHandle_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSplitterHandle_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qsplitter.h b/qt/gen_qsplitter.h index e1e2eadc..e1785e59 100644 --- a/qt/gen_qsplitter.h +++ b/qt/gen_qsplitter.h @@ -35,8 +35,8 @@ QSplitter* QSplitter_new3(QWidget* parent); QSplitter* QSplitter_new4(int param1, QWidget* parent); QMetaObject* QSplitter_MetaObject(const QSplitter* self); void* QSplitter_Metacast(QSplitter* self, const char* param1); -struct miqt_string* QSplitter_Tr(const char* s); -struct miqt_string* QSplitter_TrUtf8(const char* s); +struct miqt_string QSplitter_Tr(const char* s); +struct miqt_string QSplitter_TrUtf8(const char* s); void QSplitter_AddWidget(QSplitter* self, QWidget* widget); void QSplitter_InsertWidget(QSplitter* self, int index, QWidget* widget); QWidget* QSplitter_ReplaceWidget(QSplitter* self, int index, QWidget* widget); @@ -53,8 +53,8 @@ QSize* QSplitter_SizeHint(const QSplitter* self); QSize* QSplitter_MinimumSizeHint(const QSplitter* self); struct miqt_array* QSplitter_Sizes(const QSplitter* self); void QSplitter_SetSizes(QSplitter* self, struct miqt_array* /* of int */ list); -QByteArray* QSplitter_SaveState(const QSplitter* self); -bool QSplitter_RestoreState(QSplitter* self, QByteArray* state); +struct miqt_string QSplitter_SaveState(const QSplitter* self); +bool QSplitter_RestoreState(QSplitter* self, struct miqt_string state); int QSplitter_HandleWidth(const QSplitter* self); void QSplitter_SetHandleWidth(QSplitter* self, int handleWidth); int QSplitter_IndexOf(const QSplitter* self, QWidget* w); @@ -65,27 +65,27 @@ QSplitterHandle* QSplitter_Handle(const QSplitter* self, int index); void QSplitter_SetStretchFactor(QSplitter* self, int index, int stretch); void QSplitter_SplitterMoved(QSplitter* self, int pos, int index); void QSplitter_connect_SplitterMoved(QSplitter* self, intptr_t slot); -struct miqt_string* QSplitter_Tr2(const char* s, const char* c); -struct miqt_string* QSplitter_Tr3(const char* s, const char* c, int n); -struct miqt_string* QSplitter_TrUtf82(const char* s, const char* c); -struct miqt_string* QSplitter_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QSplitter_Tr2(const char* s, const char* c); +struct miqt_string QSplitter_Tr3(const char* s, const char* c, int n); +struct miqt_string QSplitter_TrUtf82(const char* s, const char* c); +struct miqt_string QSplitter_TrUtf83(const char* s, const char* c, int n); void QSplitter_SetOpaqueResize1(QSplitter* self, bool opaque); void QSplitter_Delete(QSplitter* self); QSplitterHandle* QSplitterHandle_new(int o, QSplitter* parent); QMetaObject* QSplitterHandle_MetaObject(const QSplitterHandle* self); void* QSplitterHandle_Metacast(QSplitterHandle* self, const char* param1); -struct miqt_string* QSplitterHandle_Tr(const char* s); -struct miqt_string* QSplitterHandle_TrUtf8(const char* s); +struct miqt_string QSplitterHandle_Tr(const char* s); +struct miqt_string QSplitterHandle_TrUtf8(const char* s); void QSplitterHandle_SetOrientation(QSplitterHandle* self, int o); int QSplitterHandle_Orientation(const QSplitterHandle* self); bool QSplitterHandle_OpaqueResize(const QSplitterHandle* self); QSplitter* QSplitterHandle_Splitter(const QSplitterHandle* self); QSize* QSplitterHandle_SizeHint(const QSplitterHandle* self); -struct miqt_string* QSplitterHandle_Tr2(const char* s, const char* c); -struct miqt_string* QSplitterHandle_Tr3(const char* s, const char* c, int n); -struct miqt_string* QSplitterHandle_TrUtf82(const char* s, const char* c); -struct miqt_string* QSplitterHandle_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QSplitterHandle_Tr2(const char* s, const char* c); +struct miqt_string QSplitterHandle_Tr3(const char* s, const char* c, int n); +struct miqt_string QSplitterHandle_TrUtf82(const char* s, const char* c); +struct miqt_string QSplitterHandle_TrUtf83(const char* s, const char* c, int n); void QSplitterHandle_Delete(QSplitterHandle* self); #ifdef __cplusplus diff --git a/qt/gen_qstackedlayout.cpp b/qt/gen_qstackedlayout.cpp index 8dbfca40..0462c389 100644 --- a/qt/gen_qstackedlayout.cpp +++ b/qt/gen_qstackedlayout.cpp @@ -32,18 +32,26 @@ void* QStackedLayout_Metacast(QStackedLayout* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QStackedLayout_Tr(const char* s) { +struct miqt_string QStackedLayout_Tr(const char* s) { QString _ret = QStackedLayout::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QStackedLayout_TrUtf8(const char* s) { +struct miqt_string QStackedLayout_TrUtf8(const char* s) { QString _ret = QStackedLayout::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QStackedLayout_AddWidget(QStackedLayout* self, QWidget* w) { @@ -141,32 +149,48 @@ void QStackedLayout_SetCurrentWidget(QStackedLayout* self, QWidget* w) { self->setCurrentWidget(w); } -struct miqt_string* QStackedLayout_Tr2(const char* s, const char* c) { +struct miqt_string QStackedLayout_Tr2(const char* s, const char* c) { QString _ret = QStackedLayout::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QStackedLayout_Tr3(const char* s, const char* c, int n) { +struct miqt_string QStackedLayout_Tr3(const char* s, const char* c, int n) { QString _ret = QStackedLayout::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QStackedLayout_TrUtf82(const char* s, const char* c) { +struct miqt_string QStackedLayout_TrUtf82(const char* s, const char* c) { QString _ret = QStackedLayout::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QStackedLayout_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QStackedLayout_TrUtf83(const char* s, const char* c, int n) { QString _ret = QStackedLayout::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QStackedLayout_Delete(QStackedLayout* self) { diff --git a/qt/gen_qstackedlayout.go b/qt/gen_qstackedlayout.go index ac45209c..6cb2cc9b 100644 --- a/qt/gen_qstackedlayout.go +++ b/qt/gen_qstackedlayout.go @@ -76,24 +76,24 @@ func (this *QStackedLayout) MetaObject() *QMetaObject { func (this *QStackedLayout) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QStackedLayout_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QStackedLayout_Metacast(this.h, param1_Cstring)) } func QStackedLayout_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QStackedLayout_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStackedLayout_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QStackedLayout_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QStackedLayout_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStackedLayout_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -220,9 +220,9 @@ func QStackedLayout_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QStackedLayout_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStackedLayout_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -231,9 +231,9 @@ func QStackedLayout_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QStackedLayout_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStackedLayout_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -242,9 +242,9 @@ func QStackedLayout_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QStackedLayout_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStackedLayout_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -253,9 +253,9 @@ func QStackedLayout_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QStackedLayout_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStackedLayout_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qstackedlayout.h b/qt/gen_qstackedlayout.h index ed0438ad..d52c1d48 100644 --- a/qt/gen_qstackedlayout.h +++ b/qt/gen_qstackedlayout.h @@ -36,8 +36,8 @@ QStackedLayout* QStackedLayout_new2(QWidget* parent); QStackedLayout* QStackedLayout_new3(QLayout* parentLayout); QMetaObject* QStackedLayout_MetaObject(const QStackedLayout* self); void* QStackedLayout_Metacast(QStackedLayout* self, const char* param1); -struct miqt_string* QStackedLayout_Tr(const char* s); -struct miqt_string* QStackedLayout_TrUtf8(const char* s); +struct miqt_string QStackedLayout_Tr(const char* s); +struct miqt_string QStackedLayout_TrUtf8(const char* s); int QStackedLayout_AddWidget(QStackedLayout* self, QWidget* w); int QStackedLayout_InsertWidget(QStackedLayout* self, int index, QWidget* w); QWidget* QStackedLayout_CurrentWidget(const QStackedLayout* self); @@ -60,10 +60,10 @@ void QStackedLayout_CurrentChanged(QStackedLayout* self, int index); void QStackedLayout_connect_CurrentChanged(QStackedLayout* self, intptr_t slot); void QStackedLayout_SetCurrentIndex(QStackedLayout* self, int index); void QStackedLayout_SetCurrentWidget(QStackedLayout* self, QWidget* w); -struct miqt_string* QStackedLayout_Tr2(const char* s, const char* c); -struct miqt_string* QStackedLayout_Tr3(const char* s, const char* c, int n); -struct miqt_string* QStackedLayout_TrUtf82(const char* s, const char* c); -struct miqt_string* QStackedLayout_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QStackedLayout_Tr2(const char* s, const char* c); +struct miqt_string QStackedLayout_Tr3(const char* s, const char* c, int n); +struct miqt_string QStackedLayout_TrUtf82(const char* s, const char* c); +struct miqt_string QStackedLayout_TrUtf83(const char* s, const char* c, int n); void QStackedLayout_Delete(QStackedLayout* self); #ifdef __cplusplus diff --git a/qt/gen_qstackedwidget.cpp b/qt/gen_qstackedwidget.cpp index e18fab52..dd400a97 100644 --- a/qt/gen_qstackedwidget.cpp +++ b/qt/gen_qstackedwidget.cpp @@ -24,18 +24,26 @@ void* QStackedWidget_Metacast(QStackedWidget* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QStackedWidget_Tr(const char* s) { +struct miqt_string QStackedWidget_Tr(const char* s) { QString _ret = QStackedWidget::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QStackedWidget_TrUtf8(const char* s) { +struct miqt_string QStackedWidget_TrUtf8(const char* s) { QString _ret = QStackedWidget::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QStackedWidget_AddWidget(QStackedWidget* self, QWidget* w) { @@ -100,32 +108,48 @@ void QStackedWidget_connect_WidgetRemoved(QStackedWidget* self, intptr_t slot) { }); } -struct miqt_string* QStackedWidget_Tr2(const char* s, const char* c) { +struct miqt_string QStackedWidget_Tr2(const char* s, const char* c) { QString _ret = QStackedWidget::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QStackedWidget_Tr3(const char* s, const char* c, int n) { +struct miqt_string QStackedWidget_Tr3(const char* s, const char* c, int n) { QString _ret = QStackedWidget::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QStackedWidget_TrUtf82(const char* s, const char* c) { +struct miqt_string QStackedWidget_TrUtf82(const char* s, const char* c) { QString _ret = QStackedWidget::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QStackedWidget_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QStackedWidget_TrUtf83(const char* s, const char* c, int n) { QString _ret = QStackedWidget::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QStackedWidget_Delete(QStackedWidget* self) { diff --git a/qt/gen_qstackedwidget.go b/qt/gen_qstackedwidget.go index f962fab2..2c0f80c1 100644 --- a/qt/gen_qstackedwidget.go +++ b/qt/gen_qstackedwidget.go @@ -63,24 +63,24 @@ func (this *QStackedWidget) MetaObject() *QMetaObject { func (this *QStackedWidget) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QStackedWidget_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QStackedWidget_Metacast(this.h, param1_Cstring)) } func QStackedWidget_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QStackedWidget_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStackedWidget_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QStackedWidget_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QStackedWidget_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStackedWidget_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -169,9 +169,9 @@ func QStackedWidget_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QStackedWidget_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStackedWidget_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -180,9 +180,9 @@ func QStackedWidget_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QStackedWidget_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStackedWidget_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -191,9 +191,9 @@ func QStackedWidget_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QStackedWidget_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStackedWidget_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -202,9 +202,9 @@ func QStackedWidget_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QStackedWidget_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStackedWidget_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qstackedwidget.h b/qt/gen_qstackedwidget.h index aa8bd6ba..ec17ccc5 100644 --- a/qt/gen_qstackedwidget.h +++ b/qt/gen_qstackedwidget.h @@ -27,8 +27,8 @@ QStackedWidget* QStackedWidget_new(); QStackedWidget* QStackedWidget_new2(QWidget* parent); QMetaObject* QStackedWidget_MetaObject(const QStackedWidget* self); void* QStackedWidget_Metacast(QStackedWidget* self, const char* param1); -struct miqt_string* QStackedWidget_Tr(const char* s); -struct miqt_string* QStackedWidget_TrUtf8(const char* s); +struct miqt_string QStackedWidget_Tr(const char* s); +struct miqt_string QStackedWidget_TrUtf8(const char* s); int QStackedWidget_AddWidget(QStackedWidget* self, QWidget* w); int QStackedWidget_InsertWidget(QStackedWidget* self, int index, QWidget* w); void QStackedWidget_RemoveWidget(QStackedWidget* self, QWidget* w); @@ -43,10 +43,10 @@ void QStackedWidget_CurrentChanged(QStackedWidget* self, int param1); void QStackedWidget_connect_CurrentChanged(QStackedWidget* self, intptr_t slot); void QStackedWidget_WidgetRemoved(QStackedWidget* self, int index); void QStackedWidget_connect_WidgetRemoved(QStackedWidget* self, intptr_t slot); -struct miqt_string* QStackedWidget_Tr2(const char* s, const char* c); -struct miqt_string* QStackedWidget_Tr3(const char* s, const char* c, int n); -struct miqt_string* QStackedWidget_TrUtf82(const char* s, const char* c); -struct miqt_string* QStackedWidget_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QStackedWidget_Tr2(const char* s, const char* c); +struct miqt_string QStackedWidget_Tr3(const char* s, const char* c, int n); +struct miqt_string QStackedWidget_TrUtf82(const char* s, const char* c); +struct miqt_string QStackedWidget_TrUtf83(const char* s, const char* c, int n); void QStackedWidget_Delete(QStackedWidget* self); #ifdef __cplusplus diff --git a/qt/gen_qstandarditemmodel.cpp b/qt/gen_qstandarditemmodel.cpp index 256975aa..300a694f 100644 --- a/qt/gen_qstandarditemmodel.cpp +++ b/qt/gen_qstandarditemmodel.cpp @@ -22,13 +22,13 @@ QStandardItem* QStandardItem_new() { return new QStandardItem(); } -QStandardItem* QStandardItem_new2(struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QStandardItem* QStandardItem_new2(struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QStandardItem(text_QString); } -QStandardItem* QStandardItem_new3(QIcon* icon, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QStandardItem* QStandardItem_new3(QIcon* icon, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QStandardItem(*icon, text_QString); } @@ -52,15 +52,19 @@ void QStandardItem_ClearData(QStandardItem* self) { self->clearData(); } -struct miqt_string* QStandardItem_Text(const QStandardItem* self) { +struct miqt_string QStandardItem_Text(const QStandardItem* self) { QString _ret = self->text(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QStandardItem_SetText(QStandardItem* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QStandardItem_SetText(QStandardItem* self, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->setText(text_QString); } @@ -72,39 +76,51 @@ void QStandardItem_SetIcon(QStandardItem* self, QIcon* icon) { self->setIcon(*icon); } -struct miqt_string* QStandardItem_ToolTip(const QStandardItem* self) { +struct miqt_string QStandardItem_ToolTip(const QStandardItem* self) { QString _ret = self->toolTip(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QStandardItem_SetToolTip(QStandardItem* self, struct miqt_string* toolTip) { - QString toolTip_QString = QString::fromUtf8(&toolTip->data, toolTip->len); +void QStandardItem_SetToolTip(QStandardItem* self, struct miqt_string toolTip) { + QString toolTip_QString = QString::fromUtf8(toolTip.data, toolTip.len); self->setToolTip(toolTip_QString); } -struct miqt_string* QStandardItem_StatusTip(const QStandardItem* self) { +struct miqt_string QStandardItem_StatusTip(const QStandardItem* self) { QString _ret = self->statusTip(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QStandardItem_SetStatusTip(QStandardItem* self, struct miqt_string* statusTip) { - QString statusTip_QString = QString::fromUtf8(&statusTip->data, statusTip->len); +void QStandardItem_SetStatusTip(QStandardItem* self, struct miqt_string statusTip) { + QString statusTip_QString = QString::fromUtf8(statusTip.data, statusTip.len); self->setStatusTip(statusTip_QString); } -struct miqt_string* QStandardItem_WhatsThis(const QStandardItem* self) { +struct miqt_string QStandardItem_WhatsThis(const QStandardItem* self) { QString _ret = self->whatsThis(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QStandardItem_SetWhatsThis(QStandardItem* self, struct miqt_string* whatsThis) { - QString whatsThis_QString = QString::fromUtf8(&whatsThis->data, whatsThis->len); +void QStandardItem_SetWhatsThis(QStandardItem* self, struct miqt_string whatsThis) { + QString whatsThis_QString = QString::fromUtf8(whatsThis.data, whatsThis.len); self->setWhatsThis(whatsThis_QString); } @@ -158,27 +174,35 @@ void QStandardItem_SetCheckState(QStandardItem* self, int checkState) { self->setCheckState(static_cast(checkState)); } -struct miqt_string* QStandardItem_AccessibleText(const QStandardItem* self) { +struct miqt_string QStandardItem_AccessibleText(const QStandardItem* self) { QString _ret = self->accessibleText(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QStandardItem_SetAccessibleText(QStandardItem* self, struct miqt_string* accessibleText) { - QString accessibleText_QString = QString::fromUtf8(&accessibleText->data, accessibleText->len); +void QStandardItem_SetAccessibleText(QStandardItem* self, struct miqt_string accessibleText) { + QString accessibleText_QString = QString::fromUtf8(accessibleText.data, accessibleText.len); self->setAccessibleText(accessibleText_QString); } -struct miqt_string* QStandardItem_AccessibleDescription(const QStandardItem* self) { +struct miqt_string QStandardItem_AccessibleDescription(const QStandardItem* self) { QString _ret = self->accessibleDescription(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QStandardItem_SetAccessibleDescription(QStandardItem* self, struct miqt_string* accessibleDescription) { - QString accessibleDescription_QString = QString::fromUtf8(&accessibleDescription->data, accessibleDescription->len); +void QStandardItem_SetAccessibleDescription(QStandardItem* self, struct miqt_string accessibleDescription) { + QString accessibleDescription_QString = QString::fromUtf8(accessibleDescription.data, accessibleDescription.len); self->setAccessibleDescription(accessibleDescription_QString); } @@ -509,18 +533,26 @@ void* QStandardItemModel_Metacast(QStandardItemModel* self, const char* param1) return self->qt_metacast(param1); } -struct miqt_string* QStandardItemModel_Tr(const char* s) { +struct miqt_string QStandardItemModel_Tr(const char* s) { QString _ret = QStandardItemModel::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QStandardItemModel_TrUtf8(const char* s) { +struct miqt_string QStandardItemModel_TrUtf8(const char* s) { QString _ret = QStandardItemModel::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QModelIndex* QStandardItemModel_Index(const QStandardItemModel* self, int row, int column) { @@ -641,23 +673,23 @@ void QStandardItemModel_SetVerticalHeaderItem(QStandardItemModel* self, int row, self->setVerticalHeaderItem(static_cast(row), item); } -void QStandardItemModel_SetHorizontalHeaderLabels(QStandardItemModel* self, struct miqt_array* /* of struct miqt_string* */ labels) { +void QStandardItemModel_SetHorizontalHeaderLabels(QStandardItemModel* self, struct miqt_array* /* of struct miqt_string */ labels) { QStringList labels_QList; labels_QList.reserve(labels->len); - struct miqt_string** labels_arr = static_cast(labels->data); + struct miqt_string* labels_arr = static_cast(labels->data); for(size_t i = 0; i < labels->len; ++i) { - QString labels_arr_i_QString = QString::fromUtf8(&labels_arr[i]->data, labels_arr[i]->len); + QString labels_arr_i_QString = QString::fromUtf8(labels_arr[i].data, labels_arr[i].len); labels_QList.push_back(labels_arr_i_QString); } self->setHorizontalHeaderLabels(labels_QList); } -void QStandardItemModel_SetVerticalHeaderLabels(QStandardItemModel* self, struct miqt_array* /* of struct miqt_string* */ labels) { +void QStandardItemModel_SetVerticalHeaderLabels(QStandardItemModel* self, struct miqt_array* /* of struct miqt_string */ labels) { QStringList labels_QList; labels_QList.reserve(labels->len); - struct miqt_string** labels_arr = static_cast(labels->data); + struct miqt_string* labels_arr = static_cast(labels->data); for(size_t i = 0; i < labels->len; ++i) { - QString labels_arr_i_QString = QString::fromUtf8(&labels_arr[i]->data, labels_arr[i]->len); + QString labels_arr_i_QString = QString::fromUtf8(labels_arr[i].data, labels_arr[i].len); labels_QList.push_back(labels_arr_i_QString); } self->setVerticalHeaderLabels(labels_QList); @@ -773,8 +805,8 @@ void QStandardItemModel_SetItemPrototype(QStandardItemModel* self, QStandardItem self->setItemPrototype(item); } -struct miqt_array* QStandardItemModel_FindItems(const QStandardItemModel* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +struct miqt_array* QStandardItemModel_FindItems(const QStandardItemModel* self, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); QList _ret = self->findItems(text_QString); // Convert QList<> from C++ memory to manually-managed C memory QStandardItem** _arr = static_cast(malloc(sizeof(QStandardItem*) * _ret.length())); @@ -798,12 +830,16 @@ void QStandardItemModel_SetSortRole(QStandardItemModel* self, int role) { struct miqt_array* QStandardItemModel_MimeTypes(const QStandardItemModel* self) { QStringList _ret = self->mimeTypes(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -836,32 +872,48 @@ void QStandardItemModel_connect_ItemChanged(QStandardItemModel* self, intptr_t s }); } -struct miqt_string* QStandardItemModel_Tr2(const char* s, const char* c) { +struct miqt_string QStandardItemModel_Tr2(const char* s, const char* c) { QString _ret = QStandardItemModel::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QStandardItemModel_Tr3(const char* s, const char* c, int n) { +struct miqt_string QStandardItemModel_Tr3(const char* s, const char* c, int n) { QString _ret = QStandardItemModel::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QStandardItemModel_TrUtf82(const char* s, const char* c) { +struct miqt_string QStandardItemModel_TrUtf82(const char* s, const char* c) { QString _ret = QStandardItemModel::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QStandardItemModel_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QStandardItemModel_TrUtf83(const char* s, const char* c, int n) { QString _ret = QStandardItemModel::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QModelIndex* QStandardItemModel_Index3(const QStandardItemModel* self, int row, int column, QModelIndex* parent) { @@ -932,8 +984,8 @@ QStandardItem* QStandardItemModel_TakeItem2(QStandardItemModel* self, int row, i return self->takeItem(static_cast(row), static_cast(column)); } -struct miqt_array* QStandardItemModel_FindItems2(const QStandardItemModel* self, struct miqt_string* text, int flags) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +struct miqt_array* QStandardItemModel_FindItems2(const QStandardItemModel* self, struct miqt_string text, int flags) { + QString text_QString = QString::fromUtf8(text.data, text.len); QList _ret = self->findItems(text_QString, static_cast(flags)); // Convert QList<> from C++ memory to manually-managed C memory QStandardItem** _arr = static_cast(malloc(sizeof(QStandardItem*) * _ret.length())); @@ -946,8 +998,8 @@ struct miqt_array* QStandardItemModel_FindItems2(const QStandardItemModel* self, return _out; } -struct miqt_array* QStandardItemModel_FindItems3(const QStandardItemModel* self, struct miqt_string* text, int flags, int column) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +struct miqt_array* QStandardItemModel_FindItems3(const QStandardItemModel* self, struct miqt_string text, int flags, int column) { + QString text_QString = QString::fromUtf8(text.data, text.len); QList _ret = self->findItems(text_QString, static_cast(flags), static_cast(column)); // Convert QList<> from C++ memory to manually-managed C memory QStandardItem** _arr = static_cast(malloc(sizeof(QStandardItem*) * _ret.length())); diff --git a/qt/gen_qstandarditemmodel.go b/qt/gen_qstandarditemmodel.go index 7b21a441..ed240fdc 100644 --- a/qt/gen_qstandarditemmodel.go +++ b/qt/gen_qstandarditemmodel.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "runtime/cgo" "unsafe" @@ -59,17 +58,21 @@ func NewQStandardItem() *QStandardItem { // NewQStandardItem2 constructs a new QStandardItem object. func NewQStandardItem2(text string) *QStandardItem { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - ret := C.QStandardItem_new2((*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + ret := C.QStandardItem_new2(text_ms) return newQStandardItem(ret) } // NewQStandardItem3 constructs a new QStandardItem object. func NewQStandardItem3(icon *QIcon, text string) *QStandardItem { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - ret := C.QStandardItem_new3(icon.cPointer(), (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + ret := C.QStandardItem_new3(icon.cPointer(), text_ms) return newQStandardItem(ret) } @@ -101,16 +104,18 @@ func (this *QStandardItem) ClearData() { } func (this *QStandardItem) Text() string { - var _ms *C.struct_miqt_string = C.QStandardItem_Text(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStandardItem_Text(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QStandardItem) SetText(text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QStandardItem_SetText(this.h, (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QStandardItem_SetText(this.h, text_ms) } func (this *QStandardItem) Icon() *QIcon { @@ -125,42 +130,48 @@ func (this *QStandardItem) SetIcon(icon *QIcon) { } func (this *QStandardItem) ToolTip() string { - var _ms *C.struct_miqt_string = C.QStandardItem_ToolTip(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStandardItem_ToolTip(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QStandardItem) SetToolTip(toolTip string) { - toolTip_ms := libmiqt.Strdupg(toolTip) - defer C.free(toolTip_ms) - C.QStandardItem_SetToolTip(this.h, (*C.struct_miqt_string)(toolTip_ms)) + toolTip_ms := C.struct_miqt_string{} + toolTip_ms.data = C.CString(toolTip) + toolTip_ms.len = C.size_t(len(toolTip)) + defer C.free(unsafe.Pointer(toolTip_ms.data)) + C.QStandardItem_SetToolTip(this.h, toolTip_ms) } func (this *QStandardItem) StatusTip() string { - var _ms *C.struct_miqt_string = C.QStandardItem_StatusTip(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStandardItem_StatusTip(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QStandardItem) SetStatusTip(statusTip string) { - statusTip_ms := libmiqt.Strdupg(statusTip) - defer C.free(statusTip_ms) - C.QStandardItem_SetStatusTip(this.h, (*C.struct_miqt_string)(statusTip_ms)) + statusTip_ms := C.struct_miqt_string{} + statusTip_ms.data = C.CString(statusTip) + statusTip_ms.len = C.size_t(len(statusTip)) + defer C.free(unsafe.Pointer(statusTip_ms.data)) + C.QStandardItem_SetStatusTip(this.h, statusTip_ms) } func (this *QStandardItem) WhatsThis() string { - var _ms *C.struct_miqt_string = C.QStandardItem_WhatsThis(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStandardItem_WhatsThis(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QStandardItem) SetWhatsThis(whatsThis string) { - whatsThis_ms := libmiqt.Strdupg(whatsThis) - defer C.free(whatsThis_ms) - C.QStandardItem_SetWhatsThis(this.h, (*C.struct_miqt_string)(whatsThis_ms)) + whatsThis_ms := C.struct_miqt_string{} + whatsThis_ms.data = C.CString(whatsThis) + whatsThis_ms.len = C.size_t(len(whatsThis)) + defer C.free(unsafe.Pointer(whatsThis_ms.data)) + C.QStandardItem_SetWhatsThis(this.h, whatsThis_ms) } func (this *QStandardItem) SizeHint() *QSize { @@ -224,29 +235,33 @@ func (this *QStandardItem) SetCheckState(checkState CheckState) { } func (this *QStandardItem) AccessibleText() string { - var _ms *C.struct_miqt_string = C.QStandardItem_AccessibleText(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStandardItem_AccessibleText(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QStandardItem) SetAccessibleText(accessibleText string) { - accessibleText_ms := libmiqt.Strdupg(accessibleText) - defer C.free(accessibleText_ms) - C.QStandardItem_SetAccessibleText(this.h, (*C.struct_miqt_string)(accessibleText_ms)) + accessibleText_ms := C.struct_miqt_string{} + accessibleText_ms.data = C.CString(accessibleText) + accessibleText_ms.len = C.size_t(len(accessibleText)) + defer C.free(unsafe.Pointer(accessibleText_ms.data)) + C.QStandardItem_SetAccessibleText(this.h, accessibleText_ms) } func (this *QStandardItem) AccessibleDescription() string { - var _ms *C.struct_miqt_string = C.QStandardItem_AccessibleDescription(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStandardItem_AccessibleDescription(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QStandardItem) SetAccessibleDescription(accessibleDescription string) { - accessibleDescription_ms := libmiqt.Strdupg(accessibleDescription) - defer C.free(accessibleDescription_ms) - C.QStandardItem_SetAccessibleDescription(this.h, (*C.struct_miqt_string)(accessibleDescription_ms)) + accessibleDescription_ms := C.struct_miqt_string{} + accessibleDescription_ms.data = C.CString(accessibleDescription) + accessibleDescription_ms.len = C.size_t(len(accessibleDescription)) + defer C.free(unsafe.Pointer(accessibleDescription_ms.data)) + C.QStandardItem_SetAccessibleDescription(this.h, accessibleDescription_ms) } func (this *QStandardItem) Flags() ItemFlag { @@ -636,24 +651,24 @@ func (this *QStandardItemModel) MetaObject() *QMetaObject { func (this *QStandardItemModel) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QStandardItemModel_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QStandardItemModel_Metacast(this.h, param1_Cstring)) } func QStandardItemModel_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QStandardItemModel_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStandardItemModel_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QStandardItemModel_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QStandardItemModel_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStandardItemModel_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -793,12 +808,14 @@ func (this *QStandardItemModel) SetVerticalHeaderItem(row int, item *QStandardIt func (this *QStandardItemModel) SetHorizontalHeaderLabels(labels []string) { // For the C ABI, malloc a C array of raw pointers - labels_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(labels)))) + labels_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(labels)))) defer C.free(unsafe.Pointer(labels_CArray)) for i := range labels { - labels_i_ms := libmiqt.Strdupg(labels[i]) - defer C.free(labels_i_ms) - labels_CArray[i] = (*C.struct_miqt_string)(labels_i_ms) + labels_i_ms := C.struct_miqt_string{} + labels_i_ms.data = C.CString(labels[i]) + labels_i_ms.len = C.size_t(len(labels[i])) + defer C.free(unsafe.Pointer(labels_i_ms.data)) + labels_CArray[i] = labels_i_ms } labels_ma := &C.struct_miqt_array{len: C.size_t(len(labels)), data: unsafe.Pointer(labels_CArray)} defer runtime.KeepAlive(unsafe.Pointer(labels_ma)) @@ -807,12 +824,14 @@ func (this *QStandardItemModel) SetHorizontalHeaderLabels(labels []string) { func (this *QStandardItemModel) SetVerticalHeaderLabels(labels []string) { // For the C ABI, malloc a C array of raw pointers - labels_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(labels)))) + labels_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(labels)))) defer C.free(unsafe.Pointer(labels_CArray)) for i := range labels { - labels_i_ms := libmiqt.Strdupg(labels[i]) - defer C.free(labels_i_ms) - labels_CArray[i] = (*C.struct_miqt_string)(labels_i_ms) + labels_i_ms := C.struct_miqt_string{} + labels_i_ms.data = C.CString(labels[i]) + labels_i_ms.len = C.size_t(len(labels[i])) + defer C.free(unsafe.Pointer(labels_i_ms.data)) + labels_CArray[i] = labels_i_ms } labels_ma := &C.struct_miqt_array{len: C.size_t(len(labels)), data: unsafe.Pointer(labels_CArray)} defer runtime.KeepAlive(unsafe.Pointer(labels_ma)) @@ -934,9 +953,11 @@ func (this *QStandardItemModel) SetItemPrototype(item *QStandardItem) { } func (this *QStandardItemModel) FindItems(text string) []*QStandardItem { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - var _ma *C.struct_miqt_array = C.QStandardItemModel_FindItems(this.h, (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + var _ma *C.struct_miqt_array = C.QStandardItemModel_FindItems(this.h, text_ms) _ret := make([]*QStandardItem, int(_ma.len)) _outCast := (*[0xffff]*C.QStandardItem)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -957,11 +978,11 @@ func (this *QStandardItemModel) SetSortRole(role int) { func (this *QStandardItemModel) MimeTypes() []string { var _ma *C.struct_miqt_array = C.QStandardItemModel_MimeTypes(this.h) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -1009,9 +1030,9 @@ func QStandardItemModel_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QStandardItemModel_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStandardItemModel_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -1020,9 +1041,9 @@ func QStandardItemModel_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QStandardItemModel_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStandardItemModel_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -1031,9 +1052,9 @@ func QStandardItemModel_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QStandardItemModel_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStandardItemModel_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -1042,9 +1063,9 @@ func QStandardItemModel_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QStandardItemModel_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStandardItemModel_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -1126,9 +1147,11 @@ func (this *QStandardItemModel) TakeItem2(row int, column int) *QStandardItem { } func (this *QStandardItemModel) FindItems2(text string, flags MatchFlag) []*QStandardItem { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - var _ma *C.struct_miqt_array = C.QStandardItemModel_FindItems2(this.h, (*C.struct_miqt_string)(text_ms), (C.int)(flags)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + var _ma *C.struct_miqt_array = C.QStandardItemModel_FindItems2(this.h, text_ms, (C.int)(flags)) _ret := make([]*QStandardItem, int(_ma.len)) _outCast := (*[0xffff]*C.QStandardItem)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -1139,9 +1162,11 @@ func (this *QStandardItemModel) FindItems2(text string, flags MatchFlag) []*QSta } func (this *QStandardItemModel) FindItems3(text string, flags MatchFlag, column int) []*QStandardItem { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - var _ma *C.struct_miqt_array = C.QStandardItemModel_FindItems3(this.h, (*C.struct_miqt_string)(text_ms), (C.int)(flags), (C.int)(column)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + var _ma *C.struct_miqt_array = C.QStandardItemModel_FindItems3(this.h, text_ms, (C.int)(flags), (C.int)(column)) _ret := make([]*QStandardItem, int(_ma.len)) _outCast := (*[0xffff]*C.QStandardItem)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { diff --git a/qt/gen_qstandarditemmodel.h b/qt/gen_qstandarditemmodel.h index 993848a0..079d8d89 100644 --- a/qt/gen_qstandarditemmodel.h +++ b/qt/gen_qstandarditemmodel.h @@ -42,23 +42,23 @@ typedef struct QVariant QVariant; #endif QStandardItem* QStandardItem_new(); -QStandardItem* QStandardItem_new2(struct miqt_string* text); -QStandardItem* QStandardItem_new3(QIcon* icon, struct miqt_string* text); +QStandardItem* QStandardItem_new2(struct miqt_string text); +QStandardItem* QStandardItem_new3(QIcon* icon, struct miqt_string text); QStandardItem* QStandardItem_new4(int rows); QStandardItem* QStandardItem_new5(int rows, int columns); QVariant* QStandardItem_Data(const QStandardItem* self); void QStandardItem_SetData(QStandardItem* self, QVariant* value); void QStandardItem_ClearData(QStandardItem* self); -struct miqt_string* QStandardItem_Text(const QStandardItem* self); -void QStandardItem_SetText(QStandardItem* self, struct miqt_string* text); +struct miqt_string QStandardItem_Text(const QStandardItem* self); +void QStandardItem_SetText(QStandardItem* self, struct miqt_string text); QIcon* QStandardItem_Icon(const QStandardItem* self); void QStandardItem_SetIcon(QStandardItem* self, QIcon* icon); -struct miqt_string* QStandardItem_ToolTip(const QStandardItem* self); -void QStandardItem_SetToolTip(QStandardItem* self, struct miqt_string* toolTip); -struct miqt_string* QStandardItem_StatusTip(const QStandardItem* self); -void QStandardItem_SetStatusTip(QStandardItem* self, struct miqt_string* statusTip); -struct miqt_string* QStandardItem_WhatsThis(const QStandardItem* self); -void QStandardItem_SetWhatsThis(QStandardItem* self, struct miqt_string* whatsThis); +struct miqt_string QStandardItem_ToolTip(const QStandardItem* self); +void QStandardItem_SetToolTip(QStandardItem* self, struct miqt_string toolTip); +struct miqt_string QStandardItem_StatusTip(const QStandardItem* self); +void QStandardItem_SetStatusTip(QStandardItem* self, struct miqt_string statusTip); +struct miqt_string QStandardItem_WhatsThis(const QStandardItem* self); +void QStandardItem_SetWhatsThis(QStandardItem* self, struct miqt_string whatsThis); QSize* QStandardItem_SizeHint(const QStandardItem* self); void QStandardItem_SetSizeHint(QStandardItem* self, QSize* sizeHint); QFont* QStandardItem_Font(const QStandardItem* self); @@ -71,10 +71,10 @@ QBrush* QStandardItem_Foreground(const QStandardItem* self); void QStandardItem_SetForeground(QStandardItem* self, QBrush* brush); int QStandardItem_CheckState(const QStandardItem* self); void QStandardItem_SetCheckState(QStandardItem* self, int checkState); -struct miqt_string* QStandardItem_AccessibleText(const QStandardItem* self); -void QStandardItem_SetAccessibleText(QStandardItem* self, struct miqt_string* accessibleText); -struct miqt_string* QStandardItem_AccessibleDescription(const QStandardItem* self); -void QStandardItem_SetAccessibleDescription(QStandardItem* self, struct miqt_string* accessibleDescription); +struct miqt_string QStandardItem_AccessibleText(const QStandardItem* self); +void QStandardItem_SetAccessibleText(QStandardItem* self, struct miqt_string accessibleText); +struct miqt_string QStandardItem_AccessibleDescription(const QStandardItem* self); +void QStandardItem_SetAccessibleDescription(QStandardItem* self, struct miqt_string accessibleDescription); int QStandardItem_Flags(const QStandardItem* self); void QStandardItem_SetFlags(QStandardItem* self, int flags); bool QStandardItem_IsEnabled(const QStandardItem* self); @@ -144,8 +144,8 @@ QStandardItemModel* QStandardItemModel_new3(QObject* parent); QStandardItemModel* QStandardItemModel_new4(int rows, int columns, QObject* parent); QMetaObject* QStandardItemModel_MetaObject(const QStandardItemModel* self); void* QStandardItemModel_Metacast(QStandardItemModel* self, const char* param1); -struct miqt_string* QStandardItemModel_Tr(const char* s); -struct miqt_string* QStandardItemModel_TrUtf8(const char* s); +struct miqt_string QStandardItemModel_Tr(const char* s); +struct miqt_string QStandardItemModel_TrUtf8(const char* s); QModelIndex* QStandardItemModel_Index(const QStandardItemModel* self, int row, int column); QModelIndex* QStandardItemModel_Parent(const QStandardItemModel* self, QModelIndex* child); int QStandardItemModel_RowCount(const QStandardItemModel* self); @@ -175,8 +175,8 @@ QStandardItem* QStandardItemModel_HorizontalHeaderItem(const QStandardItemModel* void QStandardItemModel_SetHorizontalHeaderItem(QStandardItemModel* self, int column, QStandardItem* item); QStandardItem* QStandardItemModel_VerticalHeaderItem(const QStandardItemModel* self, int row); void QStandardItemModel_SetVerticalHeaderItem(QStandardItemModel* self, int row, QStandardItem* item); -void QStandardItemModel_SetHorizontalHeaderLabels(QStandardItemModel* self, struct miqt_array* /* of struct miqt_string* */ labels); -void QStandardItemModel_SetVerticalHeaderLabels(QStandardItemModel* self, struct miqt_array* /* of struct miqt_string* */ labels); +void QStandardItemModel_SetHorizontalHeaderLabels(QStandardItemModel* self, struct miqt_array* /* of struct miqt_string */ labels); +void QStandardItemModel_SetVerticalHeaderLabels(QStandardItemModel* self, struct miqt_array* /* of struct miqt_string */ labels); void QStandardItemModel_SetRowCount(QStandardItemModel* self, int rows); void QStandardItemModel_SetColumnCount(QStandardItemModel* self, int columns); void QStandardItemModel_AppendRow(QStandardItemModel* self, struct miqt_array* /* of QStandardItem* */ items); @@ -194,7 +194,7 @@ QStandardItem* QStandardItemModel_TakeHorizontalHeaderItem(QStandardItemModel* s QStandardItem* QStandardItemModel_TakeVerticalHeaderItem(QStandardItemModel* self, int row); QStandardItem* QStandardItemModel_ItemPrototype(const QStandardItemModel* self); void QStandardItemModel_SetItemPrototype(QStandardItemModel* self, QStandardItem* item); -struct miqt_array* QStandardItemModel_FindItems(const QStandardItemModel* self, struct miqt_string* text); +struct miqt_array* QStandardItemModel_FindItems(const QStandardItemModel* self, struct miqt_string text); int QStandardItemModel_SortRole(const QStandardItemModel* self); void QStandardItemModel_SetSortRole(QStandardItemModel* self, int role); struct miqt_array* QStandardItemModel_MimeTypes(const QStandardItemModel* self); @@ -202,10 +202,10 @@ QMimeData* QStandardItemModel_MimeData(const QStandardItemModel* self, struct mi bool QStandardItemModel_DropMimeData(QStandardItemModel* self, QMimeData* data, int action, int row, int column, QModelIndex* parent); void QStandardItemModel_ItemChanged(QStandardItemModel* self, QStandardItem* item); void QStandardItemModel_connect_ItemChanged(QStandardItemModel* self, intptr_t slot); -struct miqt_string* QStandardItemModel_Tr2(const char* s, const char* c); -struct miqt_string* QStandardItemModel_Tr3(const char* s, const char* c, int n); -struct miqt_string* QStandardItemModel_TrUtf82(const char* s, const char* c); -struct miqt_string* QStandardItemModel_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QStandardItemModel_Tr2(const char* s, const char* c); +struct miqt_string QStandardItemModel_Tr3(const char* s, const char* c, int n); +struct miqt_string QStandardItemModel_TrUtf82(const char* s, const char* c); +struct miqt_string QStandardItemModel_TrUtf83(const char* s, const char* c, int n); QModelIndex* QStandardItemModel_Index3(const QStandardItemModel* self, int row, int column, QModelIndex* parent); int QStandardItemModel_RowCount1(const QStandardItemModel* self, QModelIndex* parent); int QStandardItemModel_ColumnCount1(const QStandardItemModel* self, QModelIndex* parent); @@ -223,8 +223,8 @@ QStandardItem* QStandardItemModel_Item2(const QStandardItemModel* self, int row, bool QStandardItemModel_InsertRow22(QStandardItemModel* self, int row, QModelIndex* parent); bool QStandardItemModel_InsertColumn2(QStandardItemModel* self, int column, QModelIndex* parent); QStandardItem* QStandardItemModel_TakeItem2(QStandardItemModel* self, int row, int column); -struct miqt_array* QStandardItemModel_FindItems2(const QStandardItemModel* self, struct miqt_string* text, int flags); -struct miqt_array* QStandardItemModel_FindItems3(const QStandardItemModel* self, struct miqt_string* text, int flags, int column); +struct miqt_array* QStandardItemModel_FindItems2(const QStandardItemModel* self, struct miqt_string text, int flags); +struct miqt_array* QStandardItemModel_FindItems3(const QStandardItemModel* self, struct miqt_string text, int flags, int column); void QStandardItemModel_Delete(QStandardItemModel* self); #ifdef __cplusplus diff --git a/qt/gen_qstandardpaths.cpp b/qt/gen_qstandardpaths.cpp index 586606da..542e5785 100644 --- a/qt/gen_qstandardpaths.cpp +++ b/qt/gen_qstandardpaths.cpp @@ -7,22 +7,30 @@ #include "gen_qstandardpaths.h" #include "_cgo_export.h" -struct miqt_string* QStandardPaths_WritableLocation(int typeVal) { +struct miqt_string QStandardPaths_WritableLocation(int typeVal) { QString _ret = QStandardPaths::writableLocation(static_cast(typeVal)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } struct miqt_array* QStandardPaths_StandardLocations(int typeVal) { QStringList _ret = QStandardPaths::standardLocations(static_cast(typeVal)); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -30,24 +38,32 @@ struct miqt_array* QStandardPaths_StandardLocations(int typeVal) { return _out; } -struct miqt_string* QStandardPaths_Locate(int typeVal, struct miqt_string* fileName) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +struct miqt_string QStandardPaths_Locate(int typeVal, struct miqt_string fileName) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); QString _ret = QStandardPaths::locate(static_cast(typeVal), fileName_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_array* QStandardPaths_LocateAll(int typeVal, struct miqt_string* fileName) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +struct miqt_array* QStandardPaths_LocateAll(int typeVal, struct miqt_string fileName) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); QStringList _ret = QStandardPaths::locateAll(static_cast(typeVal), fileName_QString); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -55,19 +71,27 @@ struct miqt_array* QStandardPaths_LocateAll(int typeVal, struct miqt_string* fil return _out; } -struct miqt_string* QStandardPaths_DisplayName(int typeVal) { +struct miqt_string QStandardPaths_DisplayName(int typeVal) { QString _ret = QStandardPaths::displayName(static_cast(typeVal)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QStandardPaths_FindExecutable(struct miqt_string* executableName) { - QString executableName_QString = QString::fromUtf8(&executableName->data, executableName->len); +struct miqt_string QStandardPaths_FindExecutable(struct miqt_string executableName) { + QString executableName_QString = QString::fromUtf8(executableName.data, executableName.len); QString _ret = QStandardPaths::findExecutable(executableName_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QStandardPaths_EnableTestMode(bool testMode) { @@ -82,24 +106,32 @@ bool QStandardPaths_IsTestModeEnabled() { return QStandardPaths::isTestModeEnabled(); } -struct miqt_string* QStandardPaths_Locate3(int typeVal, struct miqt_string* fileName, int options) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +struct miqt_string QStandardPaths_Locate3(int typeVal, struct miqt_string fileName, int options) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); QString _ret = QStandardPaths::locate(static_cast(typeVal), fileName_QString, static_cast(options)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_array* QStandardPaths_LocateAll3(int typeVal, struct miqt_string* fileName, int options) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +struct miqt_array* QStandardPaths_LocateAll3(int typeVal, struct miqt_string fileName, int options) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); QStringList _ret = QStandardPaths::locateAll(static_cast(typeVal), fileName_QString, static_cast(options)); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -107,18 +139,22 @@ struct miqt_array* QStandardPaths_LocateAll3(int typeVal, struct miqt_string* fi return _out; } -struct miqt_string* QStandardPaths_FindExecutable2(struct miqt_string* executableName, struct miqt_array* /* of struct miqt_string* */ paths) { - QString executableName_QString = QString::fromUtf8(&executableName->data, executableName->len); +struct miqt_string QStandardPaths_FindExecutable2(struct miqt_string executableName, struct miqt_array* /* of struct miqt_string */ paths) { + QString executableName_QString = QString::fromUtf8(executableName.data, executableName.len); QStringList paths_QList; paths_QList.reserve(paths->len); - struct miqt_string** paths_arr = static_cast(paths->data); + struct miqt_string* paths_arr = static_cast(paths->data); for(size_t i = 0; i < paths->len; ++i) { - QString paths_arr_i_QString = QString::fromUtf8(&paths_arr[i]->data, paths_arr[i]->len); + QString paths_arr_i_QString = QString::fromUtf8(paths_arr[i].data, paths_arr[i].len); paths_QList.push_back(paths_arr_i_QString); } QString _ret = QStandardPaths::findExecutable(executableName_QString, paths_QList); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } diff --git a/qt/gen_qstandardpaths.go b/qt/gen_qstandardpaths.go index 00a38c05..007fce5b 100644 --- a/qt/gen_qstandardpaths.go +++ b/qt/gen_qstandardpaths.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -76,20 +75,20 @@ func UnsafeNewQStandardPaths(h unsafe.Pointer) *QStandardPaths { } func QStandardPaths_WritableLocation(typeVal QStandardPaths__StandardLocation) string { - var _ms *C.struct_miqt_string = C.QStandardPaths_WritableLocation((C.int)(typeVal)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStandardPaths_WritableLocation((C.int)(typeVal)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QStandardPaths_StandardLocations(typeVal QStandardPaths__StandardLocation) []string { var _ma *C.struct_miqt_array = C.QStandardPaths_StandardLocations((C.int)(typeVal)) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -97,24 +96,28 @@ func QStandardPaths_StandardLocations(typeVal QStandardPaths__StandardLocation) } func QStandardPaths_Locate(typeVal QStandardPaths__StandardLocation, fileName string) string { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - var _ms *C.struct_miqt_string = C.QStandardPaths_Locate((C.int)(typeVal), (*C.struct_miqt_string)(fileName_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + var _ms C.struct_miqt_string = C.QStandardPaths_Locate((C.int)(typeVal), fileName_ms) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QStandardPaths_LocateAll(typeVal QStandardPaths__StandardLocation, fileName string) []string { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - var _ma *C.struct_miqt_array = C.QStandardPaths_LocateAll((C.int)(typeVal), (*C.struct_miqt_string)(fileName_ms)) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + var _ma *C.struct_miqt_array = C.QStandardPaths_LocateAll((C.int)(typeVal), fileName_ms) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -122,18 +125,20 @@ func QStandardPaths_LocateAll(typeVal QStandardPaths__StandardLocation, fileName } func QStandardPaths_DisplayName(typeVal QStandardPaths__StandardLocation) string { - var _ms *C.struct_miqt_string = C.QStandardPaths_DisplayName((C.int)(typeVal)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStandardPaths_DisplayName((C.int)(typeVal)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QStandardPaths_FindExecutable(executableName string) string { - executableName_ms := libmiqt.Strdupg(executableName) - defer C.free(executableName_ms) - var _ms *C.struct_miqt_string = C.QStandardPaths_FindExecutable((*C.struct_miqt_string)(executableName_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + executableName_ms := C.struct_miqt_string{} + executableName_ms.data = C.CString(executableName) + executableName_ms.len = C.size_t(len(executableName)) + defer C.free(unsafe.Pointer(executableName_ms.data)) + var _ms C.struct_miqt_string = C.QStandardPaths_FindExecutable(executableName_ms) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -150,24 +155,28 @@ func QStandardPaths_IsTestModeEnabled() bool { } func QStandardPaths_Locate3(typeVal QStandardPaths__StandardLocation, fileName string, options QStandardPaths__LocateOption) string { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - var _ms *C.struct_miqt_string = C.QStandardPaths_Locate3((C.int)(typeVal), (*C.struct_miqt_string)(fileName_ms), (C.int)(options)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + var _ms C.struct_miqt_string = C.QStandardPaths_Locate3((C.int)(typeVal), fileName_ms, (C.int)(options)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QStandardPaths_LocateAll3(typeVal QStandardPaths__StandardLocation, fileName string, options QStandardPaths__LocateOption) []string { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - var _ma *C.struct_miqt_array = C.QStandardPaths_LocateAll3((C.int)(typeVal), (*C.struct_miqt_string)(fileName_ms), (C.int)(options)) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + var _ma *C.struct_miqt_array = C.QStandardPaths_LocateAll3((C.int)(typeVal), fileName_ms, (C.int)(options)) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -175,20 +184,24 @@ func QStandardPaths_LocateAll3(typeVal QStandardPaths__StandardLocation, fileNam } func QStandardPaths_FindExecutable2(executableName string, paths []string) string { - executableName_ms := libmiqt.Strdupg(executableName) - defer C.free(executableName_ms) + executableName_ms := C.struct_miqt_string{} + executableName_ms.data = C.CString(executableName) + executableName_ms.len = C.size_t(len(executableName)) + defer C.free(unsafe.Pointer(executableName_ms.data)) // For the C ABI, malloc a C array of raw pointers - paths_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(paths)))) + paths_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(paths)))) defer C.free(unsafe.Pointer(paths_CArray)) for i := range paths { - paths_i_ms := libmiqt.Strdupg(paths[i]) - defer C.free(paths_i_ms) - paths_CArray[i] = (*C.struct_miqt_string)(paths_i_ms) + paths_i_ms := C.struct_miqt_string{} + paths_i_ms.data = C.CString(paths[i]) + paths_i_ms.len = C.size_t(len(paths[i])) + defer C.free(unsafe.Pointer(paths_i_ms.data)) + paths_CArray[i] = paths_i_ms } paths_ma := &C.struct_miqt_array{len: C.size_t(len(paths)), data: unsafe.Pointer(paths_CArray)} defer runtime.KeepAlive(unsafe.Pointer(paths_ma)) - var _ms *C.struct_miqt_string = C.QStandardPaths_FindExecutable2((*C.struct_miqt_string)(executableName_ms), paths_ma) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStandardPaths_FindExecutable2(executableName_ms, paths_ma) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qstandardpaths.h b/qt/gen_qstandardpaths.h index 7a96dc53..173736fa 100644 --- a/qt/gen_qstandardpaths.h +++ b/qt/gen_qstandardpaths.h @@ -19,18 +19,18 @@ class QStandardPaths; typedef struct QStandardPaths QStandardPaths; #endif -struct miqt_string* QStandardPaths_WritableLocation(int typeVal); +struct miqt_string QStandardPaths_WritableLocation(int typeVal); struct miqt_array* QStandardPaths_StandardLocations(int typeVal); -struct miqt_string* QStandardPaths_Locate(int typeVal, struct miqt_string* fileName); -struct miqt_array* QStandardPaths_LocateAll(int typeVal, struct miqt_string* fileName); -struct miqt_string* QStandardPaths_DisplayName(int typeVal); -struct miqt_string* QStandardPaths_FindExecutable(struct miqt_string* executableName); +struct miqt_string QStandardPaths_Locate(int typeVal, struct miqt_string fileName); +struct miqt_array* QStandardPaths_LocateAll(int typeVal, struct miqt_string fileName); +struct miqt_string QStandardPaths_DisplayName(int typeVal); +struct miqt_string QStandardPaths_FindExecutable(struct miqt_string executableName); void QStandardPaths_EnableTestMode(bool testMode); void QStandardPaths_SetTestModeEnabled(bool testMode); bool QStandardPaths_IsTestModeEnabled(); -struct miqt_string* QStandardPaths_Locate3(int typeVal, struct miqt_string* fileName, int options); -struct miqt_array* QStandardPaths_LocateAll3(int typeVal, struct miqt_string* fileName, int options); -struct miqt_string* QStandardPaths_FindExecutable2(struct miqt_string* executableName, struct miqt_array* /* of struct miqt_string* */ paths); +struct miqt_string QStandardPaths_Locate3(int typeVal, struct miqt_string fileName, int options); +struct miqt_array* QStandardPaths_LocateAll3(int typeVal, struct miqt_string fileName, int options); +struct miqt_string QStandardPaths_FindExecutable2(struct miqt_string executableName, struct miqt_array* /* of struct miqt_string */ paths); #ifdef __cplusplus } /* extern C */ diff --git a/qt/gen_qstate.cpp b/qt/gen_qstate.cpp index 8e3168f8..d8c873ba 100644 --- a/qt/gen_qstate.cpp +++ b/qt/gen_qstate.cpp @@ -37,18 +37,26 @@ void* QState_Metacast(QState* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QState_Tr(const char* s) { +struct miqt_string QState_Tr(const char* s) { QString _ret = QState::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QState_TrUtf8(const char* s) { +struct miqt_string QState_TrUtf8(const char* s) { QString _ret = QState::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QAbstractState* QState_ErrorState(const QState* self) { @@ -109,32 +117,48 @@ void QState_AssignProperty(QState* self, QObject* object, const char* name, QVar self->assignProperty(object, name, *value); } -struct miqt_string* QState_Tr2(const char* s, const char* c) { +struct miqt_string QState_Tr2(const char* s, const char* c) { QString _ret = QState::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QState_Tr3(const char* s, const char* c, int n) { +struct miqt_string QState_Tr3(const char* s, const char* c, int n) { QString _ret = QState::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QState_TrUtf82(const char* s, const char* c) { +struct miqt_string QState_TrUtf82(const char* s, const char* c) { QString _ret = QState::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QState_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QState_TrUtf83(const char* s, const char* c, int n) { QString _ret = QState::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QState_Delete(QState* self) { diff --git a/qt/gen_qstate.go b/qt/gen_qstate.go index f3c15fd7..a33e55d3 100644 --- a/qt/gen_qstate.go +++ b/qt/gen_qstate.go @@ -88,24 +88,24 @@ func (this *QState) MetaObject() *QMetaObject { func (this *QState) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QState_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QState_Metacast(this.h, param1_Cstring)) } func QState_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QState_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QState_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QState_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QState_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QState_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -173,9 +173,9 @@ func QState_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QState_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QState_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -184,9 +184,9 @@ func QState_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QState_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QState_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -195,9 +195,9 @@ func QState_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QState_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QState_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -206,9 +206,9 @@ func QState_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QState_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QState_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qstate.h b/qt/gen_qstate.h index 946e4d29..a0005833 100644 --- a/qt/gen_qstate.h +++ b/qt/gen_qstate.h @@ -37,8 +37,8 @@ QState* QState_new3(QState* parent); QState* QState_new4(int childMode, QState* parent); QMetaObject* QState_MetaObject(const QState* self); void* QState_Metacast(QState* self, const char* param1); -struct miqt_string* QState_Tr(const char* s); -struct miqt_string* QState_TrUtf8(const char* s); +struct miqt_string QState_Tr(const char* s); +struct miqt_string QState_TrUtf8(const char* s); QAbstractState* QState_ErrorState(const QState* self); void QState_SetErrorState(QState* self, QAbstractState* state); void QState_AddTransition(QState* self, QAbstractTransition* transition); @@ -51,10 +51,10 @@ void QState_SetInitialState(QState* self, QAbstractState* state); int QState_ChildMode(const QState* self); void QState_SetChildMode(QState* self, int mode); void QState_AssignProperty(QState* self, QObject* object, const char* name, QVariant* value); -struct miqt_string* QState_Tr2(const char* s, const char* c); -struct miqt_string* QState_Tr3(const char* s, const char* c, int n); -struct miqt_string* QState_TrUtf82(const char* s, const char* c); -struct miqt_string* QState_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QState_Tr2(const char* s, const char* c); +struct miqt_string QState_Tr3(const char* s, const char* c, int n); +struct miqt_string QState_TrUtf82(const char* s, const char* c); +struct miqt_string QState_TrUtf83(const char* s, const char* c, int n); void QState_Delete(QState* self); #ifdef __cplusplus diff --git a/qt/gen_qstatemachine.cpp b/qt/gen_qstatemachine.cpp index 2680a2be..6e241b10 100644 --- a/qt/gen_qstatemachine.cpp +++ b/qt/gen_qstatemachine.cpp @@ -38,18 +38,26 @@ void* QStateMachine_Metacast(QStateMachine* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QStateMachine_Tr(const char* s) { +struct miqt_string QStateMachine_Tr(const char* s) { QString _ret = QStateMachine::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QStateMachine_TrUtf8(const char* s) { +struct miqt_string QStateMachine_TrUtf8(const char* s) { QString _ret = QStateMachine::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QStateMachine_AddState(QStateMachine* self, QAbstractState* state) { @@ -65,11 +73,15 @@ int QStateMachine_Error(const QStateMachine* self) { return static_cast(_ret); } -struct miqt_string* QStateMachine_ErrorString(const QStateMachine* self) { +struct miqt_string QStateMachine_ErrorString(const QStateMachine* self) { QString _ret = self->errorString(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QStateMachine_ClearError(QStateMachine* self) { @@ -172,32 +184,48 @@ void QStateMachine_connect_RunningChanged(QStateMachine* self, intptr_t slot) { }); } -struct miqt_string* QStateMachine_Tr2(const char* s, const char* c) { +struct miqt_string QStateMachine_Tr2(const char* s, const char* c) { QString _ret = QStateMachine::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QStateMachine_Tr3(const char* s, const char* c, int n) { +struct miqt_string QStateMachine_Tr3(const char* s, const char* c, int n) { QString _ret = QStateMachine::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QStateMachine_TrUtf82(const char* s, const char* c) { +struct miqt_string QStateMachine_TrUtf82(const char* s, const char* c) { QString _ret = QStateMachine::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QStateMachine_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QStateMachine_TrUtf83(const char* s, const char* c, int n) { QString _ret = QStateMachine::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QStateMachine_PostEvent2(QStateMachine* self, QEvent* event, int priority) { diff --git a/qt/gen_qstatemachine.go b/qt/gen_qstatemachine.go index 75779215..d3c37c9b 100644 --- a/qt/gen_qstatemachine.go +++ b/qt/gen_qstatemachine.go @@ -92,24 +92,24 @@ func (this *QStateMachine) MetaObject() *QMetaObject { func (this *QStateMachine) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QStateMachine_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QStateMachine_Metacast(this.h, param1_Cstring)) } func QStateMachine_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QStateMachine_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStateMachine_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QStateMachine_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QStateMachine_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStateMachine_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -126,9 +126,9 @@ func (this *QStateMachine) Error() QStateMachine__Error { } func (this *QStateMachine) ErrorString() string { - var _ms *C.struct_miqt_string = C.QStateMachine_ErrorString(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStateMachine_ErrorString(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -240,9 +240,9 @@ func QStateMachine_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QStateMachine_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStateMachine_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -251,9 +251,9 @@ func QStateMachine_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QStateMachine_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStateMachine_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -262,9 +262,9 @@ func QStateMachine_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QStateMachine_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStateMachine_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -273,9 +273,9 @@ func QStateMachine_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QStateMachine_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStateMachine_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qstatemachine.h b/qt/gen_qstatemachine.h index 83227ade..a0017fb6 100644 --- a/qt/gen_qstatemachine.h +++ b/qt/gen_qstatemachine.h @@ -47,12 +47,12 @@ QStateMachine* QStateMachine_new3(QObject* parent); QStateMachine* QStateMachine_new4(int childMode, QObject* parent); QMetaObject* QStateMachine_MetaObject(const QStateMachine* self); void* QStateMachine_Metacast(QStateMachine* self, const char* param1); -struct miqt_string* QStateMachine_Tr(const char* s); -struct miqt_string* QStateMachine_TrUtf8(const char* s); +struct miqt_string QStateMachine_Tr(const char* s); +struct miqt_string QStateMachine_TrUtf8(const char* s); void QStateMachine_AddState(QStateMachine* self, QAbstractState* state); void QStateMachine_RemoveState(QStateMachine* self, QAbstractState* state); int QStateMachine_Error(const QStateMachine* self); -struct miqt_string* QStateMachine_ErrorString(const QStateMachine* self); +struct miqt_string QStateMachine_ErrorString(const QStateMachine* self); void QStateMachine_ClearError(QStateMachine* self); bool QStateMachine_IsRunning(const QStateMachine* self); bool QStateMachine_IsAnimated(const QStateMachine* self); @@ -72,10 +72,10 @@ void QStateMachine_Stop(QStateMachine* self); void QStateMachine_SetRunning(QStateMachine* self, bool running); void QStateMachine_RunningChanged(QStateMachine* self, bool running); void QStateMachine_connect_RunningChanged(QStateMachine* self, intptr_t slot); -struct miqt_string* QStateMachine_Tr2(const char* s, const char* c); -struct miqt_string* QStateMachine_Tr3(const char* s, const char* c, int n); -struct miqt_string* QStateMachine_TrUtf82(const char* s, const char* c); -struct miqt_string* QStateMachine_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QStateMachine_Tr2(const char* s, const char* c); +struct miqt_string QStateMachine_Tr3(const char* s, const char* c, int n); +struct miqt_string QStateMachine_TrUtf82(const char* s, const char* c); +struct miqt_string QStateMachine_TrUtf83(const char* s, const char* c, int n); void QStateMachine_PostEvent2(QStateMachine* self, QEvent* event, int priority); void QStateMachine_Delete(QStateMachine* self); diff --git a/qt/gen_qstatictext.cpp b/qt/gen_qstatictext.cpp index 09eeadcf..89977da8 100644 --- a/qt/gen_qstatictext.cpp +++ b/qt/gen_qstatictext.cpp @@ -14,8 +14,8 @@ QStaticText* QStaticText_new() { return new QStaticText(); } -QStaticText* QStaticText_new2(struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QStaticText* QStaticText_new2(struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QStaticText(text_QString); } @@ -31,16 +31,20 @@ void QStaticText_Swap(QStaticText* self, QStaticText* other) { self->swap(*other); } -void QStaticText_SetText(QStaticText* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QStaticText_SetText(QStaticText* self, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->setText(text_QString); } -struct miqt_string* QStaticText_Text(const QStaticText* self) { +struct miqt_string QStaticText_Text(const QStaticText* self) { QString _ret = self->text(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QStaticText_SetTextFormat(QStaticText* self, int textFormat) { diff --git a/qt/gen_qstatictext.go b/qt/gen_qstatictext.go index fbfc94d4..c3dd9a0b 100644 --- a/qt/gen_qstatictext.go +++ b/qt/gen_qstatictext.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -58,9 +57,11 @@ func NewQStaticText() *QStaticText { // NewQStaticText2 constructs a new QStaticText object. func NewQStaticText2(text string) *QStaticText { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - ret := C.QStaticText_new2((*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + ret := C.QStaticText_new2(text_ms) return newQStaticText(ret) } @@ -79,15 +80,17 @@ func (this *QStaticText) Swap(other *QStaticText) { } func (this *QStaticText) SetText(text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QStaticText_SetText(this.h, (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QStaticText_SetText(this.h, text_ms) } func (this *QStaticText) Text() string { - var _ms *C.struct_miqt_string = C.QStaticText_Text(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStaticText_Text(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qstatictext.h b/qt/gen_qstatictext.h index fe8824cf..bb867d0a 100644 --- a/qt/gen_qstatictext.h +++ b/qt/gen_qstatictext.h @@ -28,12 +28,12 @@ typedef struct QTransform QTransform; #endif QStaticText* QStaticText_new(); -QStaticText* QStaticText_new2(struct miqt_string* text); +QStaticText* QStaticText_new2(struct miqt_string text); QStaticText* QStaticText_new3(QStaticText* other); void QStaticText_OperatorAssign(QStaticText* self, QStaticText* param1); void QStaticText_Swap(QStaticText* self, QStaticText* other); -void QStaticText_SetText(QStaticText* self, struct miqt_string* text); -struct miqt_string* QStaticText_Text(const QStaticText* self); +void QStaticText_SetText(QStaticText* self, struct miqt_string text); +struct miqt_string QStaticText_Text(const QStaticText* self); void QStaticText_SetTextFormat(QStaticText* self, int textFormat); int QStaticText_TextFormat(const QStaticText* self); void QStaticText_SetTextWidth(QStaticText* self, double textWidth); diff --git a/qt/gen_qstatusbar.cpp b/qt/gen_qstatusbar.cpp index dffa9ae5..f7d804d9 100644 --- a/qt/gen_qstatusbar.cpp +++ b/qt/gen_qstatusbar.cpp @@ -24,18 +24,26 @@ void* QStatusBar_Metacast(QStatusBar* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QStatusBar_Tr(const char* s) { +struct miqt_string QStatusBar_Tr(const char* s) { QString _ret = QStatusBar::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QStatusBar_TrUtf8(const char* s) { +struct miqt_string QStatusBar_TrUtf8(const char* s) { QString _ret = QStatusBar::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QStatusBar_AddWidget(QStatusBar* self, QWidget* widget) { @@ -66,15 +74,19 @@ bool QStatusBar_IsSizeGripEnabled(const QStatusBar* self) { return self->isSizeGripEnabled(); } -struct miqt_string* QStatusBar_CurrentMessage(const QStatusBar* self) { +struct miqt_string QStatusBar_CurrentMessage(const QStatusBar* self) { QString _ret = self->currentMessage(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QStatusBar_ShowMessage(QStatusBar* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QStatusBar_ShowMessage(QStatusBar* self, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->showMessage(text_QString); } @@ -82,8 +94,8 @@ void QStatusBar_ClearMessage(QStatusBar* self) { self->clearMessage(); } -void QStatusBar_MessageChanged(QStatusBar* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QStatusBar_MessageChanged(QStatusBar* self, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->messageChanged(text_QString); } @@ -92,37 +104,57 @@ void QStatusBar_connect_MessageChanged(QStatusBar* self, intptr_t slot) { const QString text_ret = text; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray text_b = text_ret.toUtf8(); - struct miqt_string* sigval1 = miqt_strdup(text_b.data(), text_b.length()); + struct miqt_string text_ms; + text_ms.len = text_b.length(); + text_ms.data = static_cast(malloc(text_ms.len)); + memcpy(text_ms.data, text_b.data(), text_ms.len); + struct miqt_string sigval1 = text_ms; miqt_exec_callback_QStatusBar_MessageChanged(slot, sigval1); }); } -struct miqt_string* QStatusBar_Tr2(const char* s, const char* c) { +struct miqt_string QStatusBar_Tr2(const char* s, const char* c) { QString _ret = QStatusBar::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QStatusBar_Tr3(const char* s, const char* c, int n) { +struct miqt_string QStatusBar_Tr3(const char* s, const char* c, int n) { QString _ret = QStatusBar::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QStatusBar_TrUtf82(const char* s, const char* c) { +struct miqt_string QStatusBar_TrUtf82(const char* s, const char* c) { QString _ret = QStatusBar::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QStatusBar_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QStatusBar_TrUtf83(const char* s, const char* c, int n) { QString _ret = QStatusBar::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QStatusBar_AddWidget2(QStatusBar* self, QWidget* widget, int stretch) { @@ -141,8 +173,8 @@ int QStatusBar_InsertPermanentWidget3(QStatusBar* self, int index, QWidget* widg return self->insertPermanentWidget(static_cast(index), widget, static_cast(stretch)); } -void QStatusBar_ShowMessage2(QStatusBar* self, struct miqt_string* text, int timeout) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QStatusBar_ShowMessage2(QStatusBar* self, struct miqt_string text, int timeout) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->showMessage(text_QString, static_cast(timeout)); } diff --git a/qt/gen_qstatusbar.go b/qt/gen_qstatusbar.go index 17a9507d..024cd5fb 100644 --- a/qt/gen_qstatusbar.go +++ b/qt/gen_qstatusbar.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "runtime/cgo" "unsafe" @@ -64,24 +63,24 @@ func (this *QStatusBar) MetaObject() *QMetaObject { func (this *QStatusBar) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QStatusBar_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QStatusBar_Metacast(this.h, param1_Cstring)) } func QStatusBar_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QStatusBar_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStatusBar_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QStatusBar_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QStatusBar_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStatusBar_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -114,16 +113,18 @@ func (this *QStatusBar) IsSizeGripEnabled() bool { } func (this *QStatusBar) CurrentMessage() string { - var _ms *C.struct_miqt_string = C.QStatusBar_CurrentMessage(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStatusBar_CurrentMessage(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QStatusBar) ShowMessage(text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QStatusBar_ShowMessage(this.h, (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QStatusBar_ShowMessage(this.h, text_ms) } func (this *QStatusBar) ClearMessage() { @@ -131,25 +132,27 @@ func (this *QStatusBar) ClearMessage() { } func (this *QStatusBar) MessageChanged(text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QStatusBar_MessageChanged(this.h, (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QStatusBar_MessageChanged(this.h, text_ms) } func (this *QStatusBar) OnMessageChanged(slot func(text string)) { C.QStatusBar_connect_MessageChanged(this.h, C.intptr_t(cgo.NewHandle(slot))) } //export miqt_exec_callback_QStatusBar_MessageChanged -func miqt_exec_callback_QStatusBar_MessageChanged(cb C.intptr_t, text *C.struct_miqt_string) { +func miqt_exec_callback_QStatusBar_MessageChanged(cb C.intptr_t, text C.struct_miqt_string) { gofunc, ok := cgo.Handle(cb).Value().(func(text string)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") } // Convert all CABI parameters to Go parameters - var text_ms *C.struct_miqt_string = text - text_ret := C.GoStringN(&text_ms.data, C.int(int64(text_ms.len))) - C.free(unsafe.Pointer(text_ms)) + var text_ms C.struct_miqt_string = text + text_ret := C.GoStringN(text_ms.data, C.int(int64(text_ms.len))) + C.free(unsafe.Pointer(text_ms.data)) slotval1 := text_ret gofunc(slotval1) @@ -160,9 +163,9 @@ func QStatusBar_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QStatusBar_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStatusBar_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -171,9 +174,9 @@ func QStatusBar_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QStatusBar_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStatusBar_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -182,9 +185,9 @@ func QStatusBar_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QStatusBar_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStatusBar_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -193,9 +196,9 @@ func QStatusBar_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QStatusBar_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStatusBar_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -216,9 +219,11 @@ func (this *QStatusBar) InsertPermanentWidget3(index int, widget *QWidget, stret } func (this *QStatusBar) ShowMessage2(text string, timeout int) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QStatusBar_ShowMessage2(this.h, (*C.struct_miqt_string)(text_ms), (C.int)(timeout)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QStatusBar_ShowMessage2(this.h, text_ms, (C.int)(timeout)) } // Delete this object from C++ memory. diff --git a/qt/gen_qstatusbar.h b/qt/gen_qstatusbar.h index 7b0d7523..418f06d7 100644 --- a/qt/gen_qstatusbar.h +++ b/qt/gen_qstatusbar.h @@ -27,8 +27,8 @@ QStatusBar* QStatusBar_new(); QStatusBar* QStatusBar_new2(QWidget* parent); QMetaObject* QStatusBar_MetaObject(const QStatusBar* self); void* QStatusBar_Metacast(QStatusBar* self, const char* param1); -struct miqt_string* QStatusBar_Tr(const char* s); -struct miqt_string* QStatusBar_TrUtf8(const char* s); +struct miqt_string QStatusBar_Tr(const char* s); +struct miqt_string QStatusBar_TrUtf8(const char* s); void QStatusBar_AddWidget(QStatusBar* self, QWidget* widget); int QStatusBar_InsertWidget(QStatusBar* self, int index, QWidget* widget); void QStatusBar_AddPermanentWidget(QStatusBar* self, QWidget* widget); @@ -36,20 +36,20 @@ int QStatusBar_InsertPermanentWidget(QStatusBar* self, int index, QWidget* widge void QStatusBar_RemoveWidget(QStatusBar* self, QWidget* widget); void QStatusBar_SetSizeGripEnabled(QStatusBar* self, bool sizeGripEnabled); bool QStatusBar_IsSizeGripEnabled(const QStatusBar* self); -struct miqt_string* QStatusBar_CurrentMessage(const QStatusBar* self); -void QStatusBar_ShowMessage(QStatusBar* self, struct miqt_string* text); +struct miqt_string QStatusBar_CurrentMessage(const QStatusBar* self); +void QStatusBar_ShowMessage(QStatusBar* self, struct miqt_string text); void QStatusBar_ClearMessage(QStatusBar* self); -void QStatusBar_MessageChanged(QStatusBar* self, struct miqt_string* text); +void QStatusBar_MessageChanged(QStatusBar* self, struct miqt_string text); void QStatusBar_connect_MessageChanged(QStatusBar* self, intptr_t slot); -struct miqt_string* QStatusBar_Tr2(const char* s, const char* c); -struct miqt_string* QStatusBar_Tr3(const char* s, const char* c, int n); -struct miqt_string* QStatusBar_TrUtf82(const char* s, const char* c); -struct miqt_string* QStatusBar_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QStatusBar_Tr2(const char* s, const char* c); +struct miqt_string QStatusBar_Tr3(const char* s, const char* c, int n); +struct miqt_string QStatusBar_TrUtf82(const char* s, const char* c); +struct miqt_string QStatusBar_TrUtf83(const char* s, const char* c, int n); void QStatusBar_AddWidget2(QStatusBar* self, QWidget* widget, int stretch); int QStatusBar_InsertWidget3(QStatusBar* self, int index, QWidget* widget, int stretch); void QStatusBar_AddPermanentWidget2(QStatusBar* self, QWidget* widget, int stretch); int QStatusBar_InsertPermanentWidget3(QStatusBar* self, int index, QWidget* widget, int stretch); -void QStatusBar_ShowMessage2(QStatusBar* self, struct miqt_string* text, int timeout); +void QStatusBar_ShowMessage2(QStatusBar* self, struct miqt_string text, int timeout); void QStatusBar_Delete(QStatusBar* self); #ifdef __cplusplus diff --git a/qt/gen_qstorageinfo.cpp b/qt/gen_qstorageinfo.cpp index 96e3b2fc..4da16e0b 100644 --- a/qt/gen_qstorageinfo.cpp +++ b/qt/gen_qstorageinfo.cpp @@ -13,8 +13,8 @@ QStorageInfo* QStorageInfo_new() { return new QStorageInfo(); } -QStorageInfo* QStorageInfo_new2(struct miqt_string* path) { - QString path_QString = QString::fromUtf8(&path->data, path->len); +QStorageInfo* QStorageInfo_new2(struct miqt_string path) { + QString path_QString = QString::fromUtf8(path.data, path.len); return new QStorageInfo(path_QString); } @@ -34,42 +34,69 @@ void QStorageInfo_Swap(QStorageInfo* self, QStorageInfo* other) { self->swap(*other); } -void QStorageInfo_SetPath(QStorageInfo* self, struct miqt_string* path) { - QString path_QString = QString::fromUtf8(&path->data, path->len); +void QStorageInfo_SetPath(QStorageInfo* self, struct miqt_string path) { + QString path_QString = QString::fromUtf8(path.data, path.len); self->setPath(path_QString); } -struct miqt_string* QStorageInfo_RootPath(const QStorageInfo* self) { +struct miqt_string QStorageInfo_RootPath(const QStorageInfo* self) { QString _ret = self->rootPath(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -QByteArray* QStorageInfo_Device(const QStorageInfo* self) { - return new QByteArray(self->device()); +struct miqt_string QStorageInfo_Device(const QStorageInfo* self) { + QByteArray _qb = self->device(); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } -QByteArray* QStorageInfo_Subvolume(const QStorageInfo* self) { - return new QByteArray(self->subvolume()); +struct miqt_string QStorageInfo_Subvolume(const QStorageInfo* self) { + QByteArray _qb = self->subvolume(); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } -QByteArray* QStorageInfo_FileSystemType(const QStorageInfo* self) { - return new QByteArray(self->fileSystemType()); +struct miqt_string QStorageInfo_FileSystemType(const QStorageInfo* self) { + QByteArray _qb = self->fileSystemType(); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } -struct miqt_string* QStorageInfo_Name(const QStorageInfo* self) { +struct miqt_string QStorageInfo_Name(const QStorageInfo* self) { QString _ret = self->name(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QStorageInfo_DisplayName(const QStorageInfo* self) { +struct miqt_string QStorageInfo_DisplayName(const QStorageInfo* self) { QString _ret = self->displayName(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } long long QStorageInfo_BytesTotal(const QStorageInfo* self) { diff --git a/qt/gen_qstorageinfo.go b/qt/gen_qstorageinfo.go index 6037d891..029433ba 100644 --- a/qt/gen_qstorageinfo.go +++ b/qt/gen_qstorageinfo.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -51,9 +50,11 @@ func NewQStorageInfo() *QStorageInfo { // NewQStorageInfo2 constructs a new QStorageInfo object. func NewQStorageInfo2(path string) *QStorageInfo { - path_ms := libmiqt.Strdupg(path) - defer C.free(path_ms) - ret := C.QStorageInfo_new2((*C.struct_miqt_string)(path_ms)) + path_ms := C.struct_miqt_string{} + path_ms.data = C.CString(path) + path_ms.len = C.size_t(len(path)) + defer C.free(unsafe.Pointer(path_ms.data)) + ret := C.QStorageInfo_new2(path_ms) return newQStorageInfo(ret) } @@ -78,50 +79,52 @@ func (this *QStorageInfo) Swap(other *QStorageInfo) { } func (this *QStorageInfo) SetPath(path string) { - path_ms := libmiqt.Strdupg(path) - defer C.free(path_ms) - C.QStorageInfo_SetPath(this.h, (*C.struct_miqt_string)(path_ms)) + path_ms := C.struct_miqt_string{} + path_ms.data = C.CString(path) + path_ms.len = C.size_t(len(path)) + defer C.free(unsafe.Pointer(path_ms.data)) + C.QStorageInfo_SetPath(this.h, path_ms) } func (this *QStorageInfo) RootPath() string { - var _ms *C.struct_miqt_string = C.QStorageInfo_RootPath(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStorageInfo_RootPath(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } -func (this *QStorageInfo) Device() *QByteArray { - _ret := C.QStorageInfo_Device(this.h) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QStorageInfo) Device() []byte { + var _bytearray C.struct_miqt_string = C.QStorageInfo_Device(this.h) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } -func (this *QStorageInfo) Subvolume() *QByteArray { - _ret := C.QStorageInfo_Subvolume(this.h) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QStorageInfo) Subvolume() []byte { + var _bytearray C.struct_miqt_string = C.QStorageInfo_Subvolume(this.h) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } -func (this *QStorageInfo) FileSystemType() *QByteArray { - _ret := C.QStorageInfo_FileSystemType(this.h) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QStorageInfo) FileSystemType() []byte { + var _bytearray C.struct_miqt_string = C.QStorageInfo_FileSystemType(this.h) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } func (this *QStorageInfo) Name() string { - var _ms *C.struct_miqt_string = C.QStorageInfo_Name(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStorageInfo_Name(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QStorageInfo) DisplayName() string { - var _ms *C.struct_miqt_string = C.QStorageInfo_DisplayName(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStorageInfo_DisplayName(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qstorageinfo.h b/qt/gen_qstorageinfo.h index ffa83f92..c1eb70bc 100644 --- a/qt/gen_qstorageinfo.h +++ b/qt/gen_qstorageinfo.h @@ -24,18 +24,18 @@ typedef struct QStorageInfo QStorageInfo; #endif QStorageInfo* QStorageInfo_new(); -QStorageInfo* QStorageInfo_new2(struct miqt_string* path); +QStorageInfo* QStorageInfo_new2(struct miqt_string path); QStorageInfo* QStorageInfo_new3(QDir* dir); QStorageInfo* QStorageInfo_new4(QStorageInfo* other); void QStorageInfo_OperatorAssign(QStorageInfo* self, QStorageInfo* other); void QStorageInfo_Swap(QStorageInfo* self, QStorageInfo* other); -void QStorageInfo_SetPath(QStorageInfo* self, struct miqt_string* path); -struct miqt_string* QStorageInfo_RootPath(const QStorageInfo* self); -QByteArray* QStorageInfo_Device(const QStorageInfo* self); -QByteArray* QStorageInfo_Subvolume(const QStorageInfo* self); -QByteArray* QStorageInfo_FileSystemType(const QStorageInfo* self); -struct miqt_string* QStorageInfo_Name(const QStorageInfo* self); -struct miqt_string* QStorageInfo_DisplayName(const QStorageInfo* self); +void QStorageInfo_SetPath(QStorageInfo* self, struct miqt_string path); +struct miqt_string QStorageInfo_RootPath(const QStorageInfo* self); +struct miqt_string QStorageInfo_Device(const QStorageInfo* self); +struct miqt_string QStorageInfo_Subvolume(const QStorageInfo* self); +struct miqt_string QStorageInfo_FileSystemType(const QStorageInfo* self); +struct miqt_string QStorageInfo_Name(const QStorageInfo* self); +struct miqt_string QStorageInfo_DisplayName(const QStorageInfo* self); long long QStorageInfo_BytesTotal(const QStorageInfo* self); long long QStorageInfo_BytesFree(const QStorageInfo* self); long long QStorageInfo_BytesAvailable(const QStorageInfo* self); diff --git a/qt/gen_qstringlistmodel.cpp b/qt/gen_qstringlistmodel.cpp index cef5cb3f..34557f54 100644 --- a/qt/gen_qstringlistmodel.cpp +++ b/qt/gen_qstringlistmodel.cpp @@ -15,12 +15,12 @@ QStringListModel* QStringListModel_new() { return new QStringListModel(); } -QStringListModel* QStringListModel_new2(struct miqt_array* /* of struct miqt_string* */ strings) { +QStringListModel* QStringListModel_new2(struct miqt_array* /* of struct miqt_string */ strings) { QStringList strings_QList; strings_QList.reserve(strings->len); - struct miqt_string** strings_arr = static_cast(strings->data); + struct miqt_string* strings_arr = static_cast(strings->data); for(size_t i = 0; i < strings->len; ++i) { - QString strings_arr_i_QString = QString::fromUtf8(&strings_arr[i]->data, strings_arr[i]->len); + QString strings_arr_i_QString = QString::fromUtf8(strings_arr[i].data, strings_arr[i].len); strings_QList.push_back(strings_arr_i_QString); } return new QStringListModel(strings_QList); @@ -30,12 +30,12 @@ QStringListModel* QStringListModel_new3(QObject* parent) { return new QStringListModel(parent); } -QStringListModel* QStringListModel_new4(struct miqt_array* /* of struct miqt_string* */ strings, QObject* parent) { +QStringListModel* QStringListModel_new4(struct miqt_array* /* of struct miqt_string */ strings, QObject* parent) { QStringList strings_QList; strings_QList.reserve(strings->len); - struct miqt_string** strings_arr = static_cast(strings->data); + struct miqt_string* strings_arr = static_cast(strings->data); for(size_t i = 0; i < strings->len; ++i) { - QString strings_arr_i_QString = QString::fromUtf8(&strings_arr[i]->data, strings_arr[i]->len); + QString strings_arr_i_QString = QString::fromUtf8(strings_arr[i].data, strings_arr[i].len); strings_QList.push_back(strings_arr_i_QString); } return new QStringListModel(strings_QList, parent); @@ -49,18 +49,26 @@ void* QStringListModel_Metacast(QStringListModel* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QStringListModel_Tr(const char* s) { +struct miqt_string QStringListModel_Tr(const char* s) { QString _ret = QStringListModel::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QStringListModel_TrUtf8(const char* s) { +struct miqt_string QStringListModel_TrUtf8(const char* s) { QString _ret = QStringListModel::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QStringListModel_RowCount(const QStringListModel* self) { @@ -103,12 +111,16 @@ void QStringListModel_Sort(QStringListModel* self, int column) { struct miqt_array* QStringListModel_StringList(const QStringListModel* self) { QStringList _ret = self->stringList(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -116,12 +128,12 @@ struct miqt_array* QStringListModel_StringList(const QStringListModel* self) { return _out; } -void QStringListModel_SetStringList(QStringListModel* self, struct miqt_array* /* of struct miqt_string* */ strings) { +void QStringListModel_SetStringList(QStringListModel* self, struct miqt_array* /* of struct miqt_string */ strings) { QStringList strings_QList; strings_QList.reserve(strings->len); - struct miqt_string** strings_arr = static_cast(strings->data); + struct miqt_string* strings_arr = static_cast(strings->data); for(size_t i = 0; i < strings->len; ++i) { - QString strings_arr_i_QString = QString::fromUtf8(&strings_arr[i]->data, strings_arr[i]->len); + QString strings_arr_i_QString = QString::fromUtf8(strings_arr[i].data, strings_arr[i].len); strings_QList.push_back(strings_arr_i_QString); } self->setStringList(strings_QList); @@ -132,32 +144,48 @@ int QStringListModel_SupportedDropActions(const QStringListModel* self) { return static_cast(_ret); } -struct miqt_string* QStringListModel_Tr2(const char* s, const char* c) { +struct miqt_string QStringListModel_Tr2(const char* s, const char* c) { QString _ret = QStringListModel::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QStringListModel_Tr3(const char* s, const char* c, int n) { +struct miqt_string QStringListModel_Tr3(const char* s, const char* c, int n) { QString _ret = QStringListModel::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QStringListModel_TrUtf82(const char* s, const char* c) { +struct miqt_string QStringListModel_TrUtf82(const char* s, const char* c) { QString _ret = QStringListModel::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QStringListModel_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QStringListModel_TrUtf83(const char* s, const char* c, int n) { QString _ret = QStringListModel::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QStringListModel_RowCount1(const QStringListModel* self, QModelIndex* parent) { diff --git a/qt/gen_qstringlistmodel.go b/qt/gen_qstringlistmodel.go index 047fd128..a1e80224 100644 --- a/qt/gen_qstringlistmodel.go +++ b/qt/gen_qstringlistmodel.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -53,12 +52,14 @@ func NewQStringListModel() *QStringListModel { // NewQStringListModel2 constructs a new QStringListModel object. func NewQStringListModel2(strings []string) *QStringListModel { // For the C ABI, malloc a C array of raw pointers - strings_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(strings)))) + strings_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(strings)))) defer C.free(unsafe.Pointer(strings_CArray)) for i := range strings { - strings_i_ms := libmiqt.Strdupg(strings[i]) - defer C.free(strings_i_ms) - strings_CArray[i] = (*C.struct_miqt_string)(strings_i_ms) + strings_i_ms := C.struct_miqt_string{} + strings_i_ms.data = C.CString(strings[i]) + strings_i_ms.len = C.size_t(len(strings[i])) + defer C.free(unsafe.Pointer(strings_i_ms.data)) + strings_CArray[i] = strings_i_ms } strings_ma := &C.struct_miqt_array{len: C.size_t(len(strings)), data: unsafe.Pointer(strings_CArray)} defer runtime.KeepAlive(unsafe.Pointer(strings_ma)) @@ -75,12 +76,14 @@ func NewQStringListModel3(parent *QObject) *QStringListModel { // NewQStringListModel4 constructs a new QStringListModel object. func NewQStringListModel4(strings []string, parent *QObject) *QStringListModel { // For the C ABI, malloc a C array of raw pointers - strings_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(strings)))) + strings_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(strings)))) defer C.free(unsafe.Pointer(strings_CArray)) for i := range strings { - strings_i_ms := libmiqt.Strdupg(strings[i]) - defer C.free(strings_i_ms) - strings_CArray[i] = (*C.struct_miqt_string)(strings_i_ms) + strings_i_ms := C.struct_miqt_string{} + strings_i_ms.data = C.CString(strings[i]) + strings_i_ms.len = C.size_t(len(strings[i])) + defer C.free(unsafe.Pointer(strings_i_ms.data)) + strings_CArray[i] = strings_i_ms } strings_ma := &C.struct_miqt_array{len: C.size_t(len(strings)), data: unsafe.Pointer(strings_CArray)} defer runtime.KeepAlive(unsafe.Pointer(strings_ma)) @@ -95,24 +98,24 @@ func (this *QStringListModel) MetaObject() *QMetaObject { func (this *QStringListModel) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QStringListModel_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QStringListModel_Metacast(this.h, param1_Cstring)) } func QStringListModel_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QStringListModel_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStringListModel_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QStringListModel_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QStringListModel_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStringListModel_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -161,11 +164,11 @@ func (this *QStringListModel) Sort(column int) { func (this *QStringListModel) StringList() []string { var _ma *C.struct_miqt_array = C.QStringListModel_StringList(this.h) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -174,12 +177,14 @@ func (this *QStringListModel) StringList() []string { func (this *QStringListModel) SetStringList(strings []string) { // For the C ABI, malloc a C array of raw pointers - strings_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(strings)))) + strings_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(strings)))) defer C.free(unsafe.Pointer(strings_CArray)) for i := range strings { - strings_i_ms := libmiqt.Strdupg(strings[i]) - defer C.free(strings_i_ms) - strings_CArray[i] = (*C.struct_miqt_string)(strings_i_ms) + strings_i_ms := C.struct_miqt_string{} + strings_i_ms.data = C.CString(strings[i]) + strings_i_ms.len = C.size_t(len(strings[i])) + defer C.free(unsafe.Pointer(strings_i_ms.data)) + strings_CArray[i] = strings_i_ms } strings_ma := &C.struct_miqt_array{len: C.size_t(len(strings)), data: unsafe.Pointer(strings_CArray)} defer runtime.KeepAlive(unsafe.Pointer(strings_ma)) @@ -195,9 +200,9 @@ func QStringListModel_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QStringListModel_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStringListModel_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -206,9 +211,9 @@ func QStringListModel_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QStringListModel_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStringListModel_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -217,9 +222,9 @@ func QStringListModel_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QStringListModel_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStringListModel_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -228,9 +233,9 @@ func QStringListModel_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QStringListModel_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStringListModel_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qstringlistmodel.h b/qt/gen_qstringlistmodel.h index aaea7176..6f1cc072 100644 --- a/qt/gen_qstringlistmodel.h +++ b/qt/gen_qstringlistmodel.h @@ -28,13 +28,13 @@ typedef struct QVariant QVariant; #endif QStringListModel* QStringListModel_new(); -QStringListModel* QStringListModel_new2(struct miqt_array* /* of struct miqt_string* */ strings); +QStringListModel* QStringListModel_new2(struct miqt_array* /* of struct miqt_string */ strings); QStringListModel* QStringListModel_new3(QObject* parent); -QStringListModel* QStringListModel_new4(struct miqt_array* /* of struct miqt_string* */ strings, QObject* parent); +QStringListModel* QStringListModel_new4(struct miqt_array* /* of struct miqt_string */ strings, QObject* parent); QMetaObject* QStringListModel_MetaObject(const QStringListModel* self); void* QStringListModel_Metacast(QStringListModel* self, const char* param1); -struct miqt_string* QStringListModel_Tr(const char* s); -struct miqt_string* QStringListModel_TrUtf8(const char* s); +struct miqt_string QStringListModel_Tr(const char* s); +struct miqt_string QStringListModel_TrUtf8(const char* s); int QStringListModel_RowCount(const QStringListModel* self); QModelIndex* QStringListModel_Sibling(const QStringListModel* self, int row, int column, QModelIndex* idx); QVariant* QStringListModel_Data(const QStringListModel* self, QModelIndex* index); @@ -45,12 +45,12 @@ bool QStringListModel_RemoveRows(QStringListModel* self, int row, int count); bool QStringListModel_MoveRows(QStringListModel* self, QModelIndex* sourceParent, int sourceRow, int count, QModelIndex* destinationParent, int destinationChild); void QStringListModel_Sort(QStringListModel* self, int column); struct miqt_array* QStringListModel_StringList(const QStringListModel* self); -void QStringListModel_SetStringList(QStringListModel* self, struct miqt_array* /* of struct miqt_string* */ strings); +void QStringListModel_SetStringList(QStringListModel* self, struct miqt_array* /* of struct miqt_string */ strings); int QStringListModel_SupportedDropActions(const QStringListModel* self); -struct miqt_string* QStringListModel_Tr2(const char* s, const char* c); -struct miqt_string* QStringListModel_Tr3(const char* s, const char* c, int n); -struct miqt_string* QStringListModel_TrUtf82(const char* s, const char* c); -struct miqt_string* QStringListModel_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QStringListModel_Tr2(const char* s, const char* c); +struct miqt_string QStringListModel_Tr3(const char* s, const char* c, int n); +struct miqt_string QStringListModel_TrUtf82(const char* s, const char* c); +struct miqt_string QStringListModel_TrUtf83(const char* s, const char* c, int n); int QStringListModel_RowCount1(const QStringListModel* self, QModelIndex* parent); QVariant* QStringListModel_Data2(const QStringListModel* self, QModelIndex* index, int role); bool QStringListModel_SetData3(QStringListModel* self, QModelIndex* index, QVariant* value, int role); diff --git a/qt/gen_qstringmatcher.cpp b/qt/gen_qstringmatcher.cpp index f9841a49..1de4663d 100644 --- a/qt/gen_qstringmatcher.cpp +++ b/qt/gen_qstringmatcher.cpp @@ -11,8 +11,8 @@ QStringMatcher* QStringMatcher_new() { return new QStringMatcher(); } -QStringMatcher* QStringMatcher_new2(struct miqt_string* pattern) { - QString pattern_QString = QString::fromUtf8(&pattern->data, pattern->len); +QStringMatcher* QStringMatcher_new2(struct miqt_string pattern) { + QString pattern_QString = QString::fromUtf8(pattern.data, pattern.len); return new QStringMatcher(pattern_QString); } @@ -24,8 +24,8 @@ QStringMatcher* QStringMatcher_new4(QStringMatcher* other) { return new QStringMatcher(*other); } -QStringMatcher* QStringMatcher_new5(struct miqt_string* pattern, int cs) { - QString pattern_QString = QString::fromUtf8(&pattern->data, pattern->len); +QStringMatcher* QStringMatcher_new5(struct miqt_string pattern, int cs) { + QString pattern_QString = QString::fromUtf8(pattern.data, pattern.len); return new QStringMatcher(pattern_QString, static_cast(cs)); } @@ -37,8 +37,8 @@ void QStringMatcher_OperatorAssign(QStringMatcher* self, QStringMatcher* other) self->operator=(*other); } -void QStringMatcher_SetPattern(QStringMatcher* self, struct miqt_string* pattern) { - QString pattern_QString = QString::fromUtf8(&pattern->data, pattern->len); +void QStringMatcher_SetPattern(QStringMatcher* self, struct miqt_string pattern) { + QString pattern_QString = QString::fromUtf8(pattern.data, pattern.len); self->setPattern(pattern_QString); } @@ -46,8 +46,8 @@ void QStringMatcher_SetCaseSensitivity(QStringMatcher* self, int cs) { self->setCaseSensitivity(static_cast(cs)); } -int QStringMatcher_IndexIn(const QStringMatcher* self, struct miqt_string* str) { - QString str_QString = QString::fromUtf8(&str->data, str->len); +int QStringMatcher_IndexIn(const QStringMatcher* self, struct miqt_string str) { + QString str_QString = QString::fromUtf8(str.data, str.len); return self->indexIn(str_QString); } @@ -55,11 +55,15 @@ int QStringMatcher_IndexIn2(const QStringMatcher* self, QChar* str, int length) return self->indexIn(str, static_cast(length)); } -struct miqt_string* QStringMatcher_Pattern(const QStringMatcher* self) { +struct miqt_string QStringMatcher_Pattern(const QStringMatcher* self) { QString _ret = self->pattern(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QStringMatcher_CaseSensitivity(const QStringMatcher* self) { @@ -67,8 +71,8 @@ int QStringMatcher_CaseSensitivity(const QStringMatcher* self) { return static_cast(_ret); } -int QStringMatcher_IndexIn22(const QStringMatcher* self, struct miqt_string* str, int from) { - QString str_QString = QString::fromUtf8(&str->data, str->len); +int QStringMatcher_IndexIn22(const QStringMatcher* self, struct miqt_string str, int from) { + QString str_QString = QString::fromUtf8(str.data, str.len); return self->indexIn(str_QString, static_cast(from)); } diff --git a/qt/gen_qstringmatcher.go b/qt/gen_qstringmatcher.go index 3a356bdd..9fabd5de 100644 --- a/qt/gen_qstringmatcher.go +++ b/qt/gen_qstringmatcher.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -51,9 +50,11 @@ func NewQStringMatcher() *QStringMatcher { // NewQStringMatcher2 constructs a new QStringMatcher object. func NewQStringMatcher2(pattern string) *QStringMatcher { - pattern_ms := libmiqt.Strdupg(pattern) - defer C.free(pattern_ms) - ret := C.QStringMatcher_new2((*C.struct_miqt_string)(pattern_ms)) + pattern_ms := C.struct_miqt_string{} + pattern_ms.data = C.CString(pattern) + pattern_ms.len = C.size_t(len(pattern)) + defer C.free(unsafe.Pointer(pattern_ms.data)) + ret := C.QStringMatcher_new2(pattern_ms) return newQStringMatcher(ret) } @@ -71,9 +72,11 @@ func NewQStringMatcher4(other *QStringMatcher) *QStringMatcher { // NewQStringMatcher5 constructs a new QStringMatcher object. func NewQStringMatcher5(pattern string, cs CaseSensitivity) *QStringMatcher { - pattern_ms := libmiqt.Strdupg(pattern) - defer C.free(pattern_ms) - ret := C.QStringMatcher_new5((*C.struct_miqt_string)(pattern_ms), (C.int)(cs)) + pattern_ms := C.struct_miqt_string{} + pattern_ms.data = C.CString(pattern) + pattern_ms.len = C.size_t(len(pattern)) + defer C.free(unsafe.Pointer(pattern_ms.data)) + ret := C.QStringMatcher_new5(pattern_ms, (C.int)(cs)) return newQStringMatcher(ret) } @@ -88,9 +91,11 @@ func (this *QStringMatcher) OperatorAssign(other *QStringMatcher) { } func (this *QStringMatcher) SetPattern(pattern string) { - pattern_ms := libmiqt.Strdupg(pattern) - defer C.free(pattern_ms) - C.QStringMatcher_SetPattern(this.h, (*C.struct_miqt_string)(pattern_ms)) + pattern_ms := C.struct_miqt_string{} + pattern_ms.data = C.CString(pattern) + pattern_ms.len = C.size_t(len(pattern)) + defer C.free(unsafe.Pointer(pattern_ms.data)) + C.QStringMatcher_SetPattern(this.h, pattern_ms) } func (this *QStringMatcher) SetCaseSensitivity(cs CaseSensitivity) { @@ -98,9 +103,11 @@ func (this *QStringMatcher) SetCaseSensitivity(cs CaseSensitivity) { } func (this *QStringMatcher) IndexIn(str string) int { - str_ms := libmiqt.Strdupg(str) - defer C.free(str_ms) - return (int)(C.QStringMatcher_IndexIn(this.h, (*C.struct_miqt_string)(str_ms))) + str_ms := C.struct_miqt_string{} + str_ms.data = C.CString(str) + str_ms.len = C.size_t(len(str)) + defer C.free(unsafe.Pointer(str_ms.data)) + return (int)(C.QStringMatcher_IndexIn(this.h, str_ms)) } func (this *QStringMatcher) IndexIn2(str *QChar, length int) int { @@ -108,9 +115,9 @@ func (this *QStringMatcher) IndexIn2(str *QChar, length int) int { } func (this *QStringMatcher) Pattern() string { - var _ms *C.struct_miqt_string = C.QStringMatcher_Pattern(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStringMatcher_Pattern(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -119,9 +126,11 @@ func (this *QStringMatcher) CaseSensitivity() CaseSensitivity { } func (this *QStringMatcher) IndexIn22(str string, from int) int { - str_ms := libmiqt.Strdupg(str) - defer C.free(str_ms) - return (int)(C.QStringMatcher_IndexIn22(this.h, (*C.struct_miqt_string)(str_ms), (C.int)(from))) + str_ms := C.struct_miqt_string{} + str_ms.data = C.CString(str) + str_ms.len = C.size_t(len(str)) + defer C.free(unsafe.Pointer(str_ms.data)) + return (int)(C.QStringMatcher_IndexIn22(this.h, str_ms, (C.int)(from))) } func (this *QStringMatcher) IndexIn3(str *QChar, length int, from int) int { diff --git a/qt/gen_qstringmatcher.h b/qt/gen_qstringmatcher.h index 83f83218..b8ad4d25 100644 --- a/qt/gen_qstringmatcher.h +++ b/qt/gen_qstringmatcher.h @@ -22,19 +22,19 @@ typedef struct QStringMatcher QStringMatcher; #endif QStringMatcher* QStringMatcher_new(); -QStringMatcher* QStringMatcher_new2(struct miqt_string* pattern); +QStringMatcher* QStringMatcher_new2(struct miqt_string pattern); QStringMatcher* QStringMatcher_new3(QChar* uc, int lenVal); QStringMatcher* QStringMatcher_new4(QStringMatcher* other); -QStringMatcher* QStringMatcher_new5(struct miqt_string* pattern, int cs); +QStringMatcher* QStringMatcher_new5(struct miqt_string pattern, int cs); QStringMatcher* QStringMatcher_new6(QChar* uc, int lenVal, int cs); void QStringMatcher_OperatorAssign(QStringMatcher* self, QStringMatcher* other); -void QStringMatcher_SetPattern(QStringMatcher* self, struct miqt_string* pattern); +void QStringMatcher_SetPattern(QStringMatcher* self, struct miqt_string pattern); void QStringMatcher_SetCaseSensitivity(QStringMatcher* self, int cs); -int QStringMatcher_IndexIn(const QStringMatcher* self, struct miqt_string* str); +int QStringMatcher_IndexIn(const QStringMatcher* self, struct miqt_string str); int QStringMatcher_IndexIn2(const QStringMatcher* self, QChar* str, int length); -struct miqt_string* QStringMatcher_Pattern(const QStringMatcher* self); +struct miqt_string QStringMatcher_Pattern(const QStringMatcher* self); int QStringMatcher_CaseSensitivity(const QStringMatcher* self); -int QStringMatcher_IndexIn22(const QStringMatcher* self, struct miqt_string* str, int from); +int QStringMatcher_IndexIn22(const QStringMatcher* self, struct miqt_string str, int from); int QStringMatcher_IndexIn3(const QStringMatcher* self, QChar* str, int length, int from); void QStringMatcher_Delete(QStringMatcher* self); diff --git a/qt/gen_qstringview.cpp b/qt/gen_qstringview.cpp index 57bc58c0..12ab4d4d 100644 --- a/qt/gen_qstringview.cpp +++ b/qt/gen_qstringview.cpp @@ -13,11 +13,15 @@ QStringView* QStringView_new() { return new QStringView(); } -struct miqt_string* QStringView_ToString(const QStringView* self) { +struct miqt_string QStringView_ToString(const QStringView* self) { QString _ret = self->toString(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } ptrdiff_t QStringView_Size(const QStringView* self) { @@ -34,16 +38,31 @@ QChar* QStringView_OperatorSubscript(const QStringView* self, ptrdiff_t n) { return new QChar(self->operator[]((qsizetype)(n))); } -QByteArray* QStringView_ToLatin1(const QStringView* self) { - return new QByteArray(self->toLatin1()); +struct miqt_string QStringView_ToLatin1(const QStringView* self) { + QByteArray _qb = self->toLatin1(); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } -QByteArray* QStringView_ToUtf8(const QStringView* self) { - return new QByteArray(self->toUtf8()); +struct miqt_string QStringView_ToUtf8(const QStringView* self) { + QByteArray _qb = self->toUtf8(); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } -QByteArray* QStringView_ToLocal8Bit(const QStringView* self) { - return new QByteArray(self->toLocal8Bit()); +struct miqt_string QStringView_ToLocal8Bit(const QStringView* self) { + QByteArray _qb = self->toLocal8Bit(); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } struct miqt_array* QStringView_ToUcs4(const QStringView* self) { diff --git a/qt/gen_qstringview.go b/qt/gen_qstringview.go index f0c26513..8a6c2599 100644 --- a/qt/gen_qstringview.go +++ b/qt/gen_qstringview.go @@ -49,9 +49,9 @@ func NewQStringView() *QStringView { } func (this *QStringView) ToString() string { - var _ms *C.struct_miqt_string = C.QStringView_ToString(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStringView_ToString(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -70,25 +70,25 @@ func (this *QStringView) OperatorSubscript(n int64) *QChar { return _goptr } -func (this *QStringView) ToLatin1() *QByteArray { - _ret := C.QStringView_ToLatin1(this.h) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QStringView) ToLatin1() []byte { + var _bytearray C.struct_miqt_string = C.QStringView_ToLatin1(this.h) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } -func (this *QStringView) ToUtf8() *QByteArray { - _ret := C.QStringView_ToUtf8(this.h) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QStringView) ToUtf8() []byte { + var _bytearray C.struct_miqt_string = C.QStringView_ToUtf8(this.h) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } -func (this *QStringView) ToLocal8Bit() *QByteArray { - _ret := C.QStringView_ToLocal8Bit(this.h) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QStringView) ToLocal8Bit() []byte { + var _bytearray C.struct_miqt_string = C.QStringView_ToLocal8Bit(this.h) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } func (this *QStringView) ToUcs4() []uint { diff --git a/qt/gen_qstringview.h b/qt/gen_qstringview.h index 4f3a5605..90827339 100644 --- a/qt/gen_qstringview.h +++ b/qt/gen_qstringview.h @@ -24,13 +24,13 @@ typedef struct QStringView QStringView; #endif QStringView* QStringView_new(); -struct miqt_string* QStringView_ToString(const QStringView* self); +struct miqt_string QStringView_ToString(const QStringView* self); ptrdiff_t QStringView_Size(const QStringView* self); QChar* QStringView_Data(const QStringView* self); QChar* QStringView_OperatorSubscript(const QStringView* self, ptrdiff_t n); -QByteArray* QStringView_ToLatin1(const QStringView* self); -QByteArray* QStringView_ToUtf8(const QStringView* self); -QByteArray* QStringView_ToLocal8Bit(const QStringView* self); +struct miqt_string QStringView_ToLatin1(const QStringView* self); +struct miqt_string QStringView_ToUtf8(const QStringView* self); +struct miqt_string QStringView_ToLocal8Bit(const QStringView* self); struct miqt_array* QStringView_ToUcs4(const QStringView* self); QChar* QStringView_At(const QStringView* self, ptrdiff_t n); void QStringView_Truncate(QStringView* self, ptrdiff_t n); diff --git a/qt/gen_qstyle.cpp b/qt/gen_qstyle.cpp index 308a9872..e46bafbe 100644 --- a/qt/gen_qstyle.cpp +++ b/qt/gen_qstyle.cpp @@ -28,18 +28,26 @@ void* QStyle_Metacast(QStyle* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QStyle_Tr(const char* s) { +struct miqt_string QStyle_Tr(const char* s) { QString _ret = QStyle::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QStyle_TrUtf8(const char* s) { +struct miqt_string QStyle_TrUtf8(const char* s) { QString _ret = QStyle::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QStyle_Polish(QStyle* self, QWidget* widget) { @@ -62,8 +70,8 @@ void QStyle_PolishWithPalette(QStyle* self, QPalette* palette) { self->polish(*palette); } -QRect* QStyle_ItemTextRect(const QStyle* self, QFontMetrics* fm, QRect* r, int flags, bool enabled, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QRect* QStyle_ItemTextRect(const QStyle* self, QFontMetrics* fm, QRect* r, int flags, bool enabled, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QRect(self->itemTextRect(*fm, *r, static_cast(flags), enabled, text_QString)); } @@ -71,8 +79,8 @@ QRect* QStyle_ItemPixmapRect(const QStyle* self, QRect* r, int flags, QPixmap* p return new QRect(self->itemPixmapRect(*r, static_cast(flags), *pixmap)); } -void QStyle_DrawItemText(const QStyle* self, QPainter* painter, QRect* rect, int flags, QPalette* pal, bool enabled, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QStyle_DrawItemText(const QStyle* self, QPainter* painter, QRect* rect, int flags, QPalette* pal, bool enabled, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->drawItemText(painter, *rect, static_cast(flags), *pal, enabled, text_QString); } @@ -170,36 +178,52 @@ QStyle* QStyle_Proxy(const QStyle* self) { return (QStyle*) self->proxy(); } -struct miqt_string* QStyle_Tr2(const char* s, const char* c) { +struct miqt_string QStyle_Tr2(const char* s, const char* c) { QString _ret = QStyle::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QStyle_Tr3(const char* s, const char* c, int n) { +struct miqt_string QStyle_Tr3(const char* s, const char* c, int n) { QString _ret = QStyle::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QStyle_TrUtf82(const char* s, const char* c) { +struct miqt_string QStyle_TrUtf82(const char* s, const char* c) { QString _ret = QStyle::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QStyle_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QStyle_TrUtf83(const char* s, const char* c, int n) { QString _ret = QStyle::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QStyle_DrawItemText7(const QStyle* self, QPainter* painter, QRect* rect, int flags, QPalette* pal, bool enabled, struct miqt_string* text, int textRole) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QStyle_DrawItemText7(const QStyle* self, QPainter* painter, QRect* rect, int flags, QPalette* pal, bool enabled, struct miqt_string text, int textRole) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->drawItemText(painter, *rect, static_cast(flags), *pal, enabled, text_QString, static_cast(textRole)); } diff --git a/qt/gen_qstyle.go b/qt/gen_qstyle.go index 571a5dab..1f9f7e6d 100644 --- a/qt/gen_qstyle.go +++ b/qt/gen_qstyle.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -674,24 +673,24 @@ func (this *QStyle) MetaObject() *QMetaObject { func (this *QStyle) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QStyle_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QStyle_Metacast(this.h, param1_Cstring)) } func QStyle_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QStyle_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStyle_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QStyle_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QStyle_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStyle_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -716,9 +715,11 @@ func (this *QStyle) PolishWithPalette(palette *QPalette) { } func (this *QStyle) ItemTextRect(fm *QFontMetrics, r *QRect, flags int, enabled bool, text string) *QRect { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - _ret := C.QStyle_ItemTextRect(this.h, fm.cPointer(), r.cPointer(), (C.int)(flags), (C.bool)(enabled), (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + _ret := C.QStyle_ItemTextRect(this.h, fm.cPointer(), r.cPointer(), (C.int)(flags), (C.bool)(enabled), text_ms) _goptr := newQRect(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -732,9 +733,11 @@ func (this *QStyle) ItemPixmapRect(r *QRect, flags int, pixmap *QPixmap) *QRect } func (this *QStyle) DrawItemText(painter *QPainter, rect *QRect, flags int, pal *QPalette, enabled bool, text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QStyle_DrawItemText(this.h, painter.cPointer(), rect.cPointer(), (C.int)(flags), pal.cPointer(), (C.bool)(enabled), (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QStyle_DrawItemText(this.h, painter.cPointer(), rect.cPointer(), (C.int)(flags), pal.cPointer(), (C.bool)(enabled), text_ms) } func (this *QStyle) DrawItemPixmap(painter *QPainter, rect *QRect, alignment int, pixmap *QPixmap) { @@ -864,9 +867,9 @@ func QStyle_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QStyle_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStyle_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -875,9 +878,9 @@ func QStyle_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QStyle_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStyle_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -886,9 +889,9 @@ func QStyle_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QStyle_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStyle_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -897,16 +900,18 @@ func QStyle_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QStyle_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStyle_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QStyle) DrawItemText7(painter *QPainter, rect *QRect, flags int, pal *QPalette, enabled bool, text string, textRole QPalette__ColorRole) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QStyle_DrawItemText7(this.h, painter.cPointer(), rect.cPointer(), (C.int)(flags), pal.cPointer(), (C.bool)(enabled), (*C.struct_miqt_string)(text_ms), (C.int)(textRole)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QStyle_DrawItemText7(this.h, painter.cPointer(), rect.cPointer(), (C.int)(flags), pal.cPointer(), (C.bool)(enabled), text_ms, (C.int)(textRole)) } func (this *QStyle) DrawPrimitive4(pe QStyle__PrimitiveElement, opt *QStyleOption, p *QPainter, w *QWidget) { diff --git a/qt/gen_qstyle.h b/qt/gen_qstyle.h index 26ad5bc8..884ed263 100644 --- a/qt/gen_qstyle.h +++ b/qt/gen_qstyle.h @@ -49,16 +49,16 @@ typedef struct QWidget QWidget; QMetaObject* QStyle_MetaObject(const QStyle* self); void* QStyle_Metacast(QStyle* self, const char* param1); -struct miqt_string* QStyle_Tr(const char* s); -struct miqt_string* QStyle_TrUtf8(const char* s); +struct miqt_string QStyle_Tr(const char* s); +struct miqt_string QStyle_TrUtf8(const char* s); void QStyle_Polish(QStyle* self, QWidget* widget); void QStyle_Unpolish(QStyle* self, QWidget* widget); void QStyle_PolishWithApplication(QStyle* self, QApplication* application); void QStyle_UnpolishWithApplication(QStyle* self, QApplication* application); void QStyle_PolishWithPalette(QStyle* self, QPalette* palette); -QRect* QStyle_ItemTextRect(const QStyle* self, QFontMetrics* fm, QRect* r, int flags, bool enabled, struct miqt_string* text); +QRect* QStyle_ItemTextRect(const QStyle* self, QFontMetrics* fm, QRect* r, int flags, bool enabled, struct miqt_string text); QRect* QStyle_ItemPixmapRect(const QStyle* self, QRect* r, int flags, QPixmap* pixmap); -void QStyle_DrawItemText(const QStyle* self, QPainter* painter, QRect* rect, int flags, QPalette* pal, bool enabled, struct miqt_string* text); +void QStyle_DrawItemText(const QStyle* self, QPainter* painter, QRect* rect, int flags, QPalette* pal, bool enabled, struct miqt_string text); void QStyle_DrawItemPixmap(const QStyle* self, QPainter* painter, QRect* rect, int alignment, QPixmap* pixmap); QPalette* QStyle_StandardPalette(const QStyle* self); void QStyle_DrawPrimitive(const QStyle* self, int pe, QStyleOption* opt, QPainter* p); @@ -82,11 +82,11 @@ QRect* QStyle_AlignedRect(int direction, int alignment, QSize* size, QRect* rect int QStyle_LayoutSpacing(const QStyle* self, int control1, int control2, int orientation); int QStyle_CombinedLayoutSpacing(const QStyle* self, int controls1, int controls2, int orientation); QStyle* QStyle_Proxy(const QStyle* self); -struct miqt_string* QStyle_Tr2(const char* s, const char* c); -struct miqt_string* QStyle_Tr3(const char* s, const char* c, int n); -struct miqt_string* QStyle_TrUtf82(const char* s, const char* c); -struct miqt_string* QStyle_TrUtf83(const char* s, const char* c, int n); -void QStyle_DrawItemText7(const QStyle* self, QPainter* painter, QRect* rect, int flags, QPalette* pal, bool enabled, struct miqt_string* text, int textRole); +struct miqt_string QStyle_Tr2(const char* s, const char* c); +struct miqt_string QStyle_Tr3(const char* s, const char* c, int n); +struct miqt_string QStyle_TrUtf82(const char* s, const char* c); +struct miqt_string QStyle_TrUtf83(const char* s, const char* c, int n); +void QStyle_DrawItemText7(const QStyle* self, QPainter* painter, QRect* rect, int flags, QPalette* pal, bool enabled, struct miqt_string text, int textRole); void QStyle_DrawPrimitive4(const QStyle* self, int pe, QStyleOption* opt, QPainter* p, QWidget* w); void QStyle_DrawControl4(const QStyle* self, int element, QStyleOption* opt, QPainter* p, QWidget* w); QRect* QStyle_SubElementRect3(const QStyle* self, int subElement, QStyleOption* option, QWidget* widget); diff --git a/qt/gen_qstyleditemdelegate.cpp b/qt/gen_qstyleditemdelegate.cpp index 81affc16..e51b50ad 100644 --- a/qt/gen_qstyleditemdelegate.cpp +++ b/qt/gen_qstyleditemdelegate.cpp @@ -33,18 +33,26 @@ void* QStyledItemDelegate_Metacast(QStyledItemDelegate* self, const char* param1 return self->qt_metacast(param1); } -struct miqt_string* QStyledItemDelegate_Tr(const char* s) { +struct miqt_string QStyledItemDelegate_Tr(const char* s) { QString _ret = QStyledItemDelegate::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QStyledItemDelegate_TrUtf8(const char* s) { +struct miqt_string QStyledItemDelegate_TrUtf8(const char* s) { QString _ret = QStyledItemDelegate::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QStyledItemDelegate_Paint(const QStyledItemDelegate* self, QPainter* painter, QStyleOptionViewItem* option, QModelIndex* index) { @@ -79,39 +87,59 @@ void QStyledItemDelegate_SetItemEditorFactory(QStyledItemDelegate* self, QItemEd self->setItemEditorFactory(factory); } -struct miqt_string* QStyledItemDelegate_DisplayText(const QStyledItemDelegate* self, QVariant* value, QLocale* locale) { +struct miqt_string QStyledItemDelegate_DisplayText(const QStyledItemDelegate* self, QVariant* value, QLocale* locale) { QString _ret = self->displayText(*value, *locale); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QStyledItemDelegate_Tr2(const char* s, const char* c) { +struct miqt_string QStyledItemDelegate_Tr2(const char* s, const char* c) { QString _ret = QStyledItemDelegate::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QStyledItemDelegate_Tr3(const char* s, const char* c, int n) { +struct miqt_string QStyledItemDelegate_Tr3(const char* s, const char* c, int n) { QString _ret = QStyledItemDelegate::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QStyledItemDelegate_TrUtf82(const char* s, const char* c) { +struct miqt_string QStyledItemDelegate_TrUtf82(const char* s, const char* c) { QString _ret = QStyledItemDelegate::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QStyledItemDelegate_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QStyledItemDelegate_TrUtf83(const char* s, const char* c, int n) { QString _ret = QStyledItemDelegate::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QStyledItemDelegate_Delete(QStyledItemDelegate* self) { diff --git a/qt/gen_qstyleditemdelegate.go b/qt/gen_qstyleditemdelegate.go index e968aa81..7398e52f 100644 --- a/qt/gen_qstyleditemdelegate.go +++ b/qt/gen_qstyleditemdelegate.go @@ -62,24 +62,24 @@ func (this *QStyledItemDelegate) MetaObject() *QMetaObject { func (this *QStyledItemDelegate) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QStyledItemDelegate_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QStyledItemDelegate_Metacast(this.h, param1_Cstring)) } func QStyledItemDelegate_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QStyledItemDelegate_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStyledItemDelegate_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QStyledItemDelegate_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QStyledItemDelegate_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStyledItemDelegate_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -119,9 +119,9 @@ func (this *QStyledItemDelegate) SetItemEditorFactory(factory *QItemEditorFactor } func (this *QStyledItemDelegate) DisplayText(value *QVariant, locale *QLocale) string { - var _ms *C.struct_miqt_string = C.QStyledItemDelegate_DisplayText(this.h, value.cPointer(), locale.cPointer()) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStyledItemDelegate_DisplayText(this.h, value.cPointer(), locale.cPointer()) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -130,9 +130,9 @@ func QStyledItemDelegate_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QStyledItemDelegate_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStyledItemDelegate_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -141,9 +141,9 @@ func QStyledItemDelegate_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QStyledItemDelegate_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStyledItemDelegate_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -152,9 +152,9 @@ func QStyledItemDelegate_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QStyledItemDelegate_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStyledItemDelegate_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -163,9 +163,9 @@ func QStyledItemDelegate_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QStyledItemDelegate_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStyledItemDelegate_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qstyleditemdelegate.h b/qt/gen_qstyleditemdelegate.h index dc9ee558..49eb90fc 100644 --- a/qt/gen_qstyleditemdelegate.h +++ b/qt/gen_qstyleditemdelegate.h @@ -45,8 +45,8 @@ QStyledItemDelegate* QStyledItemDelegate_new(); QStyledItemDelegate* QStyledItemDelegate_new2(QObject* parent); QMetaObject* QStyledItemDelegate_MetaObject(const QStyledItemDelegate* self); void* QStyledItemDelegate_Metacast(QStyledItemDelegate* self, const char* param1); -struct miqt_string* QStyledItemDelegate_Tr(const char* s); -struct miqt_string* QStyledItemDelegate_TrUtf8(const char* s); +struct miqt_string QStyledItemDelegate_Tr(const char* s); +struct miqt_string QStyledItemDelegate_TrUtf8(const char* s); void QStyledItemDelegate_Paint(const QStyledItemDelegate* self, QPainter* painter, QStyleOptionViewItem* option, QModelIndex* index); QSize* QStyledItemDelegate_SizeHint(const QStyledItemDelegate* self, QStyleOptionViewItem* option, QModelIndex* index); QWidget* QStyledItemDelegate_CreateEditor(const QStyledItemDelegate* self, QWidget* parent, QStyleOptionViewItem* option, QModelIndex* index); @@ -55,11 +55,11 @@ void QStyledItemDelegate_SetModelData(const QStyledItemDelegate* self, QWidget* void QStyledItemDelegate_UpdateEditorGeometry(const QStyledItemDelegate* self, QWidget* editor, QStyleOptionViewItem* option, QModelIndex* index); QItemEditorFactory* QStyledItemDelegate_ItemEditorFactory(const QStyledItemDelegate* self); void QStyledItemDelegate_SetItemEditorFactory(QStyledItemDelegate* self, QItemEditorFactory* factory); -struct miqt_string* QStyledItemDelegate_DisplayText(const QStyledItemDelegate* self, QVariant* value, QLocale* locale); -struct miqt_string* QStyledItemDelegate_Tr2(const char* s, const char* c); -struct miqt_string* QStyledItemDelegate_Tr3(const char* s, const char* c, int n); -struct miqt_string* QStyledItemDelegate_TrUtf82(const char* s, const char* c); -struct miqt_string* QStyledItemDelegate_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QStyledItemDelegate_DisplayText(const QStyledItemDelegate* self, QVariant* value, QLocale* locale); +struct miqt_string QStyledItemDelegate_Tr2(const char* s, const char* c); +struct miqt_string QStyledItemDelegate_Tr3(const char* s, const char* c, int n); +struct miqt_string QStyledItemDelegate_TrUtf82(const char* s, const char* c); +struct miqt_string QStyledItemDelegate_TrUtf83(const char* s, const char* c, int n); void QStyledItemDelegate_Delete(QStyledItemDelegate* self); #ifdef __cplusplus diff --git a/qt/gen_qstylefactory.cpp b/qt/gen_qstylefactory.cpp index a5bb7132..799aee8a 100644 --- a/qt/gen_qstylefactory.cpp +++ b/qt/gen_qstylefactory.cpp @@ -11,12 +11,16 @@ struct miqt_array* QStyleFactory_Keys() { QStringList _ret = QStyleFactory::keys(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -24,8 +28,8 @@ struct miqt_array* QStyleFactory_Keys() { return _out; } -QStyle* QStyleFactory_Create(struct miqt_string* param1) { - QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); +QStyle* QStyleFactory_Create(struct miqt_string param1) { + QString param1_QString = QString::fromUtf8(param1.data, param1.len); return QStyleFactory::create(param1_QString); } diff --git a/qt/gen_qstylefactory.go b/qt/gen_qstylefactory.go index 997c3309..a41e7ca4 100644 --- a/qt/gen_qstylefactory.go +++ b/qt/gen_qstylefactory.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -46,11 +45,11 @@ func UnsafeNewQStyleFactory(h unsafe.Pointer) *QStyleFactory { func QStyleFactory_Keys() []string { var _ma *C.struct_miqt_array = C.QStyleFactory_Keys() _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -58,9 +57,11 @@ func QStyleFactory_Keys() []string { } func QStyleFactory_Create(param1 string) *QStyle { - param1_ms := libmiqt.Strdupg(param1) - defer C.free(param1_ms) - return UnsafeNewQStyle(unsafe.Pointer(C.QStyleFactory_Create((*C.struct_miqt_string)(param1_ms)))) + param1_ms := C.struct_miqt_string{} + param1_ms.data = C.CString(param1) + param1_ms.len = C.size_t(len(param1)) + defer C.free(unsafe.Pointer(param1_ms.data)) + return UnsafeNewQStyle(unsafe.Pointer(C.QStyleFactory_Create(param1_ms))) } // Delete this object from C++ memory. diff --git a/qt/gen_qstylefactory.h b/qt/gen_qstylefactory.h index 9a29bfe8..609ea164 100644 --- a/qt/gen_qstylefactory.h +++ b/qt/gen_qstylefactory.h @@ -22,7 +22,7 @@ typedef struct QStyleFactory QStyleFactory; #endif struct miqt_array* QStyleFactory_Keys(); -QStyle* QStyleFactory_Create(struct miqt_string* param1); +QStyle* QStyleFactory_Create(struct miqt_string param1); void QStyleFactory_Delete(QStyleFactory* self); #ifdef __cplusplus diff --git a/qt/gen_qstylehints.cpp b/qt/gen_qstylehints.cpp index 30a7b4bd..2634e9b1 100644 --- a/qt/gen_qstylehints.cpp +++ b/qt/gen_qstylehints.cpp @@ -16,18 +16,26 @@ void* QStyleHints_Metacast(QStyleHints* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QStyleHints_Tr(const char* s) { +struct miqt_string QStyleHints_Tr(const char* s) { QString _ret = QStyleHints::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QStyleHints_TrUtf8(const char* s) { +struct miqt_string QStyleHints_TrUtf8(const char* s) { QString _ret = QStyleHints::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QStyleHints_SetMouseDoubleClickInterval(QStyleHints* self, int mouseDoubleClickInterval) { @@ -290,32 +298,48 @@ void QStyleHints_connect_MouseQuickSelectionThresholdChanged(QStyleHints* self, }); } -struct miqt_string* QStyleHints_Tr2(const char* s, const char* c) { +struct miqt_string QStyleHints_Tr2(const char* s, const char* c) { QString _ret = QStyleHints::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QStyleHints_Tr3(const char* s, const char* c, int n) { +struct miqt_string QStyleHints_Tr3(const char* s, const char* c, int n) { QString _ret = QStyleHints::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QStyleHints_TrUtf82(const char* s, const char* c) { +struct miqt_string QStyleHints_TrUtf82(const char* s, const char* c) { QString _ret = QStyleHints::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QStyleHints_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QStyleHints_TrUtf83(const char* s, const char* c, int n) { QString _ret = QStyleHints::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QStyleHints_Delete(QStyleHints* self) { diff --git a/qt/gen_qstylehints.go b/qt/gen_qstylehints.go index 92b42d8e..12a6f2c1 100644 --- a/qt/gen_qstylehints.go +++ b/qt/gen_qstylehints.go @@ -51,24 +51,24 @@ func (this *QStyleHints) MetaObject() *QMetaObject { func (this *QStyleHints) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QStyleHints_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QStyleHints_Metacast(this.h, param1_Cstring)) } func QStyleHints_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QStyleHints_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStyleHints_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QStyleHints_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QStyleHints_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStyleHints_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -436,9 +436,9 @@ func QStyleHints_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QStyleHints_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStyleHints_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -447,9 +447,9 @@ func QStyleHints_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QStyleHints_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStyleHints_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -458,9 +458,9 @@ func QStyleHints_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QStyleHints_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStyleHints_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -469,9 +469,9 @@ func QStyleHints_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QStyleHints_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStyleHints_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qstylehints.h b/qt/gen_qstylehints.h index f0e48378..404920e0 100644 --- a/qt/gen_qstylehints.h +++ b/qt/gen_qstylehints.h @@ -25,8 +25,8 @@ typedef struct QStyleHints QStyleHints; QMetaObject* QStyleHints_MetaObject(const QStyleHints* self); void* QStyleHints_Metacast(QStyleHints* self, const char* param1); -struct miqt_string* QStyleHints_Tr(const char* s); -struct miqt_string* QStyleHints_TrUtf8(const char* s); +struct miqt_string QStyleHints_Tr(const char* s); +struct miqt_string QStyleHints_TrUtf8(const char* s); void QStyleHints_SetMouseDoubleClickInterval(QStyleHints* self, int mouseDoubleClickInterval); int QStyleHints_MouseDoubleClickInterval(const QStyleHints* self); int QStyleHints_MouseDoubleClickDistance(const QStyleHints* self); @@ -83,10 +83,10 @@ void QStyleHints_WheelScrollLinesChanged(QStyleHints* self, int scrollLines); void QStyleHints_connect_WheelScrollLinesChanged(QStyleHints* self, intptr_t slot); void QStyleHints_MouseQuickSelectionThresholdChanged(QStyleHints* self, int threshold); void QStyleHints_connect_MouseQuickSelectionThresholdChanged(QStyleHints* self, intptr_t slot); -struct miqt_string* QStyleHints_Tr2(const char* s, const char* c); -struct miqt_string* QStyleHints_Tr3(const char* s, const char* c, int n); -struct miqt_string* QStyleHints_TrUtf82(const char* s, const char* c); -struct miqt_string* QStyleHints_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QStyleHints_Tr2(const char* s, const char* c); +struct miqt_string QStyleHints_Tr3(const char* s, const char* c, int n); +struct miqt_string QStyleHints_TrUtf82(const char* s, const char* c); +struct miqt_string QStyleHints_TrUtf83(const char* s, const char* c, int n); void QStyleHints_Delete(QStyleHints* self); #ifdef __cplusplus diff --git a/qt/gen_qstyleoption.go b/qt/gen_qstyleoption.go index bebe34bd..2f189902 100644 --- a/qt/gen_qstyleoption.go +++ b/qt/gen_qstyleoption.go @@ -47,159 +47,159 @@ const ( type QStyleOption__StyleOptionType int const ( - QStyleOption__StyleOptionType__Type QStyleOption__StyleOptionType = 0 + QStyleOption__Type QStyleOption__StyleOptionType = 0 ) type QStyleOption__StyleOptionVersion int const ( - QStyleOption__StyleOptionVersion__Version QStyleOption__StyleOptionVersion = 1 + QStyleOption__Version QStyleOption__StyleOptionVersion = 1 ) type QStyleOptionFocusRect__StyleOptionType int const ( - QStyleOptionFocusRect__StyleOptionType__Type QStyleOptionFocusRect__StyleOptionType = 1 + QStyleOptionFocusRect__Type QStyleOptionFocusRect__StyleOptionType = 1 ) type QStyleOptionFocusRect__StyleOptionVersion int const ( - QStyleOptionFocusRect__StyleOptionVersion__Version QStyleOptionFocusRect__StyleOptionVersion = 1 + QStyleOptionFocusRect__Version QStyleOptionFocusRect__StyleOptionVersion = 1 ) type QStyleOptionFrame__StyleOptionType int const ( - QStyleOptionFrame__StyleOptionType__Type QStyleOptionFrame__StyleOptionType = 5 + QStyleOptionFrame__Type QStyleOptionFrame__StyleOptionType = 5 ) type QStyleOptionFrame__StyleOptionVersion int const ( - QStyleOptionFrame__StyleOptionVersion__Version QStyleOptionFrame__StyleOptionVersion = 3 + QStyleOptionFrame__Version QStyleOptionFrame__StyleOptionVersion = 3 ) type QStyleOptionFrame__FrameFeature int const ( - QStyleOptionFrame__FrameFeature__None QStyleOptionFrame__FrameFeature = 0 - QStyleOptionFrame__FrameFeature__Flat QStyleOptionFrame__FrameFeature = 1 - QStyleOptionFrame__FrameFeature__Rounded QStyleOptionFrame__FrameFeature = 2 + QStyleOptionFrame__None QStyleOptionFrame__FrameFeature = 0 + QStyleOptionFrame__Flat QStyleOptionFrame__FrameFeature = 1 + QStyleOptionFrame__Rounded QStyleOptionFrame__FrameFeature = 2 ) type QStyleOptionTabWidgetFrame__StyleOptionType int const ( - QStyleOptionTabWidgetFrame__StyleOptionType__Type QStyleOptionTabWidgetFrame__StyleOptionType = 11 + QStyleOptionTabWidgetFrame__Type QStyleOptionTabWidgetFrame__StyleOptionType = 11 ) type QStyleOptionTabWidgetFrame__StyleOptionVersion int const ( - QStyleOptionTabWidgetFrame__StyleOptionVersion__Version QStyleOptionTabWidgetFrame__StyleOptionVersion = 2 + QStyleOptionTabWidgetFrame__Version QStyleOptionTabWidgetFrame__StyleOptionVersion = 2 ) type QStyleOptionTabBarBase__StyleOptionType int const ( - QStyleOptionTabBarBase__StyleOptionType__Type QStyleOptionTabBarBase__StyleOptionType = 12 + QStyleOptionTabBarBase__Type QStyleOptionTabBarBase__StyleOptionType = 12 ) type QStyleOptionTabBarBase__StyleOptionVersion int const ( - QStyleOptionTabBarBase__StyleOptionVersion__Version QStyleOptionTabBarBase__StyleOptionVersion = 2 + QStyleOptionTabBarBase__Version QStyleOptionTabBarBase__StyleOptionVersion = 2 ) type QStyleOptionHeader__StyleOptionType int const ( - QStyleOptionHeader__StyleOptionType__Type QStyleOptionHeader__StyleOptionType = 8 + QStyleOptionHeader__Type QStyleOptionHeader__StyleOptionType = 8 ) type QStyleOptionHeader__StyleOptionVersion int const ( - QStyleOptionHeader__StyleOptionVersion__Version QStyleOptionHeader__StyleOptionVersion = 1 + QStyleOptionHeader__Version QStyleOptionHeader__StyleOptionVersion = 1 ) type QStyleOptionHeader__SectionPosition int const ( - QStyleOptionHeader__SectionPosition__Beginning QStyleOptionHeader__SectionPosition = 0 - QStyleOptionHeader__SectionPosition__Middle QStyleOptionHeader__SectionPosition = 1 - QStyleOptionHeader__SectionPosition__End QStyleOptionHeader__SectionPosition = 2 - QStyleOptionHeader__SectionPosition__OnlyOneSection QStyleOptionHeader__SectionPosition = 3 + QStyleOptionHeader__Beginning QStyleOptionHeader__SectionPosition = 0 + QStyleOptionHeader__Middle QStyleOptionHeader__SectionPosition = 1 + QStyleOptionHeader__End QStyleOptionHeader__SectionPosition = 2 + QStyleOptionHeader__OnlyOneSection QStyleOptionHeader__SectionPosition = 3 ) type QStyleOptionHeader__SelectedPosition int const ( - QStyleOptionHeader__SelectedPosition__NotAdjacent QStyleOptionHeader__SelectedPosition = 0 - QStyleOptionHeader__SelectedPosition__NextIsSelected QStyleOptionHeader__SelectedPosition = 1 - QStyleOptionHeader__SelectedPosition__PreviousIsSelected QStyleOptionHeader__SelectedPosition = 2 - QStyleOptionHeader__SelectedPosition__NextAndPreviousAreSelected QStyleOptionHeader__SelectedPosition = 3 + QStyleOptionHeader__NotAdjacent QStyleOptionHeader__SelectedPosition = 0 + QStyleOptionHeader__NextIsSelected QStyleOptionHeader__SelectedPosition = 1 + QStyleOptionHeader__PreviousIsSelected QStyleOptionHeader__SelectedPosition = 2 + QStyleOptionHeader__NextAndPreviousAreSelected QStyleOptionHeader__SelectedPosition = 3 ) type QStyleOptionHeader__SortIndicator int const ( - QStyleOptionHeader__SortIndicator__None QStyleOptionHeader__SortIndicator = 0 - QStyleOptionHeader__SortIndicator__SortUp QStyleOptionHeader__SortIndicator = 1 - QStyleOptionHeader__SortIndicator__SortDown QStyleOptionHeader__SortIndicator = 2 + QStyleOptionHeader__None QStyleOptionHeader__SortIndicator = 0 + QStyleOptionHeader__SortUp QStyleOptionHeader__SortIndicator = 1 + QStyleOptionHeader__SortDown QStyleOptionHeader__SortIndicator = 2 ) type QStyleOptionButton__StyleOptionType int const ( - QStyleOptionButton__StyleOptionType__Type QStyleOptionButton__StyleOptionType = 2 + QStyleOptionButton__Type QStyleOptionButton__StyleOptionType = 2 ) type QStyleOptionButton__StyleOptionVersion int const ( - QStyleOptionButton__StyleOptionVersion__Version QStyleOptionButton__StyleOptionVersion = 1 + QStyleOptionButton__Version QStyleOptionButton__StyleOptionVersion = 1 ) type QStyleOptionButton__ButtonFeature int const ( - QStyleOptionButton__ButtonFeature__None QStyleOptionButton__ButtonFeature = 0 - QStyleOptionButton__ButtonFeature__Flat QStyleOptionButton__ButtonFeature = 1 - QStyleOptionButton__ButtonFeature__HasMenu QStyleOptionButton__ButtonFeature = 2 - QStyleOptionButton__ButtonFeature__DefaultButton QStyleOptionButton__ButtonFeature = 4 - QStyleOptionButton__ButtonFeature__AutoDefaultButton QStyleOptionButton__ButtonFeature = 8 - QStyleOptionButton__ButtonFeature__CommandLinkButton QStyleOptionButton__ButtonFeature = 16 + QStyleOptionButton__None QStyleOptionButton__ButtonFeature = 0 + QStyleOptionButton__Flat QStyleOptionButton__ButtonFeature = 1 + QStyleOptionButton__HasMenu QStyleOptionButton__ButtonFeature = 2 + QStyleOptionButton__DefaultButton QStyleOptionButton__ButtonFeature = 4 + QStyleOptionButton__AutoDefaultButton QStyleOptionButton__ButtonFeature = 8 + QStyleOptionButton__CommandLinkButton QStyleOptionButton__ButtonFeature = 16 ) type QStyleOptionTab__StyleOptionType int const ( - QStyleOptionTab__StyleOptionType__Type QStyleOptionTab__StyleOptionType = 3 + QStyleOptionTab__Type QStyleOptionTab__StyleOptionType = 3 ) type QStyleOptionTab__StyleOptionVersion int const ( - QStyleOptionTab__StyleOptionVersion__Version QStyleOptionTab__StyleOptionVersion = 3 + QStyleOptionTab__Version QStyleOptionTab__StyleOptionVersion = 3 ) type QStyleOptionTab__TabPosition int const ( - QStyleOptionTab__TabPosition__Beginning QStyleOptionTab__TabPosition = 0 - QStyleOptionTab__TabPosition__Middle QStyleOptionTab__TabPosition = 1 - QStyleOptionTab__TabPosition__End QStyleOptionTab__TabPosition = 2 - QStyleOptionTab__TabPosition__OnlyOneTab QStyleOptionTab__TabPosition = 3 + QStyleOptionTab__Beginning QStyleOptionTab__TabPosition = 0 + QStyleOptionTab__Middle QStyleOptionTab__TabPosition = 1 + QStyleOptionTab__End QStyleOptionTab__TabPosition = 2 + QStyleOptionTab__OnlyOneTab QStyleOptionTab__TabPosition = 3 ) type QStyleOptionTab__SelectedPosition int const ( - QStyleOptionTab__SelectedPosition__NotAdjacent QStyleOptionTab__SelectedPosition = 0 - QStyleOptionTab__SelectedPosition__NextIsSelected QStyleOptionTab__SelectedPosition = 1 - QStyleOptionTab__SelectedPosition__PreviousIsSelected QStyleOptionTab__SelectedPosition = 2 + QStyleOptionTab__NotAdjacent QStyleOptionTab__SelectedPosition = 0 + QStyleOptionTab__NextIsSelected QStyleOptionTab__SelectedPosition = 1 + QStyleOptionTab__PreviousIsSelected QStyleOptionTab__SelectedPosition = 2 ) type QStyleOptionTab__CornerWidget int @@ -213,66 +213,66 @@ const ( type QStyleOptionTab__TabFeature int const ( - QStyleOptionTab__TabFeature__None QStyleOptionTab__TabFeature = 0 - QStyleOptionTab__TabFeature__HasFrame QStyleOptionTab__TabFeature = 1 + QStyleOptionTab__None QStyleOptionTab__TabFeature = 0 + QStyleOptionTab__HasFrame QStyleOptionTab__TabFeature = 1 ) type QStyleOptionTabV4__StyleOptionVersion int const ( - QStyleOptionTabV4__StyleOptionVersion__Version QStyleOptionTabV4__StyleOptionVersion = 4 + QStyleOptionTabV4__Version QStyleOptionTabV4__StyleOptionVersion = 4 ) type QStyleOptionToolBar__StyleOptionType int const ( - QStyleOptionToolBar__StyleOptionType__Type QStyleOptionToolBar__StyleOptionType = 14 + QStyleOptionToolBar__Type QStyleOptionToolBar__StyleOptionType = 14 ) type QStyleOptionToolBar__StyleOptionVersion int const ( - QStyleOptionToolBar__StyleOptionVersion__Version QStyleOptionToolBar__StyleOptionVersion = 1 + QStyleOptionToolBar__Version QStyleOptionToolBar__StyleOptionVersion = 1 ) type QStyleOptionToolBar__ToolBarPosition int const ( - QStyleOptionToolBar__ToolBarPosition__Beginning QStyleOptionToolBar__ToolBarPosition = 0 - QStyleOptionToolBar__ToolBarPosition__Middle QStyleOptionToolBar__ToolBarPosition = 1 - QStyleOptionToolBar__ToolBarPosition__End QStyleOptionToolBar__ToolBarPosition = 2 - QStyleOptionToolBar__ToolBarPosition__OnlyOne QStyleOptionToolBar__ToolBarPosition = 3 + QStyleOptionToolBar__Beginning QStyleOptionToolBar__ToolBarPosition = 0 + QStyleOptionToolBar__Middle QStyleOptionToolBar__ToolBarPosition = 1 + QStyleOptionToolBar__End QStyleOptionToolBar__ToolBarPosition = 2 + QStyleOptionToolBar__OnlyOne QStyleOptionToolBar__ToolBarPosition = 3 ) type QStyleOptionToolBar__ToolBarFeature int const ( - QStyleOptionToolBar__ToolBarFeature__None QStyleOptionToolBar__ToolBarFeature = 0 - QStyleOptionToolBar__ToolBarFeature__Movable QStyleOptionToolBar__ToolBarFeature = 1 + QStyleOptionToolBar__None QStyleOptionToolBar__ToolBarFeature = 0 + QStyleOptionToolBar__Movable QStyleOptionToolBar__ToolBarFeature = 1 ) type QStyleOptionProgressBar__StyleOptionType int const ( - QStyleOptionProgressBar__StyleOptionType__Type QStyleOptionProgressBar__StyleOptionType = 6 + QStyleOptionProgressBar__Type QStyleOptionProgressBar__StyleOptionType = 6 ) type QStyleOptionProgressBar__StyleOptionVersion int const ( - QStyleOptionProgressBar__StyleOptionVersion__Version QStyleOptionProgressBar__StyleOptionVersion = 2 + QStyleOptionProgressBar__Version QStyleOptionProgressBar__StyleOptionVersion = 2 ) type QStyleOptionMenuItem__StyleOptionType int const ( - QStyleOptionMenuItem__StyleOptionType__Type QStyleOptionMenuItem__StyleOptionType = 4 + QStyleOptionMenuItem__Type QStyleOptionMenuItem__StyleOptionType = 4 ) type QStyleOptionMenuItem__StyleOptionVersion int const ( - QStyleOptionMenuItem__StyleOptionVersion__Version QStyleOptionMenuItem__StyleOptionVersion = 1 + QStyleOptionMenuItem__Version QStyleOptionMenuItem__StyleOptionVersion = 1 ) type QStyleOptionMenuItem__MenuItemType int @@ -299,25 +299,25 @@ const ( type QStyleOptionDockWidget__StyleOptionType int const ( - QStyleOptionDockWidget__StyleOptionType__Type QStyleOptionDockWidget__StyleOptionType = 9 + QStyleOptionDockWidget__Type QStyleOptionDockWidget__StyleOptionType = 9 ) type QStyleOptionDockWidget__StyleOptionVersion int const ( - QStyleOptionDockWidget__StyleOptionVersion__Version QStyleOptionDockWidget__StyleOptionVersion = 2 + QStyleOptionDockWidget__Version QStyleOptionDockWidget__StyleOptionVersion = 2 ) type QStyleOptionViewItem__StyleOptionType int const ( - QStyleOptionViewItem__StyleOptionType__Type QStyleOptionViewItem__StyleOptionType = 10 + QStyleOptionViewItem__Type QStyleOptionViewItem__StyleOptionType = 10 ) type QStyleOptionViewItem__StyleOptionVersion int const ( - QStyleOptionViewItem__StyleOptionVersion__Version QStyleOptionViewItem__StyleOptionVersion = 4 + QStyleOptionViewItem__Version QStyleOptionViewItem__StyleOptionVersion = 4 ) type QStyleOptionViewItem__Position int @@ -332,182 +332,182 @@ const ( type QStyleOptionViewItem__ViewItemFeature int const ( - QStyleOptionViewItem__ViewItemFeature__None QStyleOptionViewItem__ViewItemFeature = 0 - QStyleOptionViewItem__ViewItemFeature__WrapText QStyleOptionViewItem__ViewItemFeature = 1 - QStyleOptionViewItem__ViewItemFeature__Alternate QStyleOptionViewItem__ViewItemFeature = 2 - QStyleOptionViewItem__ViewItemFeature__HasCheckIndicator QStyleOptionViewItem__ViewItemFeature = 4 - QStyleOptionViewItem__ViewItemFeature__HasDisplay QStyleOptionViewItem__ViewItemFeature = 8 - QStyleOptionViewItem__ViewItemFeature__HasDecoration QStyleOptionViewItem__ViewItemFeature = 16 + QStyleOptionViewItem__None QStyleOptionViewItem__ViewItemFeature = 0 + QStyleOptionViewItem__WrapText QStyleOptionViewItem__ViewItemFeature = 1 + QStyleOptionViewItem__Alternate QStyleOptionViewItem__ViewItemFeature = 2 + QStyleOptionViewItem__HasCheckIndicator QStyleOptionViewItem__ViewItemFeature = 4 + QStyleOptionViewItem__HasDisplay QStyleOptionViewItem__ViewItemFeature = 8 + QStyleOptionViewItem__HasDecoration QStyleOptionViewItem__ViewItemFeature = 16 ) type QStyleOptionViewItem__ViewItemPosition int const ( - QStyleOptionViewItem__ViewItemPosition__Invalid QStyleOptionViewItem__ViewItemPosition = 0 - QStyleOptionViewItem__ViewItemPosition__Beginning QStyleOptionViewItem__ViewItemPosition = 1 - QStyleOptionViewItem__ViewItemPosition__Middle QStyleOptionViewItem__ViewItemPosition = 2 - QStyleOptionViewItem__ViewItemPosition__End QStyleOptionViewItem__ViewItemPosition = 3 - QStyleOptionViewItem__ViewItemPosition__OnlyOne QStyleOptionViewItem__ViewItemPosition = 4 + QStyleOptionViewItem__Invalid QStyleOptionViewItem__ViewItemPosition = 0 + QStyleOptionViewItem__Beginning QStyleOptionViewItem__ViewItemPosition = 1 + QStyleOptionViewItem__Middle QStyleOptionViewItem__ViewItemPosition = 2 + QStyleOptionViewItem__End QStyleOptionViewItem__ViewItemPosition = 3 + QStyleOptionViewItem__OnlyOne QStyleOptionViewItem__ViewItemPosition = 4 ) type QStyleOptionToolBox__StyleOptionType int const ( - QStyleOptionToolBox__StyleOptionType__Type QStyleOptionToolBox__StyleOptionType = 7 + QStyleOptionToolBox__Type QStyleOptionToolBox__StyleOptionType = 7 ) type QStyleOptionToolBox__StyleOptionVersion int const ( - QStyleOptionToolBox__StyleOptionVersion__Version QStyleOptionToolBox__StyleOptionVersion = 2 + QStyleOptionToolBox__Version QStyleOptionToolBox__StyleOptionVersion = 2 ) type QStyleOptionToolBox__TabPosition int const ( - QStyleOptionToolBox__TabPosition__Beginning QStyleOptionToolBox__TabPosition = 0 - QStyleOptionToolBox__TabPosition__Middle QStyleOptionToolBox__TabPosition = 1 - QStyleOptionToolBox__TabPosition__End QStyleOptionToolBox__TabPosition = 2 - QStyleOptionToolBox__TabPosition__OnlyOneTab QStyleOptionToolBox__TabPosition = 3 + QStyleOptionToolBox__Beginning QStyleOptionToolBox__TabPosition = 0 + QStyleOptionToolBox__Middle QStyleOptionToolBox__TabPosition = 1 + QStyleOptionToolBox__End QStyleOptionToolBox__TabPosition = 2 + QStyleOptionToolBox__OnlyOneTab QStyleOptionToolBox__TabPosition = 3 ) type QStyleOptionToolBox__SelectedPosition int const ( - QStyleOptionToolBox__SelectedPosition__NotAdjacent QStyleOptionToolBox__SelectedPosition = 0 - QStyleOptionToolBox__SelectedPosition__NextIsSelected QStyleOptionToolBox__SelectedPosition = 1 - QStyleOptionToolBox__SelectedPosition__PreviousIsSelected QStyleOptionToolBox__SelectedPosition = 2 + QStyleOptionToolBox__NotAdjacent QStyleOptionToolBox__SelectedPosition = 0 + QStyleOptionToolBox__NextIsSelected QStyleOptionToolBox__SelectedPosition = 1 + QStyleOptionToolBox__PreviousIsSelected QStyleOptionToolBox__SelectedPosition = 2 ) type QStyleOptionRubberBand__StyleOptionType int const ( - QStyleOptionRubberBand__StyleOptionType__Type QStyleOptionRubberBand__StyleOptionType = 13 + QStyleOptionRubberBand__Type QStyleOptionRubberBand__StyleOptionType = 13 ) type QStyleOptionRubberBand__StyleOptionVersion int const ( - QStyleOptionRubberBand__StyleOptionVersion__Version QStyleOptionRubberBand__StyleOptionVersion = 1 + QStyleOptionRubberBand__Version QStyleOptionRubberBand__StyleOptionVersion = 1 ) type QStyleOptionComplex__StyleOptionType int const ( - QStyleOptionComplex__StyleOptionType__Type QStyleOptionComplex__StyleOptionType = 983040 + QStyleOptionComplex__Type QStyleOptionComplex__StyleOptionType = 983040 ) type QStyleOptionComplex__StyleOptionVersion int const ( - QStyleOptionComplex__StyleOptionVersion__Version QStyleOptionComplex__StyleOptionVersion = 1 + QStyleOptionComplex__Version QStyleOptionComplex__StyleOptionVersion = 1 ) type QStyleOptionSlider__StyleOptionType int const ( - QStyleOptionSlider__StyleOptionType__Type QStyleOptionSlider__StyleOptionType = 983041 + QStyleOptionSlider__Type QStyleOptionSlider__StyleOptionType = 983041 ) type QStyleOptionSlider__StyleOptionVersion int const ( - QStyleOptionSlider__StyleOptionVersion__Version QStyleOptionSlider__StyleOptionVersion = 1 + QStyleOptionSlider__Version QStyleOptionSlider__StyleOptionVersion = 1 ) type QStyleOptionSpinBox__StyleOptionType int const ( - QStyleOptionSpinBox__StyleOptionType__Type QStyleOptionSpinBox__StyleOptionType = 983042 + QStyleOptionSpinBox__Type QStyleOptionSpinBox__StyleOptionType = 983042 ) type QStyleOptionSpinBox__StyleOptionVersion int const ( - QStyleOptionSpinBox__StyleOptionVersion__Version QStyleOptionSpinBox__StyleOptionVersion = 1 + QStyleOptionSpinBox__Version QStyleOptionSpinBox__StyleOptionVersion = 1 ) type QStyleOptionToolButton__StyleOptionType int const ( - QStyleOptionToolButton__StyleOptionType__Type QStyleOptionToolButton__StyleOptionType = 983043 + QStyleOptionToolButton__Type QStyleOptionToolButton__StyleOptionType = 983043 ) type QStyleOptionToolButton__StyleOptionVersion int const ( - QStyleOptionToolButton__StyleOptionVersion__Version QStyleOptionToolButton__StyleOptionVersion = 1 + QStyleOptionToolButton__Version QStyleOptionToolButton__StyleOptionVersion = 1 ) type QStyleOptionToolButton__ToolButtonFeature int const ( - QStyleOptionToolButton__ToolButtonFeature__None QStyleOptionToolButton__ToolButtonFeature = 0 - QStyleOptionToolButton__ToolButtonFeature__Arrow QStyleOptionToolButton__ToolButtonFeature = 1 - QStyleOptionToolButton__ToolButtonFeature__Menu QStyleOptionToolButton__ToolButtonFeature = 4 - QStyleOptionToolButton__ToolButtonFeature__MenuButtonPopup QStyleOptionToolButton__ToolButtonFeature = 4 - QStyleOptionToolButton__ToolButtonFeature__PopupDelay QStyleOptionToolButton__ToolButtonFeature = 8 - QStyleOptionToolButton__ToolButtonFeature__HasMenu QStyleOptionToolButton__ToolButtonFeature = 16 + QStyleOptionToolButton__None QStyleOptionToolButton__ToolButtonFeature = 0 + QStyleOptionToolButton__Arrow QStyleOptionToolButton__ToolButtonFeature = 1 + QStyleOptionToolButton__Menu QStyleOptionToolButton__ToolButtonFeature = 4 + QStyleOptionToolButton__MenuButtonPopup QStyleOptionToolButton__ToolButtonFeature = 4 + QStyleOptionToolButton__PopupDelay QStyleOptionToolButton__ToolButtonFeature = 8 + QStyleOptionToolButton__HasMenu QStyleOptionToolButton__ToolButtonFeature = 16 ) type QStyleOptionComboBox__StyleOptionType int const ( - QStyleOptionComboBox__StyleOptionType__Type QStyleOptionComboBox__StyleOptionType = 983044 + QStyleOptionComboBox__Type QStyleOptionComboBox__StyleOptionType = 983044 ) type QStyleOptionComboBox__StyleOptionVersion int const ( - QStyleOptionComboBox__StyleOptionVersion__Version QStyleOptionComboBox__StyleOptionVersion = 1 + QStyleOptionComboBox__Version QStyleOptionComboBox__StyleOptionVersion = 1 ) type QStyleOptionTitleBar__StyleOptionType int const ( - QStyleOptionTitleBar__StyleOptionType__Type QStyleOptionTitleBar__StyleOptionType = 983045 + QStyleOptionTitleBar__Type QStyleOptionTitleBar__StyleOptionType = 983045 ) type QStyleOptionTitleBar__StyleOptionVersion int const ( - QStyleOptionTitleBar__StyleOptionVersion__Version QStyleOptionTitleBar__StyleOptionVersion = 1 + QStyleOptionTitleBar__Version QStyleOptionTitleBar__StyleOptionVersion = 1 ) type QStyleOptionGroupBox__StyleOptionType int const ( - QStyleOptionGroupBox__StyleOptionType__Type QStyleOptionGroupBox__StyleOptionType = 983046 + QStyleOptionGroupBox__Type QStyleOptionGroupBox__StyleOptionType = 983046 ) type QStyleOptionGroupBox__StyleOptionVersion int const ( - QStyleOptionGroupBox__StyleOptionVersion__Version QStyleOptionGroupBox__StyleOptionVersion = 1 + QStyleOptionGroupBox__Version QStyleOptionGroupBox__StyleOptionVersion = 1 ) type QStyleOptionSizeGrip__StyleOptionType int const ( - QStyleOptionSizeGrip__StyleOptionType__Type QStyleOptionSizeGrip__StyleOptionType = 983047 + QStyleOptionSizeGrip__Type QStyleOptionSizeGrip__StyleOptionType = 983047 ) type QStyleOptionSizeGrip__StyleOptionVersion int const ( - QStyleOptionSizeGrip__StyleOptionVersion__Version QStyleOptionSizeGrip__StyleOptionVersion = 1 + QStyleOptionSizeGrip__Version QStyleOptionSizeGrip__StyleOptionVersion = 1 ) type QStyleOptionGraphicsItem__StyleOptionType int const ( - QStyleOptionGraphicsItem__StyleOptionType__Type QStyleOptionGraphicsItem__StyleOptionType = 15 + QStyleOptionGraphicsItem__Type QStyleOptionGraphicsItem__StyleOptionType = 15 ) type QStyleOptionGraphicsItem__StyleOptionVersion int const ( - QStyleOptionGraphicsItem__StyleOptionVersion__Version QStyleOptionGraphicsItem__StyleOptionVersion = 1 + QStyleOptionGraphicsItem__Version QStyleOptionGraphicsItem__StyleOptionVersion = 1 ) type QStyleHintReturn__HintReturnType int @@ -521,37 +521,37 @@ const ( type QStyleHintReturn__StyleOptionType int const ( - QStyleHintReturn__StyleOptionType__Type QStyleHintReturn__StyleOptionType = 61440 + QStyleHintReturn__Type QStyleHintReturn__StyleOptionType = 61440 ) type QStyleHintReturn__StyleOptionVersion int const ( - QStyleHintReturn__StyleOptionVersion__Version QStyleHintReturn__StyleOptionVersion = 1 + QStyleHintReturn__Version QStyleHintReturn__StyleOptionVersion = 1 ) type QStyleHintReturnMask__StyleOptionType int const ( - QStyleHintReturnMask__StyleOptionType__Type QStyleHintReturnMask__StyleOptionType = 61441 + QStyleHintReturnMask__Type QStyleHintReturnMask__StyleOptionType = 61441 ) type QStyleHintReturnMask__StyleOptionVersion int const ( - QStyleHintReturnMask__StyleOptionVersion__Version QStyleHintReturnMask__StyleOptionVersion = 1 + QStyleHintReturnMask__Version QStyleHintReturnMask__StyleOptionVersion = 1 ) type QStyleHintReturnVariant__StyleOptionType int const ( - QStyleHintReturnVariant__StyleOptionType__Type QStyleHintReturnVariant__StyleOptionType = 61442 + QStyleHintReturnVariant__Type QStyleHintReturnVariant__StyleOptionType = 61442 ) type QStyleHintReturnVariant__StyleOptionVersion int const ( - QStyleHintReturnVariant__StyleOptionVersion__Version QStyleHintReturnVariant__StyleOptionVersion = 1 + QStyleHintReturnVariant__Version QStyleHintReturnVariant__StyleOptionVersion = 1 ) type QStyleOption struct { diff --git a/qt/gen_qstylepainter.cpp b/qt/gen_qstylepainter.cpp index eb8feda2..f81f3087 100644 --- a/qt/gen_qstylepainter.cpp +++ b/qt/gen_qstylepainter.cpp @@ -46,8 +46,8 @@ void QStylePainter_DrawComplexControl(QStylePainter* self, int cc, QStyleOptionC self->drawComplexControl(static_cast(cc), *opt); } -void QStylePainter_DrawItemText(QStylePainter* self, QRect* r, int flags, QPalette* pal, bool enabled, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QStylePainter_DrawItemText(QStylePainter* self, QRect* r, int flags, QPalette* pal, bool enabled, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->drawItemText(*r, static_cast(flags), *pal, enabled, text_QString); } @@ -59,8 +59,8 @@ QStyle* QStylePainter_Style(const QStylePainter* self) { return self->style(); } -void QStylePainter_DrawItemText6(QStylePainter* self, QRect* r, int flags, QPalette* pal, bool enabled, struct miqt_string* text, int textRole) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QStylePainter_DrawItemText6(QStylePainter* self, QRect* r, int flags, QPalette* pal, bool enabled, struct miqt_string text, int textRole) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->drawItemText(*r, static_cast(flags), *pal, enabled, text_QString, static_cast(textRole)); } diff --git a/qt/gen_qstylepainter.go b/qt/gen_qstylepainter.go index 2300f234..4aa2df7b 100644 --- a/qt/gen_qstylepainter.go +++ b/qt/gen_qstylepainter.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -83,9 +82,11 @@ func (this *QStylePainter) DrawComplexControl(cc QStyle__ComplexControl, opt *QS } func (this *QStylePainter) DrawItemText(r *QRect, flags int, pal *QPalette, enabled bool, text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QStylePainter_DrawItemText(this.h, r.cPointer(), (C.int)(flags), pal.cPointer(), (C.bool)(enabled), (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QStylePainter_DrawItemText(this.h, r.cPointer(), (C.int)(flags), pal.cPointer(), (C.bool)(enabled), text_ms) } func (this *QStylePainter) DrawItemPixmap(r *QRect, flags int, pixmap *QPixmap) { @@ -97,9 +98,11 @@ func (this *QStylePainter) Style() *QStyle { } func (this *QStylePainter) DrawItemText6(r *QRect, flags int, pal *QPalette, enabled bool, text string, textRole QPalette__ColorRole) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QStylePainter_DrawItemText6(this.h, r.cPointer(), (C.int)(flags), pal.cPointer(), (C.bool)(enabled), (*C.struct_miqt_string)(text_ms), (C.int)(textRole)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QStylePainter_DrawItemText6(this.h, r.cPointer(), (C.int)(flags), pal.cPointer(), (C.bool)(enabled), text_ms, (C.int)(textRole)) } // Delete this object from C++ memory. diff --git a/qt/gen_qstylepainter.h b/qt/gen_qstylepainter.h index 5f528f2d..ef1a9a00 100644 --- a/qt/gen_qstylepainter.h +++ b/qt/gen_qstylepainter.h @@ -43,10 +43,10 @@ bool QStylePainter_Begin2(QStylePainter* self, QPaintDevice* pd, QWidget* w); void QStylePainter_DrawPrimitive(QStylePainter* self, int pe, QStyleOption* opt); void QStylePainter_DrawControl(QStylePainter* self, int ce, QStyleOption* opt); void QStylePainter_DrawComplexControl(QStylePainter* self, int cc, QStyleOptionComplex* opt); -void QStylePainter_DrawItemText(QStylePainter* self, QRect* r, int flags, QPalette* pal, bool enabled, struct miqt_string* text); +void QStylePainter_DrawItemText(QStylePainter* self, QRect* r, int flags, QPalette* pal, bool enabled, struct miqt_string text); void QStylePainter_DrawItemPixmap(QStylePainter* self, QRect* r, int flags, QPixmap* pixmap); QStyle* QStylePainter_Style(const QStylePainter* self); -void QStylePainter_DrawItemText6(QStylePainter* self, QRect* r, int flags, QPalette* pal, bool enabled, struct miqt_string* text, int textRole); +void QStylePainter_DrawItemText6(QStylePainter* self, QRect* r, int flags, QPalette* pal, bool enabled, struct miqt_string text, int textRole); void QStylePainter_Delete(QStylePainter* self); #ifdef __cplusplus diff --git a/qt/gen_qstyleplugin.cpp b/qt/gen_qstyleplugin.cpp index ebf51d87..fe4be010 100644 --- a/qt/gen_qstyleplugin.cpp +++ b/qt/gen_qstyleplugin.cpp @@ -16,51 +16,75 @@ void* QStylePlugin_Metacast(QStylePlugin* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QStylePlugin_Tr(const char* s) { +struct miqt_string QStylePlugin_Tr(const char* s) { QString _ret = QStylePlugin::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QStylePlugin_TrUtf8(const char* s) { +struct miqt_string QStylePlugin_TrUtf8(const char* s) { QString _ret = QStylePlugin::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -QStyle* QStylePlugin_Create(QStylePlugin* self, struct miqt_string* key) { - QString key_QString = QString::fromUtf8(&key->data, key->len); +QStyle* QStylePlugin_Create(QStylePlugin* self, struct miqt_string key) { + QString key_QString = QString::fromUtf8(key.data, key.len); return self->create(key_QString); } -struct miqt_string* QStylePlugin_Tr2(const char* s, const char* c) { +struct miqt_string QStylePlugin_Tr2(const char* s, const char* c) { QString _ret = QStylePlugin::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QStylePlugin_Tr3(const char* s, const char* c, int n) { +struct miqt_string QStylePlugin_Tr3(const char* s, const char* c, int n) { QString _ret = QStylePlugin::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QStylePlugin_TrUtf82(const char* s, const char* c) { +struct miqt_string QStylePlugin_TrUtf82(const char* s, const char* c) { QString _ret = QStylePlugin::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QStylePlugin_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QStylePlugin_TrUtf83(const char* s, const char* c, int n) { QString _ret = QStylePlugin::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QStylePlugin_Delete(QStylePlugin* self) { diff --git a/qt/gen_qstyleplugin.go b/qt/gen_qstyleplugin.go index 68e250a4..e9a19891 100644 --- a/qt/gen_qstyleplugin.go +++ b/qt/gen_qstyleplugin.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -51,31 +50,33 @@ func (this *QStylePlugin) MetaObject() *QMetaObject { func (this *QStylePlugin) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QStylePlugin_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QStylePlugin_Metacast(this.h, param1_Cstring)) } func QStylePlugin_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QStylePlugin_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStylePlugin_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QStylePlugin_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QStylePlugin_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStylePlugin_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QStylePlugin) Create(key string) *QStyle { - key_ms := libmiqt.Strdupg(key) - defer C.free(key_ms) - return UnsafeNewQStyle(unsafe.Pointer(C.QStylePlugin_Create(this.h, (*C.struct_miqt_string)(key_ms)))) + key_ms := C.struct_miqt_string{} + key_ms.data = C.CString(key) + key_ms.len = C.size_t(len(key)) + defer C.free(unsafe.Pointer(key_ms.data)) + return UnsafeNewQStyle(unsafe.Pointer(C.QStylePlugin_Create(this.h, key_ms))) } func QStylePlugin_Tr2(s string, c string) string { @@ -83,9 +84,9 @@ func QStylePlugin_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QStylePlugin_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStylePlugin_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -94,9 +95,9 @@ func QStylePlugin_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QStylePlugin_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStylePlugin_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -105,9 +106,9 @@ func QStylePlugin_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QStylePlugin_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStylePlugin_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -116,9 +117,9 @@ func QStylePlugin_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QStylePlugin_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QStylePlugin_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qstyleplugin.h b/qt/gen_qstyleplugin.h index 2996919a..4c063d46 100644 --- a/qt/gen_qstyleplugin.h +++ b/qt/gen_qstyleplugin.h @@ -25,13 +25,13 @@ typedef struct QStylePlugin QStylePlugin; QMetaObject* QStylePlugin_MetaObject(const QStylePlugin* self); void* QStylePlugin_Metacast(QStylePlugin* self, const char* param1); -struct miqt_string* QStylePlugin_Tr(const char* s); -struct miqt_string* QStylePlugin_TrUtf8(const char* s); -QStyle* QStylePlugin_Create(QStylePlugin* self, struct miqt_string* key); -struct miqt_string* QStylePlugin_Tr2(const char* s, const char* c); -struct miqt_string* QStylePlugin_Tr3(const char* s, const char* c, int n); -struct miqt_string* QStylePlugin_TrUtf82(const char* s, const char* c); -struct miqt_string* QStylePlugin_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QStylePlugin_Tr(const char* s); +struct miqt_string QStylePlugin_TrUtf8(const char* s); +QStyle* QStylePlugin_Create(QStylePlugin* self, struct miqt_string key); +struct miqt_string QStylePlugin_Tr2(const char* s, const char* c); +struct miqt_string QStylePlugin_Tr3(const char* s, const char* c, int n); +struct miqt_string QStylePlugin_TrUtf82(const char* s, const char* c); +struct miqt_string QStylePlugin_TrUtf83(const char* s, const char* c, int n); void QStylePlugin_Delete(QStylePlugin* self); #ifdef __cplusplus diff --git a/qt/gen_qsyntaxhighlighter.cpp b/qt/gen_qsyntaxhighlighter.cpp index 51ca1f12..bbc14794 100644 --- a/qt/gen_qsyntaxhighlighter.cpp +++ b/qt/gen_qsyntaxhighlighter.cpp @@ -17,18 +17,26 @@ void* QSyntaxHighlighter_Metacast(QSyntaxHighlighter* self, const char* param1) return self->qt_metacast(param1); } -struct miqt_string* QSyntaxHighlighter_Tr(const char* s) { +struct miqt_string QSyntaxHighlighter_Tr(const char* s) { QString _ret = QSyntaxHighlighter::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSyntaxHighlighter_TrUtf8(const char* s) { +struct miqt_string QSyntaxHighlighter_TrUtf8(const char* s) { QString _ret = QSyntaxHighlighter::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QSyntaxHighlighter_SetDocument(QSyntaxHighlighter* self, QTextDocument* doc) { @@ -47,32 +55,48 @@ void QSyntaxHighlighter_RehighlightBlock(QSyntaxHighlighter* self, QTextBlock* b self->rehighlightBlock(*block); } -struct miqt_string* QSyntaxHighlighter_Tr2(const char* s, const char* c) { +struct miqt_string QSyntaxHighlighter_Tr2(const char* s, const char* c) { QString _ret = QSyntaxHighlighter::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSyntaxHighlighter_Tr3(const char* s, const char* c, int n) { +struct miqt_string QSyntaxHighlighter_Tr3(const char* s, const char* c, int n) { QString _ret = QSyntaxHighlighter::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSyntaxHighlighter_TrUtf82(const char* s, const char* c) { +struct miqt_string QSyntaxHighlighter_TrUtf82(const char* s, const char* c) { QString _ret = QSyntaxHighlighter::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSyntaxHighlighter_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QSyntaxHighlighter_TrUtf83(const char* s, const char* c, int n) { QString _ret = QSyntaxHighlighter::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QSyntaxHighlighter_Delete(QSyntaxHighlighter* self) { diff --git a/qt/gen_qsyntaxhighlighter.go b/qt/gen_qsyntaxhighlighter.go index 1364030a..725e6d0d 100644 --- a/qt/gen_qsyntaxhighlighter.go +++ b/qt/gen_qsyntaxhighlighter.go @@ -50,24 +50,24 @@ func (this *QSyntaxHighlighter) MetaObject() *QMetaObject { func (this *QSyntaxHighlighter) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QSyntaxHighlighter_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QSyntaxHighlighter_Metacast(this.h, param1_Cstring)) } func QSyntaxHighlighter_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QSyntaxHighlighter_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSyntaxHighlighter_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QSyntaxHighlighter_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QSyntaxHighlighter_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSyntaxHighlighter_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -92,9 +92,9 @@ func QSyntaxHighlighter_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSyntaxHighlighter_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSyntaxHighlighter_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -103,9 +103,9 @@ func QSyntaxHighlighter_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSyntaxHighlighter_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSyntaxHighlighter_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -114,9 +114,9 @@ func QSyntaxHighlighter_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSyntaxHighlighter_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSyntaxHighlighter_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -125,9 +125,9 @@ func QSyntaxHighlighter_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSyntaxHighlighter_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSyntaxHighlighter_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qsyntaxhighlighter.h b/qt/gen_qsyntaxhighlighter.h index d2b0c2b2..bdc5b1ac 100644 --- a/qt/gen_qsyntaxhighlighter.h +++ b/qt/gen_qsyntaxhighlighter.h @@ -27,16 +27,16 @@ typedef struct QTextDocument QTextDocument; QMetaObject* QSyntaxHighlighter_MetaObject(const QSyntaxHighlighter* self); void* QSyntaxHighlighter_Metacast(QSyntaxHighlighter* self, const char* param1); -struct miqt_string* QSyntaxHighlighter_Tr(const char* s); -struct miqt_string* QSyntaxHighlighter_TrUtf8(const char* s); +struct miqt_string QSyntaxHighlighter_Tr(const char* s); +struct miqt_string QSyntaxHighlighter_TrUtf8(const char* s); void QSyntaxHighlighter_SetDocument(QSyntaxHighlighter* self, QTextDocument* doc); QTextDocument* QSyntaxHighlighter_Document(const QSyntaxHighlighter* self); void QSyntaxHighlighter_Rehighlight(QSyntaxHighlighter* self); void QSyntaxHighlighter_RehighlightBlock(QSyntaxHighlighter* self, QTextBlock* block); -struct miqt_string* QSyntaxHighlighter_Tr2(const char* s, const char* c); -struct miqt_string* QSyntaxHighlighter_Tr3(const char* s, const char* c, int n); -struct miqt_string* QSyntaxHighlighter_TrUtf82(const char* s, const char* c); -struct miqt_string* QSyntaxHighlighter_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QSyntaxHighlighter_Tr2(const char* s, const char* c); +struct miqt_string QSyntaxHighlighter_Tr3(const char* s, const char* c, int n); +struct miqt_string QSyntaxHighlighter_TrUtf82(const char* s, const char* c); +struct miqt_string QSyntaxHighlighter_TrUtf83(const char* s, const char* c, int n); void QSyntaxHighlighter_Delete(QSyntaxHighlighter* self); #ifdef __cplusplus diff --git a/qt/gen_qsystemsemaphore.cpp b/qt/gen_qsystemsemaphore.cpp index cea7ca00..aed291a4 100644 --- a/qt/gen_qsystemsemaphore.cpp +++ b/qt/gen_qsystemsemaphore.cpp @@ -6,31 +6,35 @@ #include "gen_qsystemsemaphore.h" #include "_cgo_export.h" -QSystemSemaphore* QSystemSemaphore_new(struct miqt_string* key) { - QString key_QString = QString::fromUtf8(&key->data, key->len); +QSystemSemaphore* QSystemSemaphore_new(struct miqt_string key) { + QString key_QString = QString::fromUtf8(key.data, key.len); return new QSystemSemaphore(key_QString); } -QSystemSemaphore* QSystemSemaphore_new2(struct miqt_string* key, int initialValue) { - QString key_QString = QString::fromUtf8(&key->data, key->len); +QSystemSemaphore* QSystemSemaphore_new2(struct miqt_string key, int initialValue) { + QString key_QString = QString::fromUtf8(key.data, key.len); return new QSystemSemaphore(key_QString, static_cast(initialValue)); } -QSystemSemaphore* QSystemSemaphore_new3(struct miqt_string* key, int initialValue, int mode) { - QString key_QString = QString::fromUtf8(&key->data, key->len); +QSystemSemaphore* QSystemSemaphore_new3(struct miqt_string key, int initialValue, int mode) { + QString key_QString = QString::fromUtf8(key.data, key.len); return new QSystemSemaphore(key_QString, static_cast(initialValue), static_cast(mode)); } -void QSystemSemaphore_SetKey(QSystemSemaphore* self, struct miqt_string* key) { - QString key_QString = QString::fromUtf8(&key->data, key->len); +void QSystemSemaphore_SetKey(QSystemSemaphore* self, struct miqt_string key) { + QString key_QString = QString::fromUtf8(key.data, key.len); self->setKey(key_QString); } -struct miqt_string* QSystemSemaphore_Key(const QSystemSemaphore* self) { +struct miqt_string QSystemSemaphore_Key(const QSystemSemaphore* self) { QString _ret = self->key(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } bool QSystemSemaphore_Acquire(QSystemSemaphore* self) { @@ -46,20 +50,24 @@ int QSystemSemaphore_Error(const QSystemSemaphore* self) { return static_cast(_ret); } -struct miqt_string* QSystemSemaphore_ErrorString(const QSystemSemaphore* self) { +struct miqt_string QSystemSemaphore_ErrorString(const QSystemSemaphore* self) { QString _ret = self->errorString(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QSystemSemaphore_SetKey2(QSystemSemaphore* self, struct miqt_string* key, int initialValue) { - QString key_QString = QString::fromUtf8(&key->data, key->len); +void QSystemSemaphore_SetKey2(QSystemSemaphore* self, struct miqt_string key, int initialValue) { + QString key_QString = QString::fromUtf8(key.data, key.len); self->setKey(key_QString, static_cast(initialValue)); } -void QSystemSemaphore_SetKey3(QSystemSemaphore* self, struct miqt_string* key, int initialValue, int mode) { - QString key_QString = QString::fromUtf8(&key->data, key->len); +void QSystemSemaphore_SetKey3(QSystemSemaphore* self, struct miqt_string key, int initialValue, int mode) { + QString key_QString = QString::fromUtf8(key.data, key.len); self->setKey(key_QString, static_cast(initialValue), static_cast(mode)); } diff --git a/qt/gen_qsystemsemaphore.go b/qt/gen_qsystemsemaphore.go index 16f550e3..7f7c5428 100644 --- a/qt/gen_qsystemsemaphore.go +++ b/qt/gen_qsystemsemaphore.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -64,38 +63,46 @@ func UnsafeNewQSystemSemaphore(h unsafe.Pointer) *QSystemSemaphore { // NewQSystemSemaphore constructs a new QSystemSemaphore object. func NewQSystemSemaphore(key string) *QSystemSemaphore { - key_ms := libmiqt.Strdupg(key) - defer C.free(key_ms) - ret := C.QSystemSemaphore_new((*C.struct_miqt_string)(key_ms)) + key_ms := C.struct_miqt_string{} + key_ms.data = C.CString(key) + key_ms.len = C.size_t(len(key)) + defer C.free(unsafe.Pointer(key_ms.data)) + ret := C.QSystemSemaphore_new(key_ms) return newQSystemSemaphore(ret) } // NewQSystemSemaphore2 constructs a new QSystemSemaphore object. func NewQSystemSemaphore2(key string, initialValue int) *QSystemSemaphore { - key_ms := libmiqt.Strdupg(key) - defer C.free(key_ms) - ret := C.QSystemSemaphore_new2((*C.struct_miqt_string)(key_ms), (C.int)(initialValue)) + key_ms := C.struct_miqt_string{} + key_ms.data = C.CString(key) + key_ms.len = C.size_t(len(key)) + defer C.free(unsafe.Pointer(key_ms.data)) + ret := C.QSystemSemaphore_new2(key_ms, (C.int)(initialValue)) return newQSystemSemaphore(ret) } // NewQSystemSemaphore3 constructs a new QSystemSemaphore object. func NewQSystemSemaphore3(key string, initialValue int, mode QSystemSemaphore__AccessMode) *QSystemSemaphore { - key_ms := libmiqt.Strdupg(key) - defer C.free(key_ms) - ret := C.QSystemSemaphore_new3((*C.struct_miqt_string)(key_ms), (C.int)(initialValue), (C.int)(mode)) + key_ms := C.struct_miqt_string{} + key_ms.data = C.CString(key) + key_ms.len = C.size_t(len(key)) + defer C.free(unsafe.Pointer(key_ms.data)) + ret := C.QSystemSemaphore_new3(key_ms, (C.int)(initialValue), (C.int)(mode)) return newQSystemSemaphore(ret) } func (this *QSystemSemaphore) SetKey(key string) { - key_ms := libmiqt.Strdupg(key) - defer C.free(key_ms) - C.QSystemSemaphore_SetKey(this.h, (*C.struct_miqt_string)(key_ms)) + key_ms := C.struct_miqt_string{} + key_ms.data = C.CString(key) + key_ms.len = C.size_t(len(key)) + defer C.free(unsafe.Pointer(key_ms.data)) + C.QSystemSemaphore_SetKey(this.h, key_ms) } func (this *QSystemSemaphore) Key() string { - var _ms *C.struct_miqt_string = C.QSystemSemaphore_Key(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSystemSemaphore_Key(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -112,22 +119,26 @@ func (this *QSystemSemaphore) Error() QSystemSemaphore__SystemSemaphoreError { } func (this *QSystemSemaphore) ErrorString() string { - var _ms *C.struct_miqt_string = C.QSystemSemaphore_ErrorString(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSystemSemaphore_ErrorString(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QSystemSemaphore) SetKey2(key string, initialValue int) { - key_ms := libmiqt.Strdupg(key) - defer C.free(key_ms) - C.QSystemSemaphore_SetKey2(this.h, (*C.struct_miqt_string)(key_ms), (C.int)(initialValue)) + key_ms := C.struct_miqt_string{} + key_ms.data = C.CString(key) + key_ms.len = C.size_t(len(key)) + defer C.free(unsafe.Pointer(key_ms.data)) + C.QSystemSemaphore_SetKey2(this.h, key_ms, (C.int)(initialValue)) } func (this *QSystemSemaphore) SetKey3(key string, initialValue int, mode QSystemSemaphore__AccessMode) { - key_ms := libmiqt.Strdupg(key) - defer C.free(key_ms) - C.QSystemSemaphore_SetKey3(this.h, (*C.struct_miqt_string)(key_ms), (C.int)(initialValue), (C.int)(mode)) + key_ms := C.struct_miqt_string{} + key_ms.data = C.CString(key) + key_ms.len = C.size_t(len(key)) + defer C.free(unsafe.Pointer(key_ms.data)) + C.QSystemSemaphore_SetKey3(this.h, key_ms, (C.int)(initialValue), (C.int)(mode)) } func (this *QSystemSemaphore) Release1(n int) bool { diff --git a/qt/gen_qsystemsemaphore.h b/qt/gen_qsystemsemaphore.h index 812f3c59..83761746 100644 --- a/qt/gen_qsystemsemaphore.h +++ b/qt/gen_qsystemsemaphore.h @@ -19,17 +19,17 @@ class QSystemSemaphore; typedef struct QSystemSemaphore QSystemSemaphore; #endif -QSystemSemaphore* QSystemSemaphore_new(struct miqt_string* key); -QSystemSemaphore* QSystemSemaphore_new2(struct miqt_string* key, int initialValue); -QSystemSemaphore* QSystemSemaphore_new3(struct miqt_string* key, int initialValue, int mode); -void QSystemSemaphore_SetKey(QSystemSemaphore* self, struct miqt_string* key); -struct miqt_string* QSystemSemaphore_Key(const QSystemSemaphore* self); +QSystemSemaphore* QSystemSemaphore_new(struct miqt_string key); +QSystemSemaphore* QSystemSemaphore_new2(struct miqt_string key, int initialValue); +QSystemSemaphore* QSystemSemaphore_new3(struct miqt_string key, int initialValue, int mode); +void QSystemSemaphore_SetKey(QSystemSemaphore* self, struct miqt_string key); +struct miqt_string QSystemSemaphore_Key(const QSystemSemaphore* self); bool QSystemSemaphore_Acquire(QSystemSemaphore* self); bool QSystemSemaphore_Release(QSystemSemaphore* self); int QSystemSemaphore_Error(const QSystemSemaphore* self); -struct miqt_string* QSystemSemaphore_ErrorString(const QSystemSemaphore* self); -void QSystemSemaphore_SetKey2(QSystemSemaphore* self, struct miqt_string* key, int initialValue); -void QSystemSemaphore_SetKey3(QSystemSemaphore* self, struct miqt_string* key, int initialValue, int mode); +struct miqt_string QSystemSemaphore_ErrorString(const QSystemSemaphore* self); +void QSystemSemaphore_SetKey2(QSystemSemaphore* self, struct miqt_string key, int initialValue); +void QSystemSemaphore_SetKey3(QSystemSemaphore* self, struct miqt_string key, int initialValue, int mode); bool QSystemSemaphore_Release1(QSystemSemaphore* self, int n); void QSystemSemaphore_Delete(QSystemSemaphore* self); diff --git a/qt/gen_qsystemtrayicon.cpp b/qt/gen_qsystemtrayicon.cpp index 1c85eb96..1f72b611 100644 --- a/qt/gen_qsystemtrayicon.cpp +++ b/qt/gen_qsystemtrayicon.cpp @@ -35,18 +35,26 @@ void* QSystemTrayIcon_Metacast(QSystemTrayIcon* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QSystemTrayIcon_Tr(const char* s) { +struct miqt_string QSystemTrayIcon_Tr(const char* s) { QString _ret = QSystemTrayIcon::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSystemTrayIcon_TrUtf8(const char* s) { +struct miqt_string QSystemTrayIcon_TrUtf8(const char* s) { QString _ret = QSystemTrayIcon::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QSystemTrayIcon_SetContextMenu(QSystemTrayIcon* self, QMenu* menu) { @@ -65,15 +73,19 @@ void QSystemTrayIcon_SetIcon(QSystemTrayIcon* self, QIcon* icon) { self->setIcon(*icon); } -struct miqt_string* QSystemTrayIcon_ToolTip(const QSystemTrayIcon* self) { +struct miqt_string QSystemTrayIcon_ToolTip(const QSystemTrayIcon* self) { QString _ret = self->toolTip(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QSystemTrayIcon_SetToolTip(QSystemTrayIcon* self, struct miqt_string* tip) { - QString tip_QString = QString::fromUtf8(&tip->data, tip->len); +void QSystemTrayIcon_SetToolTip(QSystemTrayIcon* self, struct miqt_string tip) { + QString tip_QString = QString::fromUtf8(tip.data, tip.len); self->setToolTip(tip_QString); } @@ -105,15 +117,15 @@ void QSystemTrayIcon_Hide(QSystemTrayIcon* self) { self->hide(); } -void QSystemTrayIcon_ShowMessage(QSystemTrayIcon* self, struct miqt_string* title, struct miqt_string* msg, QIcon* icon) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString msg_QString = QString::fromUtf8(&msg->data, msg->len); +void QSystemTrayIcon_ShowMessage(QSystemTrayIcon* self, struct miqt_string title, struct miqt_string msg, QIcon* icon) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString msg_QString = QString::fromUtf8(msg.data, msg.len); self->showMessage(title_QString, msg_QString, *icon); } -void QSystemTrayIcon_ShowMessage2(QSystemTrayIcon* self, struct miqt_string* title, struct miqt_string* msg) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString msg_QString = QString::fromUtf8(&msg->data, msg->len); +void QSystemTrayIcon_ShowMessage2(QSystemTrayIcon* self, struct miqt_string title, struct miqt_string msg) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString msg_QString = QString::fromUtf8(msg.data, msg.len); self->showMessage(title_QString, msg_QString); } @@ -139,49 +151,65 @@ void QSystemTrayIcon_connect_MessageClicked(QSystemTrayIcon* self, intptr_t slot }); } -struct miqt_string* QSystemTrayIcon_Tr2(const char* s, const char* c) { +struct miqt_string QSystemTrayIcon_Tr2(const char* s, const char* c) { QString _ret = QSystemTrayIcon::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSystemTrayIcon_Tr3(const char* s, const char* c, int n) { +struct miqt_string QSystemTrayIcon_Tr3(const char* s, const char* c, int n) { QString _ret = QSystemTrayIcon::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSystemTrayIcon_TrUtf82(const char* s, const char* c) { +struct miqt_string QSystemTrayIcon_TrUtf82(const char* s, const char* c) { QString _ret = QSystemTrayIcon::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QSystemTrayIcon_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QSystemTrayIcon_TrUtf83(const char* s, const char* c, int n) { QString _ret = QSystemTrayIcon::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QSystemTrayIcon_ShowMessage4(QSystemTrayIcon* self, struct miqt_string* title, struct miqt_string* msg, QIcon* icon, int msecs) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString msg_QString = QString::fromUtf8(&msg->data, msg->len); +void QSystemTrayIcon_ShowMessage4(QSystemTrayIcon* self, struct miqt_string title, struct miqt_string msg, QIcon* icon, int msecs) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString msg_QString = QString::fromUtf8(msg.data, msg.len); self->showMessage(title_QString, msg_QString, *icon, static_cast(msecs)); } -void QSystemTrayIcon_ShowMessage3(QSystemTrayIcon* self, struct miqt_string* title, struct miqt_string* msg, int icon) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString msg_QString = QString::fromUtf8(&msg->data, msg->len); +void QSystemTrayIcon_ShowMessage3(QSystemTrayIcon* self, struct miqt_string title, struct miqt_string msg, int icon) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString msg_QString = QString::fromUtf8(msg.data, msg.len); self->showMessage(title_QString, msg_QString, static_cast(icon)); } -void QSystemTrayIcon_ShowMessage42(QSystemTrayIcon* self, struct miqt_string* title, struct miqt_string* msg, int icon, int msecs) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString msg_QString = QString::fromUtf8(&msg->data, msg->len); +void QSystemTrayIcon_ShowMessage42(QSystemTrayIcon* self, struct miqt_string title, struct miqt_string msg, int icon, int msecs) { + QString title_QString = QString::fromUtf8(title.data, title.len); + QString msg_QString = QString::fromUtf8(msg.data, msg.len); self->showMessage(title_QString, msg_QString, static_cast(icon), static_cast(msecs)); } diff --git a/qt/gen_qsystemtrayicon.go b/qt/gen_qsystemtrayicon.go index 185603b7..22ddc7a2 100644 --- a/qt/gen_qsystemtrayicon.go +++ b/qt/gen_qsystemtrayicon.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "runtime/cgo" "unsafe" @@ -95,24 +94,24 @@ func (this *QSystemTrayIcon) MetaObject() *QMetaObject { func (this *QSystemTrayIcon) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QSystemTrayIcon_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QSystemTrayIcon_Metacast(this.h, param1_Cstring)) } func QSystemTrayIcon_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QSystemTrayIcon_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSystemTrayIcon_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QSystemTrayIcon_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QSystemTrayIcon_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSystemTrayIcon_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -136,16 +135,18 @@ func (this *QSystemTrayIcon) SetIcon(icon *QIcon) { } func (this *QSystemTrayIcon) ToolTip() string { - var _ms *C.struct_miqt_string = C.QSystemTrayIcon_ToolTip(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSystemTrayIcon_ToolTip(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QSystemTrayIcon) SetToolTip(tip string) { - tip_ms := libmiqt.Strdupg(tip) - defer C.free(tip_ms) - C.QSystemTrayIcon_SetToolTip(this.h, (*C.struct_miqt_string)(tip_ms)) + tip_ms := C.struct_miqt_string{} + tip_ms.data = C.CString(tip) + tip_ms.len = C.size_t(len(tip)) + defer C.free(unsafe.Pointer(tip_ms.data)) + C.QSystemTrayIcon_SetToolTip(this.h, tip_ms) } func QSystemTrayIcon_IsSystemTrayAvailable() bool { @@ -180,19 +181,27 @@ func (this *QSystemTrayIcon) Hide() { } func (this *QSystemTrayIcon) ShowMessage(title string, msg string, icon *QIcon) { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - msg_ms := libmiqt.Strdupg(msg) - defer C.free(msg_ms) - C.QSystemTrayIcon_ShowMessage(this.h, (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(msg_ms), icon.cPointer()) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + msg_ms := C.struct_miqt_string{} + msg_ms.data = C.CString(msg) + msg_ms.len = C.size_t(len(msg)) + defer C.free(unsafe.Pointer(msg_ms.data)) + C.QSystemTrayIcon_ShowMessage(this.h, title_ms, msg_ms, icon.cPointer()) } func (this *QSystemTrayIcon) ShowMessage2(title string, msg string) { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - msg_ms := libmiqt.Strdupg(msg) - defer C.free(msg_ms) - C.QSystemTrayIcon_ShowMessage2(this.h, (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(msg_ms)) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + msg_ms := C.struct_miqt_string{} + msg_ms.data = C.CString(msg) + msg_ms.len = C.size_t(len(msg)) + defer C.free(unsafe.Pointer(msg_ms.data)) + C.QSystemTrayIcon_ShowMessage2(this.h, title_ms, msg_ms) } func (this *QSystemTrayIcon) Activated(reason QSystemTrayIcon__ActivationReason) { @@ -237,9 +246,9 @@ func QSystemTrayIcon_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSystemTrayIcon_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSystemTrayIcon_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -248,9 +257,9 @@ func QSystemTrayIcon_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSystemTrayIcon_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSystemTrayIcon_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -259,9 +268,9 @@ func QSystemTrayIcon_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSystemTrayIcon_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSystemTrayIcon_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -270,34 +279,46 @@ func QSystemTrayIcon_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSystemTrayIcon_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QSystemTrayIcon_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QSystemTrayIcon) ShowMessage4(title string, msg string, icon *QIcon, msecs int) { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - msg_ms := libmiqt.Strdupg(msg) - defer C.free(msg_ms) - C.QSystemTrayIcon_ShowMessage4(this.h, (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(msg_ms), icon.cPointer(), (C.int)(msecs)) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + msg_ms := C.struct_miqt_string{} + msg_ms.data = C.CString(msg) + msg_ms.len = C.size_t(len(msg)) + defer C.free(unsafe.Pointer(msg_ms.data)) + C.QSystemTrayIcon_ShowMessage4(this.h, title_ms, msg_ms, icon.cPointer(), (C.int)(msecs)) } func (this *QSystemTrayIcon) ShowMessage3(title string, msg string, icon QSystemTrayIcon__MessageIcon) { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - msg_ms := libmiqt.Strdupg(msg) - defer C.free(msg_ms) - C.QSystemTrayIcon_ShowMessage3(this.h, (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(msg_ms), (C.int)(icon)) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + msg_ms := C.struct_miqt_string{} + msg_ms.data = C.CString(msg) + msg_ms.len = C.size_t(len(msg)) + defer C.free(unsafe.Pointer(msg_ms.data)) + C.QSystemTrayIcon_ShowMessage3(this.h, title_ms, msg_ms, (C.int)(icon)) } func (this *QSystemTrayIcon) ShowMessage42(title string, msg string, icon QSystemTrayIcon__MessageIcon, msecs int) { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - msg_ms := libmiqt.Strdupg(msg) - defer C.free(msg_ms) - C.QSystemTrayIcon_ShowMessage42(this.h, (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(msg_ms), (C.int)(icon), (C.int)(msecs)) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + msg_ms := C.struct_miqt_string{} + msg_ms.data = C.CString(msg) + msg_ms.len = C.size_t(len(msg)) + defer C.free(unsafe.Pointer(msg_ms.data)) + C.QSystemTrayIcon_ShowMessage42(this.h, title_ms, msg_ms, (C.int)(icon), (C.int)(msecs)) } // Delete this object from C++ memory. diff --git a/qt/gen_qsystemtrayicon.h b/qt/gen_qsystemtrayicon.h index 2d2157ba..dbece986 100644 --- a/qt/gen_qsystemtrayicon.h +++ b/qt/gen_qsystemtrayicon.h @@ -35,14 +35,14 @@ QSystemTrayIcon* QSystemTrayIcon_new3(QObject* parent); QSystemTrayIcon* QSystemTrayIcon_new4(QIcon* icon, QObject* parent); QMetaObject* QSystemTrayIcon_MetaObject(const QSystemTrayIcon* self); void* QSystemTrayIcon_Metacast(QSystemTrayIcon* self, const char* param1); -struct miqt_string* QSystemTrayIcon_Tr(const char* s); -struct miqt_string* QSystemTrayIcon_TrUtf8(const char* s); +struct miqt_string QSystemTrayIcon_Tr(const char* s); +struct miqt_string QSystemTrayIcon_TrUtf8(const char* s); void QSystemTrayIcon_SetContextMenu(QSystemTrayIcon* self, QMenu* menu); QMenu* QSystemTrayIcon_ContextMenu(const QSystemTrayIcon* self); QIcon* QSystemTrayIcon_Icon(const QSystemTrayIcon* self); void QSystemTrayIcon_SetIcon(QSystemTrayIcon* self, QIcon* icon); -struct miqt_string* QSystemTrayIcon_ToolTip(const QSystemTrayIcon* self); -void QSystemTrayIcon_SetToolTip(QSystemTrayIcon* self, struct miqt_string* tip); +struct miqt_string QSystemTrayIcon_ToolTip(const QSystemTrayIcon* self); +void QSystemTrayIcon_SetToolTip(QSystemTrayIcon* self, struct miqt_string tip); bool QSystemTrayIcon_IsSystemTrayAvailable(); bool QSystemTrayIcon_SupportsMessages(); QRect* QSystemTrayIcon_Geometry(const QSystemTrayIcon* self); @@ -50,19 +50,19 @@ bool QSystemTrayIcon_IsVisible(const QSystemTrayIcon* self); void QSystemTrayIcon_SetVisible(QSystemTrayIcon* self, bool visible); void QSystemTrayIcon_Show(QSystemTrayIcon* self); void QSystemTrayIcon_Hide(QSystemTrayIcon* self); -void QSystemTrayIcon_ShowMessage(QSystemTrayIcon* self, struct miqt_string* title, struct miqt_string* msg, QIcon* icon); -void QSystemTrayIcon_ShowMessage2(QSystemTrayIcon* self, struct miqt_string* title, struct miqt_string* msg); +void QSystemTrayIcon_ShowMessage(QSystemTrayIcon* self, struct miqt_string title, struct miqt_string msg, QIcon* icon); +void QSystemTrayIcon_ShowMessage2(QSystemTrayIcon* self, struct miqt_string title, struct miqt_string msg); void QSystemTrayIcon_Activated(QSystemTrayIcon* self, int reason); void QSystemTrayIcon_connect_Activated(QSystemTrayIcon* self, intptr_t slot); void QSystemTrayIcon_MessageClicked(QSystemTrayIcon* self); void QSystemTrayIcon_connect_MessageClicked(QSystemTrayIcon* self, intptr_t slot); -struct miqt_string* QSystemTrayIcon_Tr2(const char* s, const char* c); -struct miqt_string* QSystemTrayIcon_Tr3(const char* s, const char* c, int n); -struct miqt_string* QSystemTrayIcon_TrUtf82(const char* s, const char* c); -struct miqt_string* QSystemTrayIcon_TrUtf83(const char* s, const char* c, int n); -void QSystemTrayIcon_ShowMessage4(QSystemTrayIcon* self, struct miqt_string* title, struct miqt_string* msg, QIcon* icon, int msecs); -void QSystemTrayIcon_ShowMessage3(QSystemTrayIcon* self, struct miqt_string* title, struct miqt_string* msg, int icon); -void QSystemTrayIcon_ShowMessage42(QSystemTrayIcon* self, struct miqt_string* title, struct miqt_string* msg, int icon, int msecs); +struct miqt_string QSystemTrayIcon_Tr2(const char* s, const char* c); +struct miqt_string QSystemTrayIcon_Tr3(const char* s, const char* c, int n); +struct miqt_string QSystemTrayIcon_TrUtf82(const char* s, const char* c); +struct miqt_string QSystemTrayIcon_TrUtf83(const char* s, const char* c, int n); +void QSystemTrayIcon_ShowMessage4(QSystemTrayIcon* self, struct miqt_string title, struct miqt_string msg, QIcon* icon, int msecs); +void QSystemTrayIcon_ShowMessage3(QSystemTrayIcon* self, struct miqt_string title, struct miqt_string msg, int icon); +void QSystemTrayIcon_ShowMessage42(QSystemTrayIcon* self, struct miqt_string title, struct miqt_string msg, int icon, int msecs); void QSystemTrayIcon_Delete(QSystemTrayIcon* self); #ifdef __cplusplus diff --git a/qt/gen_qtabbar.cpp b/qt/gen_qtabbar.cpp index b54e8b88..2708aff3 100644 --- a/qt/gen_qtabbar.cpp +++ b/qt/gen_qtabbar.cpp @@ -30,18 +30,26 @@ void* QTabBar_Metacast(QTabBar* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QTabBar_Tr(const char* s) { +struct miqt_string QTabBar_Tr(const char* s) { QString _ret = QTabBar::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTabBar_TrUtf8(const char* s) { +struct miqt_string QTabBar_TrUtf8(const char* s) { QString _ret = QTabBar::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QTabBar_Shape(const QTabBar* self) { @@ -53,23 +61,23 @@ void QTabBar_SetShape(QTabBar* self, int shape) { self->setShape(static_cast(shape)); } -int QTabBar_AddTab(QTabBar* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +int QTabBar_AddTab(QTabBar* self, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); return self->addTab(text_QString); } -int QTabBar_AddTab2(QTabBar* self, QIcon* icon, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +int QTabBar_AddTab2(QTabBar* self, QIcon* icon, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); return self->addTab(*icon, text_QString); } -int QTabBar_InsertTab(QTabBar* self, int index, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +int QTabBar_InsertTab(QTabBar* self, int index, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); return self->insertTab(static_cast(index), text_QString); } -int QTabBar_InsertTab2(QTabBar* self, int index, QIcon* icon, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +int QTabBar_InsertTab2(QTabBar* self, int index, QIcon* icon, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); return self->insertTab(static_cast(index), *icon, text_QString); } @@ -97,15 +105,19 @@ void QTabBar_SetTabVisible(QTabBar* self, int index, bool visible) { self->setTabVisible(static_cast(index), visible); } -struct miqt_string* QTabBar_TabText(const QTabBar* self, int index) { +struct miqt_string QTabBar_TabText(const QTabBar* self, int index) { QString _ret = self->tabText(static_cast(index)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QTabBar_SetTabText(QTabBar* self, int index, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QTabBar_SetTabText(QTabBar* self, int index, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->setTabText(static_cast(index), text_QString); } @@ -134,28 +146,36 @@ void QTabBar_SetElideMode(QTabBar* self, int mode) { self->setElideMode(static_cast(mode)); } -void QTabBar_SetTabToolTip(QTabBar* self, int index, struct miqt_string* tip) { - QString tip_QString = QString::fromUtf8(&tip->data, tip->len); +void QTabBar_SetTabToolTip(QTabBar* self, int index, struct miqt_string tip) { + QString tip_QString = QString::fromUtf8(tip.data, tip.len); self->setTabToolTip(static_cast(index), tip_QString); } -struct miqt_string* QTabBar_TabToolTip(const QTabBar* self, int index) { +struct miqt_string QTabBar_TabToolTip(const QTabBar* self, int index) { QString _ret = self->tabToolTip(static_cast(index)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QTabBar_SetTabWhatsThis(QTabBar* self, int index, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QTabBar_SetTabWhatsThis(QTabBar* self, int index, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->setTabWhatsThis(static_cast(index), text_QString); } -struct miqt_string* QTabBar_TabWhatsThis(const QTabBar* self, int index) { +struct miqt_string QTabBar_TabWhatsThis(const QTabBar* self, int index) { QString _ret = self->tabWhatsThis(static_cast(index)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QTabBar_SetTabData(QTabBar* self, int index, QVariant* data) { @@ -279,15 +299,19 @@ void QTabBar_SetChangeCurrentOnDrag(QTabBar* self, bool change) { self->setChangeCurrentOnDrag(change); } -struct miqt_string* QTabBar_AccessibleTabName(const QTabBar* self, int index) { +struct miqt_string QTabBar_AccessibleTabName(const QTabBar* self, int index) { QString _ret = self->accessibleTabName(static_cast(index)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QTabBar_SetAccessibleTabName(QTabBar* self, int index, struct miqt_string* name) { - QString name_QString = QString::fromUtf8(&name->data, name->len); +void QTabBar_SetAccessibleTabName(QTabBar* self, int index, struct miqt_string name) { + QString name_QString = QString::fromUtf8(name.data, name.len); self->setAccessibleTabName(static_cast(index), name_QString); } @@ -351,32 +375,48 @@ void QTabBar_connect_TabBarDoubleClicked(QTabBar* self, intptr_t slot) { }); } -struct miqt_string* QTabBar_Tr2(const char* s, const char* c) { +struct miqt_string QTabBar_Tr2(const char* s, const char* c) { QString _ret = QTabBar::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTabBar_Tr3(const char* s, const char* c, int n) { +struct miqt_string QTabBar_Tr3(const char* s, const char* c, int n) { QString _ret = QTabBar::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTabBar_TrUtf82(const char* s, const char* c) { +struct miqt_string QTabBar_TrUtf82(const char* s, const char* c) { QString _ret = QTabBar::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTabBar_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QTabBar_TrUtf83(const char* s, const char* c, int n) { QString _ret = QTabBar::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QTabBar_Delete(QTabBar* self) { diff --git a/qt/gen_qtabbar.go b/qt/gen_qtabbar.go index cf64c51e..06dededd 100644 --- a/qt/gen_qtabbar.go +++ b/qt/gen_qtabbar.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "runtime/cgo" "unsafe" @@ -92,24 +91,24 @@ func (this *QTabBar) MetaObject() *QMetaObject { func (this *QTabBar) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QTabBar_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QTabBar_Metacast(this.h, param1_Cstring)) } func QTabBar_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTabBar_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTabBar_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QTabBar_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTabBar_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTabBar_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -122,27 +121,35 @@ func (this *QTabBar) SetShape(shape QTabBar__Shape) { } func (this *QTabBar) AddTab(text string) int { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - return (int)(C.QTabBar_AddTab(this.h, (*C.struct_miqt_string)(text_ms))) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + return (int)(C.QTabBar_AddTab(this.h, text_ms)) } func (this *QTabBar) AddTab2(icon *QIcon, text string) int { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - return (int)(C.QTabBar_AddTab2(this.h, icon.cPointer(), (*C.struct_miqt_string)(text_ms))) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + return (int)(C.QTabBar_AddTab2(this.h, icon.cPointer(), text_ms)) } func (this *QTabBar) InsertTab(index int, text string) int { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - return (int)(C.QTabBar_InsertTab(this.h, (C.int)(index), (*C.struct_miqt_string)(text_ms))) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + return (int)(C.QTabBar_InsertTab(this.h, (C.int)(index), text_ms)) } func (this *QTabBar) InsertTab2(index int, icon *QIcon, text string) int { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - return (int)(C.QTabBar_InsertTab2(this.h, (C.int)(index), icon.cPointer(), (*C.struct_miqt_string)(text_ms))) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + return (int)(C.QTabBar_InsertTab2(this.h, (C.int)(index), icon.cPointer(), text_ms)) } func (this *QTabBar) RemoveTab(index int) { @@ -170,16 +177,18 @@ func (this *QTabBar) SetTabVisible(index int, visible bool) { } func (this *QTabBar) TabText(index int) string { - var _ms *C.struct_miqt_string = C.QTabBar_TabText(this.h, (C.int)(index)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTabBar_TabText(this.h, (C.int)(index)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QTabBar) SetTabText(index int, text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QTabBar_SetTabText(this.h, (C.int)(index), (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QTabBar_SetTabText(this.h, (C.int)(index), text_ms) } func (this *QTabBar) TabTextColor(index int) *QColor { @@ -213,28 +222,32 @@ func (this *QTabBar) SetElideMode(mode TextElideMode) { } func (this *QTabBar) SetTabToolTip(index int, tip string) { - tip_ms := libmiqt.Strdupg(tip) - defer C.free(tip_ms) - C.QTabBar_SetTabToolTip(this.h, (C.int)(index), (*C.struct_miqt_string)(tip_ms)) + tip_ms := C.struct_miqt_string{} + tip_ms.data = C.CString(tip) + tip_ms.len = C.size_t(len(tip)) + defer C.free(unsafe.Pointer(tip_ms.data)) + C.QTabBar_SetTabToolTip(this.h, (C.int)(index), tip_ms) } func (this *QTabBar) TabToolTip(index int) string { - var _ms *C.struct_miqt_string = C.QTabBar_TabToolTip(this.h, (C.int)(index)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTabBar_TabToolTip(this.h, (C.int)(index)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QTabBar) SetTabWhatsThis(index int, text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QTabBar_SetTabWhatsThis(this.h, (C.int)(index), (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QTabBar_SetTabWhatsThis(this.h, (C.int)(index), text_ms) } func (this *QTabBar) TabWhatsThis(index int) string { - var _ms *C.struct_miqt_string = C.QTabBar_TabWhatsThis(this.h, (C.int)(index)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTabBar_TabWhatsThis(this.h, (C.int)(index)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -374,16 +387,18 @@ func (this *QTabBar) SetChangeCurrentOnDrag(change bool) { } func (this *QTabBar) AccessibleTabName(index int) string { - var _ms *C.struct_miqt_string = C.QTabBar_AccessibleTabName(this.h, (C.int)(index)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTabBar_AccessibleTabName(this.h, (C.int)(index)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QTabBar) SetAccessibleTabName(index int, name string) { - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - C.QTabBar_SetAccessibleTabName(this.h, (C.int)(index), (*C.struct_miqt_string)(name_ms)) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + C.QTabBar_SetAccessibleTabName(this.h, (C.int)(index), name_ms) } func (this *QTabBar) SetCurrentIndex(index int) { @@ -497,9 +512,9 @@ func QTabBar_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTabBar_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTabBar_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -508,9 +523,9 @@ func QTabBar_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTabBar_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTabBar_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -519,9 +534,9 @@ func QTabBar_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTabBar_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTabBar_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -530,9 +545,9 @@ func QTabBar_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTabBar_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTabBar_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qtabbar.h b/qt/gen_qtabbar.h index 9e364b9b..7e809dba 100644 --- a/qt/gen_qtabbar.h +++ b/qt/gen_qtabbar.h @@ -39,32 +39,32 @@ QTabBar* QTabBar_new(); QTabBar* QTabBar_new2(QWidget* parent); QMetaObject* QTabBar_MetaObject(const QTabBar* self); void* QTabBar_Metacast(QTabBar* self, const char* param1); -struct miqt_string* QTabBar_Tr(const char* s); -struct miqt_string* QTabBar_TrUtf8(const char* s); +struct miqt_string QTabBar_Tr(const char* s); +struct miqt_string QTabBar_TrUtf8(const char* s); int QTabBar_Shape(const QTabBar* self); void QTabBar_SetShape(QTabBar* self, int shape); -int QTabBar_AddTab(QTabBar* self, struct miqt_string* text); -int QTabBar_AddTab2(QTabBar* self, QIcon* icon, struct miqt_string* text); -int QTabBar_InsertTab(QTabBar* self, int index, struct miqt_string* text); -int QTabBar_InsertTab2(QTabBar* self, int index, QIcon* icon, struct miqt_string* text); +int QTabBar_AddTab(QTabBar* self, struct miqt_string text); +int QTabBar_AddTab2(QTabBar* self, QIcon* icon, struct miqt_string text); +int QTabBar_InsertTab(QTabBar* self, int index, struct miqt_string text); +int QTabBar_InsertTab2(QTabBar* self, int index, QIcon* icon, struct miqt_string text); void QTabBar_RemoveTab(QTabBar* self, int index); void QTabBar_MoveTab(QTabBar* self, int from, int to); bool QTabBar_IsTabEnabled(const QTabBar* self, int index); void QTabBar_SetTabEnabled(QTabBar* self, int index, bool enabled); bool QTabBar_IsTabVisible(const QTabBar* self, int index); void QTabBar_SetTabVisible(QTabBar* self, int index, bool visible); -struct miqt_string* QTabBar_TabText(const QTabBar* self, int index); -void QTabBar_SetTabText(QTabBar* self, int index, struct miqt_string* text); +struct miqt_string QTabBar_TabText(const QTabBar* self, int index); +void QTabBar_SetTabText(QTabBar* self, int index, struct miqt_string text); QColor* QTabBar_TabTextColor(const QTabBar* self, int index); void QTabBar_SetTabTextColor(QTabBar* self, int index, QColor* color); QIcon* QTabBar_TabIcon(const QTabBar* self, int index); void QTabBar_SetTabIcon(QTabBar* self, int index, QIcon* icon); int QTabBar_ElideMode(const QTabBar* self); void QTabBar_SetElideMode(QTabBar* self, int mode); -void QTabBar_SetTabToolTip(QTabBar* self, int index, struct miqt_string* tip); -struct miqt_string* QTabBar_TabToolTip(const QTabBar* self, int index); -void QTabBar_SetTabWhatsThis(QTabBar* self, int index, struct miqt_string* text); -struct miqt_string* QTabBar_TabWhatsThis(const QTabBar* self, int index); +void QTabBar_SetTabToolTip(QTabBar* self, int index, struct miqt_string tip); +struct miqt_string QTabBar_TabToolTip(const QTabBar* self, int index); +void QTabBar_SetTabWhatsThis(QTabBar* self, int index, struct miqt_string text); +struct miqt_string QTabBar_TabWhatsThis(const QTabBar* self, int index); void QTabBar_SetTabData(QTabBar* self, int index, QVariant* data); QVariant* QTabBar_TabData(const QTabBar* self, int index); QRect* QTabBar_TabRect(const QTabBar* self, int index); @@ -95,8 +95,8 @@ bool QTabBar_AutoHide(const QTabBar* self); void QTabBar_SetAutoHide(QTabBar* self, bool hide); bool QTabBar_ChangeCurrentOnDrag(const QTabBar* self); void QTabBar_SetChangeCurrentOnDrag(QTabBar* self, bool change); -struct miqt_string* QTabBar_AccessibleTabName(const QTabBar* self, int index); -void QTabBar_SetAccessibleTabName(QTabBar* self, int index, struct miqt_string* name); +struct miqt_string QTabBar_AccessibleTabName(const QTabBar* self, int index); +void QTabBar_SetAccessibleTabName(QTabBar* self, int index, struct miqt_string name); void QTabBar_SetCurrentIndex(QTabBar* self, int index); void QTabBar_CurrentChanged(QTabBar* self, int index); void QTabBar_connect_CurrentChanged(QTabBar* self, intptr_t slot); @@ -108,10 +108,10 @@ void QTabBar_TabBarClicked(QTabBar* self, int index); void QTabBar_connect_TabBarClicked(QTabBar* self, intptr_t slot); void QTabBar_TabBarDoubleClicked(QTabBar* self, int index); void QTabBar_connect_TabBarDoubleClicked(QTabBar* self, intptr_t slot); -struct miqt_string* QTabBar_Tr2(const char* s, const char* c); -struct miqt_string* QTabBar_Tr3(const char* s, const char* c, int n); -struct miqt_string* QTabBar_TrUtf82(const char* s, const char* c); -struct miqt_string* QTabBar_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QTabBar_Tr2(const char* s, const char* c); +struct miqt_string QTabBar_Tr3(const char* s, const char* c, int n); +struct miqt_string QTabBar_TrUtf82(const char* s, const char* c); +struct miqt_string QTabBar_TrUtf83(const char* s, const char* c, int n); void QTabBar_Delete(QTabBar* self); #ifdef __cplusplus diff --git a/qt/gen_qtableview.cpp b/qt/gen_qtableview.cpp index f0443629..07911dd7 100644 --- a/qt/gen_qtableview.cpp +++ b/qt/gen_qtableview.cpp @@ -30,18 +30,26 @@ void* QTableView_Metacast(QTableView* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QTableView_Tr(const char* s) { +struct miqt_string QTableView_Tr(const char* s) { QString _ret = QTableView::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTableView_TrUtf8(const char* s) { +struct miqt_string QTableView_TrUtf8(const char* s) { QString _ret = QTableView::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QTableView_SetModel(QTableView* self, QAbstractItemModel* model) { @@ -241,32 +249,48 @@ void QTableView_SetShowGrid(QTableView* self, bool show) { self->setShowGrid(show); } -struct miqt_string* QTableView_Tr2(const char* s, const char* c) { +struct miqt_string QTableView_Tr2(const char* s, const char* c) { QString _ret = QTableView::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTableView_Tr3(const char* s, const char* c, int n) { +struct miqt_string QTableView_Tr3(const char* s, const char* c, int n) { QString _ret = QTableView::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTableView_TrUtf82(const char* s, const char* c) { +struct miqt_string QTableView_TrUtf82(const char* s, const char* c) { QString _ret = QTableView::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTableView_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QTableView_TrUtf83(const char* s, const char* c, int n) { QString _ret = QTableView::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QTableView_ScrollTo2(QTableView* self, QModelIndex* index, int hint) { diff --git a/qt/gen_qtableview.go b/qt/gen_qtableview.go index 3c3b2ebb..92ab6c60 100644 --- a/qt/gen_qtableview.go +++ b/qt/gen_qtableview.go @@ -62,24 +62,24 @@ func (this *QTableView) MetaObject() *QMetaObject { func (this *QTableView) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QTableView_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QTableView_Metacast(this.h, param1_Cstring)) } func QTableView_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTableView_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTableView_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QTableView_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTableView_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTableView_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -290,9 +290,9 @@ func QTableView_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTableView_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTableView_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -301,9 +301,9 @@ func QTableView_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTableView_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTableView_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -312,9 +312,9 @@ func QTableView_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTableView_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTableView_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -323,9 +323,9 @@ func QTableView_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTableView_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTableView_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qtableview.h b/qt/gen_qtableview.h index 49b6d915..4dbf3b04 100644 --- a/qt/gen_qtableview.h +++ b/qt/gen_qtableview.h @@ -39,8 +39,8 @@ QTableView* QTableView_new(); QTableView* QTableView_new2(QWidget* parent); QMetaObject* QTableView_MetaObject(const QTableView* self); void* QTableView_Metacast(QTableView* self, const char* param1); -struct miqt_string* QTableView_Tr(const char* s); -struct miqt_string* QTableView_TrUtf8(const char* s); +struct miqt_string QTableView_Tr(const char* s); +struct miqt_string QTableView_TrUtf8(const char* s); void QTableView_SetModel(QTableView* self, QAbstractItemModel* model); void QTableView_SetRootIndex(QTableView* self, QModelIndex* index); void QTableView_SetSelectionModel(QTableView* self, QItemSelectionModel* selectionModel); @@ -90,10 +90,10 @@ void QTableView_ResizeColumnsToContents(QTableView* self); void QTableView_SortByColumn(QTableView* self, int column); void QTableView_SortByColumn2(QTableView* self, int column, int order); void QTableView_SetShowGrid(QTableView* self, bool show); -struct miqt_string* QTableView_Tr2(const char* s, const char* c); -struct miqt_string* QTableView_Tr3(const char* s, const char* c, int n); -struct miqt_string* QTableView_TrUtf82(const char* s, const char* c); -struct miqt_string* QTableView_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QTableView_Tr2(const char* s, const char* c); +struct miqt_string QTableView_Tr3(const char* s, const char* c, int n); +struct miqt_string QTableView_TrUtf82(const char* s, const char* c); +struct miqt_string QTableView_TrUtf83(const char* s, const char* c, int n); void QTableView_ScrollTo2(QTableView* self, QModelIndex* index, int hint); void QTableView_Delete(QTableView* self); diff --git a/qt/gen_qtablewidget.cpp b/qt/gen_qtablewidget.cpp index 4c796fd4..e3fca421 100644 --- a/qt/gen_qtablewidget.cpp +++ b/qt/gen_qtablewidget.cpp @@ -68,13 +68,13 @@ QTableWidgetItem* QTableWidgetItem_new() { return new QTableWidgetItem(); } -QTableWidgetItem* QTableWidgetItem_new2(struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QTableWidgetItem* QTableWidgetItem_new2(struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QTableWidgetItem(text_QString); } -QTableWidgetItem* QTableWidgetItem_new3(QIcon* icon, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QTableWidgetItem* QTableWidgetItem_new3(QIcon* icon, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QTableWidgetItem(*icon, text_QString); } @@ -86,13 +86,13 @@ QTableWidgetItem* QTableWidgetItem_new5(int typeVal) { return new QTableWidgetItem(static_cast(typeVal)); } -QTableWidgetItem* QTableWidgetItem_new6(struct miqt_string* text, int typeVal) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QTableWidgetItem* QTableWidgetItem_new6(struct miqt_string text, int typeVal) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QTableWidgetItem(text_QString, static_cast(typeVal)); } -QTableWidgetItem* QTableWidgetItem_new7(QIcon* icon, struct miqt_string* text, int typeVal) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QTableWidgetItem* QTableWidgetItem_new7(QIcon* icon, struct miqt_string text, int typeVal) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QTableWidgetItem(*icon, text_QString, static_cast(typeVal)); } @@ -129,15 +129,19 @@ void QTableWidgetItem_SetFlags(QTableWidgetItem* self, int flags) { self->setFlags(static_cast(flags)); } -struct miqt_string* QTableWidgetItem_Text(const QTableWidgetItem* self) { +struct miqt_string QTableWidgetItem_Text(const QTableWidgetItem* self) { QString _ret = self->text(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QTableWidgetItem_SetText(QTableWidgetItem* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QTableWidgetItem_SetText(QTableWidgetItem* self, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->setText(text_QString); } @@ -149,39 +153,51 @@ void QTableWidgetItem_SetIcon(QTableWidgetItem* self, QIcon* icon) { self->setIcon(*icon); } -struct miqt_string* QTableWidgetItem_StatusTip(const QTableWidgetItem* self) { +struct miqt_string QTableWidgetItem_StatusTip(const QTableWidgetItem* self) { QString _ret = self->statusTip(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QTableWidgetItem_SetStatusTip(QTableWidgetItem* self, struct miqt_string* statusTip) { - QString statusTip_QString = QString::fromUtf8(&statusTip->data, statusTip->len); +void QTableWidgetItem_SetStatusTip(QTableWidgetItem* self, struct miqt_string statusTip) { + QString statusTip_QString = QString::fromUtf8(statusTip.data, statusTip.len); self->setStatusTip(statusTip_QString); } -struct miqt_string* QTableWidgetItem_ToolTip(const QTableWidgetItem* self) { +struct miqt_string QTableWidgetItem_ToolTip(const QTableWidgetItem* self) { QString _ret = self->toolTip(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QTableWidgetItem_SetToolTip(QTableWidgetItem* self, struct miqt_string* toolTip) { - QString toolTip_QString = QString::fromUtf8(&toolTip->data, toolTip->len); +void QTableWidgetItem_SetToolTip(QTableWidgetItem* self, struct miqt_string toolTip) { + QString toolTip_QString = QString::fromUtf8(toolTip.data, toolTip.len); self->setToolTip(toolTip_QString); } -struct miqt_string* QTableWidgetItem_WhatsThis(const QTableWidgetItem* self) { +struct miqt_string QTableWidgetItem_WhatsThis(const QTableWidgetItem* self) { QString _ret = self->whatsThis(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QTableWidgetItem_SetWhatsThis(QTableWidgetItem* self, struct miqt_string* whatsThis) { - QString whatsThis_QString = QString::fromUtf8(&whatsThis->data, whatsThis->len); +void QTableWidgetItem_SetWhatsThis(QTableWidgetItem* self, struct miqt_string whatsThis) { + QString whatsThis_QString = QString::fromUtf8(whatsThis.data, whatsThis.len); self->setWhatsThis(whatsThis_QString); } @@ -306,18 +322,26 @@ void* QTableWidget_Metacast(QTableWidget* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QTableWidget_Tr(const char* s) { +struct miqt_string QTableWidget_Tr(const char* s) { QString _ret = QTableWidget::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTableWidget_TrUtf8(const char* s) { +struct miqt_string QTableWidget_TrUtf8(const char* s) { QString _ret = QTableWidget::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QTableWidget_SetRowCount(QTableWidget* self, int rows) { @@ -380,23 +404,23 @@ QTableWidgetItem* QTableWidget_TakeHorizontalHeaderItem(QTableWidget* self, int return self->takeHorizontalHeaderItem(static_cast(column)); } -void QTableWidget_SetVerticalHeaderLabels(QTableWidget* self, struct miqt_array* /* of struct miqt_string* */ labels) { +void QTableWidget_SetVerticalHeaderLabels(QTableWidget* self, struct miqt_array* /* of struct miqt_string */ labels) { QStringList labels_QList; labels_QList.reserve(labels->len); - struct miqt_string** labels_arr = static_cast(labels->data); + struct miqt_string* labels_arr = static_cast(labels->data); for(size_t i = 0; i < labels->len; ++i) { - QString labels_arr_i_QString = QString::fromUtf8(&labels_arr[i]->data, labels_arr[i]->len); + QString labels_arr_i_QString = QString::fromUtf8(labels_arr[i].data, labels_arr[i].len); labels_QList.push_back(labels_arr_i_QString); } self->setVerticalHeaderLabels(labels_QList); } -void QTableWidget_SetHorizontalHeaderLabels(QTableWidget* self, struct miqt_array* /* of struct miqt_string* */ labels) { +void QTableWidget_SetHorizontalHeaderLabels(QTableWidget* self, struct miqt_array* /* of struct miqt_string */ labels) { QStringList labels_QList; labels_QList.reserve(labels->len); - struct miqt_string** labels_arr = static_cast(labels->data); + struct miqt_string* labels_arr = static_cast(labels->data); for(size_t i = 0; i < labels->len; ++i) { - QString labels_arr_i_QString = QString::fromUtf8(&labels_arr[i]->data, labels_arr[i]->len); + QString labels_arr_i_QString = QString::fromUtf8(labels_arr[i].data, labels_arr[i].len); labels_QList.push_back(labels_arr_i_QString); } self->setHorizontalHeaderLabels(labels_QList); @@ -508,8 +532,8 @@ struct miqt_array* QTableWidget_SelectedItems(const QTableWidget* self) { return _out; } -struct miqt_array* QTableWidget_FindItems(const QTableWidget* self, struct miqt_string* text, int flags) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +struct miqt_array* QTableWidget_FindItems(const QTableWidget* self, struct miqt_string text, int flags) { + QString text_QString = QString::fromUtf8(text.data, text.len); QList _ret = self->findItems(text_QString, static_cast(flags)); // Convert QList<> from C++ memory to manually-managed C memory QTableWidgetItem** _arr = static_cast(malloc(sizeof(QTableWidgetItem*) * _ret.length())); @@ -752,32 +776,48 @@ void QTableWidget_connect_CurrentCellChanged(QTableWidget* self, intptr_t slot) }); } -struct miqt_string* QTableWidget_Tr2(const char* s, const char* c) { +struct miqt_string QTableWidget_Tr2(const char* s, const char* c) { QString _ret = QTableWidget::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTableWidget_Tr3(const char* s, const char* c, int n) { +struct miqt_string QTableWidget_Tr3(const char* s, const char* c, int n) { QString _ret = QTableWidget::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTableWidget_TrUtf82(const char* s, const char* c) { +struct miqt_string QTableWidget_TrUtf82(const char* s, const char* c) { QString _ret = QTableWidget::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTableWidget_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QTableWidget_TrUtf83(const char* s, const char* c, int n) { QString _ret = QTableWidget::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QTableWidget_SortItems2(QTableWidget* self, int column, int order) { diff --git a/qt/gen_qtablewidget.go b/qt/gen_qtablewidget.go index be22123b..bd8f205f 100644 --- a/qt/gen_qtablewidget.go +++ b/qt/gen_qtablewidget.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "runtime/cgo" "unsafe" @@ -148,17 +147,21 @@ func NewQTableWidgetItem() *QTableWidgetItem { // NewQTableWidgetItem2 constructs a new QTableWidgetItem object. func NewQTableWidgetItem2(text string) *QTableWidgetItem { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - ret := C.QTableWidgetItem_new2((*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + ret := C.QTableWidgetItem_new2(text_ms) return newQTableWidgetItem(ret) } // NewQTableWidgetItem3 constructs a new QTableWidgetItem object. func NewQTableWidgetItem3(icon *QIcon, text string) *QTableWidgetItem { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - ret := C.QTableWidgetItem_new3(icon.cPointer(), (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + ret := C.QTableWidgetItem_new3(icon.cPointer(), text_ms) return newQTableWidgetItem(ret) } @@ -176,17 +179,21 @@ func NewQTableWidgetItem5(typeVal int) *QTableWidgetItem { // NewQTableWidgetItem6 constructs a new QTableWidgetItem object. func NewQTableWidgetItem6(text string, typeVal int) *QTableWidgetItem { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - ret := C.QTableWidgetItem_new6((*C.struct_miqt_string)(text_ms), (C.int)(typeVal)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + ret := C.QTableWidgetItem_new6(text_ms, (C.int)(typeVal)) return newQTableWidgetItem(ret) } // NewQTableWidgetItem7 constructs a new QTableWidgetItem object. func NewQTableWidgetItem7(icon *QIcon, text string, typeVal int) *QTableWidgetItem { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - ret := C.QTableWidgetItem_new7(icon.cPointer(), (*C.struct_miqt_string)(text_ms), (C.int)(typeVal)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + ret := C.QTableWidgetItem_new7(icon.cPointer(), text_ms, (C.int)(typeVal)) return newQTableWidgetItem(ret) } @@ -223,16 +230,18 @@ func (this *QTableWidgetItem) SetFlags(flags ItemFlag) { } func (this *QTableWidgetItem) Text() string { - var _ms *C.struct_miqt_string = C.QTableWidgetItem_Text(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTableWidgetItem_Text(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QTableWidgetItem) SetText(text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QTableWidgetItem_SetText(this.h, (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QTableWidgetItem_SetText(this.h, text_ms) } func (this *QTableWidgetItem) Icon() *QIcon { @@ -247,42 +256,48 @@ func (this *QTableWidgetItem) SetIcon(icon *QIcon) { } func (this *QTableWidgetItem) StatusTip() string { - var _ms *C.struct_miqt_string = C.QTableWidgetItem_StatusTip(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTableWidgetItem_StatusTip(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QTableWidgetItem) SetStatusTip(statusTip string) { - statusTip_ms := libmiqt.Strdupg(statusTip) - defer C.free(statusTip_ms) - C.QTableWidgetItem_SetStatusTip(this.h, (*C.struct_miqt_string)(statusTip_ms)) + statusTip_ms := C.struct_miqt_string{} + statusTip_ms.data = C.CString(statusTip) + statusTip_ms.len = C.size_t(len(statusTip)) + defer C.free(unsafe.Pointer(statusTip_ms.data)) + C.QTableWidgetItem_SetStatusTip(this.h, statusTip_ms) } func (this *QTableWidgetItem) ToolTip() string { - var _ms *C.struct_miqt_string = C.QTableWidgetItem_ToolTip(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTableWidgetItem_ToolTip(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QTableWidgetItem) SetToolTip(toolTip string) { - toolTip_ms := libmiqt.Strdupg(toolTip) - defer C.free(toolTip_ms) - C.QTableWidgetItem_SetToolTip(this.h, (*C.struct_miqt_string)(toolTip_ms)) + toolTip_ms := C.struct_miqt_string{} + toolTip_ms.data = C.CString(toolTip) + toolTip_ms.len = C.size_t(len(toolTip)) + defer C.free(unsafe.Pointer(toolTip_ms.data)) + C.QTableWidgetItem_SetToolTip(this.h, toolTip_ms) } func (this *QTableWidgetItem) WhatsThis() string { - var _ms *C.struct_miqt_string = C.QTableWidgetItem_WhatsThis(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTableWidgetItem_WhatsThis(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QTableWidgetItem) SetWhatsThis(whatsThis string) { - whatsThis_ms := libmiqt.Strdupg(whatsThis) - defer C.free(whatsThis_ms) - C.QTableWidgetItem_SetWhatsThis(this.h, (*C.struct_miqt_string)(whatsThis_ms)) + whatsThis_ms := C.struct_miqt_string{} + whatsThis_ms.data = C.CString(whatsThis) + whatsThis_ms.len = C.size_t(len(whatsThis)) + defer C.free(unsafe.Pointer(whatsThis_ms.data)) + C.QTableWidgetItem_SetWhatsThis(this.h, whatsThis_ms) } func (this *QTableWidgetItem) Font() *QFont { @@ -473,24 +488,24 @@ func (this *QTableWidget) MetaObject() *QMetaObject { func (this *QTableWidget) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QTableWidget_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QTableWidget_Metacast(this.h, param1_Cstring)) } func QTableWidget_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTableWidget_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTableWidget_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QTableWidget_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTableWidget_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTableWidget_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -556,12 +571,14 @@ func (this *QTableWidget) TakeHorizontalHeaderItem(column int) *QTableWidgetItem func (this *QTableWidget) SetVerticalHeaderLabels(labels []string) { // For the C ABI, malloc a C array of raw pointers - labels_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(labels)))) + labels_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(labels)))) defer C.free(unsafe.Pointer(labels_CArray)) for i := range labels { - labels_i_ms := libmiqt.Strdupg(labels[i]) - defer C.free(labels_i_ms) - labels_CArray[i] = (*C.struct_miqt_string)(labels_i_ms) + labels_i_ms := C.struct_miqt_string{} + labels_i_ms.data = C.CString(labels[i]) + labels_i_ms.len = C.size_t(len(labels[i])) + defer C.free(unsafe.Pointer(labels_i_ms.data)) + labels_CArray[i] = labels_i_ms } labels_ma := &C.struct_miqt_array{len: C.size_t(len(labels)), data: unsafe.Pointer(labels_CArray)} defer runtime.KeepAlive(unsafe.Pointer(labels_ma)) @@ -570,12 +587,14 @@ func (this *QTableWidget) SetVerticalHeaderLabels(labels []string) { func (this *QTableWidget) SetHorizontalHeaderLabels(labels []string) { // For the C ABI, malloc a C array of raw pointers - labels_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(labels)))) + labels_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(labels)))) defer C.free(unsafe.Pointer(labels_CArray)) for i := range labels { - labels_i_ms := libmiqt.Strdupg(labels[i]) - defer C.free(labels_i_ms) - labels_CArray[i] = (*C.struct_miqt_string)(labels_i_ms) + labels_i_ms := C.struct_miqt_string{} + labels_i_ms.data = C.CString(labels[i]) + labels_i_ms.len = C.size_t(len(labels[i])) + defer C.free(unsafe.Pointer(labels_i_ms.data)) + labels_CArray[i] = labels_i_ms } labels_ma := &C.struct_miqt_array{len: C.size_t(len(labels)), data: unsafe.Pointer(labels_CArray)} defer runtime.KeepAlive(unsafe.Pointer(labels_ma)) @@ -688,9 +707,11 @@ func (this *QTableWidget) SelectedItems() []*QTableWidgetItem { } func (this *QTableWidget) FindItems(text string, flags MatchFlag) []*QTableWidgetItem { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - var _ma *C.struct_miqt_array = C.QTableWidget_FindItems(this.h, (*C.struct_miqt_string)(text_ms), (C.int)(flags)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + var _ma *C.struct_miqt_array = C.QTableWidget_FindItems(this.h, text_ms, (C.int)(flags)) _ret := make([]*QTableWidgetItem, int(_ma.len)) _outCast := (*[0xffff]*C.QTableWidgetItem)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -1080,9 +1101,9 @@ func QTableWidget_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTableWidget_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTableWidget_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -1091,9 +1112,9 @@ func QTableWidget_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTableWidget_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTableWidget_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -1102,9 +1123,9 @@ func QTableWidget_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTableWidget_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTableWidget_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -1113,9 +1134,9 @@ func QTableWidget_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTableWidget_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTableWidget_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qtablewidget.h b/qt/gen_qtablewidget.h index 443a3d44..0882b713 100644 --- a/qt/gen_qtablewidget.h +++ b/qt/gen_qtablewidget.h @@ -58,12 +58,12 @@ int QTableWidgetSelectionRange_ColumnCount(const QTableWidgetSelectionRange* sel void QTableWidgetSelectionRange_Delete(QTableWidgetSelectionRange* self); QTableWidgetItem* QTableWidgetItem_new(); -QTableWidgetItem* QTableWidgetItem_new2(struct miqt_string* text); -QTableWidgetItem* QTableWidgetItem_new3(QIcon* icon, struct miqt_string* text); +QTableWidgetItem* QTableWidgetItem_new2(struct miqt_string text); +QTableWidgetItem* QTableWidgetItem_new3(QIcon* icon, struct miqt_string text); QTableWidgetItem* QTableWidgetItem_new4(QTableWidgetItem* other); QTableWidgetItem* QTableWidgetItem_new5(int typeVal); -QTableWidgetItem* QTableWidgetItem_new6(struct miqt_string* text, int typeVal); -QTableWidgetItem* QTableWidgetItem_new7(QIcon* icon, struct miqt_string* text, int typeVal); +QTableWidgetItem* QTableWidgetItem_new6(struct miqt_string text, int typeVal); +QTableWidgetItem* QTableWidgetItem_new7(QIcon* icon, struct miqt_string text, int typeVal); QTableWidgetItem* QTableWidgetItem_Clone(const QTableWidgetItem* self); QTableWidget* QTableWidgetItem_TableWidget(const QTableWidgetItem* self); int QTableWidgetItem_Row(const QTableWidgetItem* self); @@ -72,16 +72,16 @@ void QTableWidgetItem_SetSelected(QTableWidgetItem* self, bool selectVal); bool QTableWidgetItem_IsSelected(const QTableWidgetItem* self); int QTableWidgetItem_Flags(const QTableWidgetItem* self); void QTableWidgetItem_SetFlags(QTableWidgetItem* self, int flags); -struct miqt_string* QTableWidgetItem_Text(const QTableWidgetItem* self); -void QTableWidgetItem_SetText(QTableWidgetItem* self, struct miqt_string* text); +struct miqt_string QTableWidgetItem_Text(const QTableWidgetItem* self); +void QTableWidgetItem_SetText(QTableWidgetItem* self, struct miqt_string text); QIcon* QTableWidgetItem_Icon(const QTableWidgetItem* self); void QTableWidgetItem_SetIcon(QTableWidgetItem* self, QIcon* icon); -struct miqt_string* QTableWidgetItem_StatusTip(const QTableWidgetItem* self); -void QTableWidgetItem_SetStatusTip(QTableWidgetItem* self, struct miqt_string* statusTip); -struct miqt_string* QTableWidgetItem_ToolTip(const QTableWidgetItem* self); -void QTableWidgetItem_SetToolTip(QTableWidgetItem* self, struct miqt_string* toolTip); -struct miqt_string* QTableWidgetItem_WhatsThis(const QTableWidgetItem* self); -void QTableWidgetItem_SetWhatsThis(QTableWidgetItem* self, struct miqt_string* whatsThis); +struct miqt_string QTableWidgetItem_StatusTip(const QTableWidgetItem* self); +void QTableWidgetItem_SetStatusTip(QTableWidgetItem* self, struct miqt_string statusTip); +struct miqt_string QTableWidgetItem_ToolTip(const QTableWidgetItem* self); +void QTableWidgetItem_SetToolTip(QTableWidgetItem* self, struct miqt_string toolTip); +struct miqt_string QTableWidgetItem_WhatsThis(const QTableWidgetItem* self); +void QTableWidgetItem_SetWhatsThis(QTableWidgetItem* self, struct miqt_string whatsThis); QFont* QTableWidgetItem_Font(const QTableWidgetItem* self); void QTableWidgetItem_SetFont(QTableWidgetItem* self, QFont* font); int QTableWidgetItem_TextAlignment(const QTableWidgetItem* self); @@ -113,8 +113,8 @@ QTableWidget* QTableWidget_new3(QWidget* parent); QTableWidget* QTableWidget_new4(int rows, int columns, QWidget* parent); QMetaObject* QTableWidget_MetaObject(const QTableWidget* self); void* QTableWidget_Metacast(QTableWidget* self, const char* param1); -struct miqt_string* QTableWidget_Tr(const char* s); -struct miqt_string* QTableWidget_TrUtf8(const char* s); +struct miqt_string QTableWidget_Tr(const char* s); +struct miqt_string QTableWidget_TrUtf8(const char* s); void QTableWidget_SetRowCount(QTableWidget* self, int rows); int QTableWidget_RowCount(const QTableWidget* self); void QTableWidget_SetColumnCount(QTableWidget* self, int columns); @@ -130,8 +130,8 @@ QTableWidgetItem* QTableWidget_TakeVerticalHeaderItem(QTableWidget* self, int ro QTableWidgetItem* QTableWidget_HorizontalHeaderItem(const QTableWidget* self, int column); void QTableWidget_SetHorizontalHeaderItem(QTableWidget* self, int column, QTableWidgetItem* item); QTableWidgetItem* QTableWidget_TakeHorizontalHeaderItem(QTableWidget* self, int column); -void QTableWidget_SetVerticalHeaderLabels(QTableWidget* self, struct miqt_array* /* of struct miqt_string* */ labels); -void QTableWidget_SetHorizontalHeaderLabels(QTableWidget* self, struct miqt_array* /* of struct miqt_string* */ labels); +void QTableWidget_SetVerticalHeaderLabels(QTableWidget* self, struct miqt_array* /* of struct miqt_string */ labels); +void QTableWidget_SetHorizontalHeaderLabels(QTableWidget* self, struct miqt_array* /* of struct miqt_string */ labels); int QTableWidget_CurrentRow(const QTableWidget* self); int QTableWidget_CurrentColumn(const QTableWidget* self); QTableWidgetItem* QTableWidget_CurrentItem(const QTableWidget* self); @@ -154,7 +154,7 @@ void QTableWidget_SetItemSelected(QTableWidget* self, QTableWidgetItem* item, bo void QTableWidget_SetRangeSelected(QTableWidget* self, QTableWidgetSelectionRange* rangeVal, bool selectVal); struct miqt_array* QTableWidget_SelectedRanges(const QTableWidget* self); struct miqt_array* QTableWidget_SelectedItems(const QTableWidget* self); -struct miqt_array* QTableWidget_FindItems(const QTableWidget* self, struct miqt_string* text, int flags); +struct miqt_array* QTableWidget_FindItems(const QTableWidget* self, struct miqt_string text, int flags); int QTableWidget_VisualRow(const QTableWidget* self, int logicalRow); int QTableWidget_VisualColumn(const QTableWidget* self, int logicalColumn); QTableWidgetItem* QTableWidget_ItemAt(const QTableWidget* self, QPoint* p); @@ -199,10 +199,10 @@ void QTableWidget_CellChanged(QTableWidget* self, int row, int column); void QTableWidget_connect_CellChanged(QTableWidget* self, intptr_t slot); void QTableWidget_CurrentCellChanged(QTableWidget* self, int currentRow, int currentColumn, int previousRow, int previousColumn); void QTableWidget_connect_CurrentCellChanged(QTableWidget* self, intptr_t slot); -struct miqt_string* QTableWidget_Tr2(const char* s, const char* c); -struct miqt_string* QTableWidget_Tr3(const char* s, const char* c, int n); -struct miqt_string* QTableWidget_TrUtf82(const char* s, const char* c); -struct miqt_string* QTableWidget_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QTableWidget_Tr2(const char* s, const char* c); +struct miqt_string QTableWidget_Tr3(const char* s, const char* c, int n); +struct miqt_string QTableWidget_TrUtf82(const char* s, const char* c); +struct miqt_string QTableWidget_TrUtf83(const char* s, const char* c, int n); void QTableWidget_SortItems2(QTableWidget* self, int column, int order); void QTableWidget_ScrollToItem2(QTableWidget* self, QTableWidgetItem* item, int hint); void QTableWidget_Delete(QTableWidget* self); diff --git a/qt/gen_qtabwidget.cpp b/qt/gen_qtabwidget.cpp index 593d4f61..93bc57da 100644 --- a/qt/gen_qtabwidget.cpp +++ b/qt/gen_qtabwidget.cpp @@ -27,37 +27,45 @@ void* QTabWidget_Metacast(QTabWidget* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QTabWidget_Tr(const char* s) { +struct miqt_string QTabWidget_Tr(const char* s) { QString _ret = QTabWidget::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTabWidget_TrUtf8(const char* s) { +struct miqt_string QTabWidget_TrUtf8(const char* s) { QString _ret = QTabWidget::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -int QTabWidget_AddTab(QTabWidget* self, QWidget* widget, struct miqt_string* param2) { - QString param2_QString = QString::fromUtf8(¶m2->data, param2->len); +int QTabWidget_AddTab(QTabWidget* self, QWidget* widget, struct miqt_string param2) { + QString param2_QString = QString::fromUtf8(param2.data, param2.len); return self->addTab(widget, param2_QString); } -int QTabWidget_AddTab2(QTabWidget* self, QWidget* widget, QIcon* icon, struct miqt_string* label) { - QString label_QString = QString::fromUtf8(&label->data, label->len); +int QTabWidget_AddTab2(QTabWidget* self, QWidget* widget, QIcon* icon, struct miqt_string label) { + QString label_QString = QString::fromUtf8(label.data, label.len); return self->addTab(widget, *icon, label_QString); } -int QTabWidget_InsertTab(QTabWidget* self, int index, QWidget* widget, struct miqt_string* param3) { - QString param3_QString = QString::fromUtf8(¶m3->data, param3->len); +int QTabWidget_InsertTab(QTabWidget* self, int index, QWidget* widget, struct miqt_string param3) { + QString param3_QString = QString::fromUtf8(param3.data, param3.len); return self->insertTab(static_cast(index), widget, param3_QString); } -int QTabWidget_InsertTab2(QTabWidget* self, int index, QWidget* widget, QIcon* icon, struct miqt_string* label) { - QString label_QString = QString::fromUtf8(&label->data, label->len); +int QTabWidget_InsertTab2(QTabWidget* self, int index, QWidget* widget, QIcon* icon, struct miqt_string label) { + QString label_QString = QString::fromUtf8(label.data, label.len); return self->insertTab(static_cast(index), widget, *icon, label_QString); } @@ -81,15 +89,19 @@ void QTabWidget_SetTabVisible(QTabWidget* self, int index, bool visible) { self->setTabVisible(static_cast(index), visible); } -struct miqt_string* QTabWidget_TabText(const QTabWidget* self, int index) { +struct miqt_string QTabWidget_TabText(const QTabWidget* self, int index) { QString _ret = self->tabText(static_cast(index)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QTabWidget_SetTabText(QTabWidget* self, int index, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QTabWidget_SetTabText(QTabWidget* self, int index, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->setTabText(static_cast(index), text_QString); } @@ -101,28 +113,36 @@ void QTabWidget_SetTabIcon(QTabWidget* self, int index, QIcon* icon) { self->setTabIcon(static_cast(index), *icon); } -void QTabWidget_SetTabToolTip(QTabWidget* self, int index, struct miqt_string* tip) { - QString tip_QString = QString::fromUtf8(&tip->data, tip->len); +void QTabWidget_SetTabToolTip(QTabWidget* self, int index, struct miqt_string tip) { + QString tip_QString = QString::fromUtf8(tip.data, tip.len); self->setTabToolTip(static_cast(index), tip_QString); } -struct miqt_string* QTabWidget_TabToolTip(const QTabWidget* self, int index) { +struct miqt_string QTabWidget_TabToolTip(const QTabWidget* self, int index) { QString _ret = self->tabToolTip(static_cast(index)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QTabWidget_SetTabWhatsThis(QTabWidget* self, int index, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QTabWidget_SetTabWhatsThis(QTabWidget* self, int index, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->setTabWhatsThis(static_cast(index), text_QString); } -struct miqt_string* QTabWidget_TabWhatsThis(const QTabWidget* self, int index) { +struct miqt_string QTabWidget_TabWhatsThis(const QTabWidget* self, int index) { QString _ret = self->tabWhatsThis(static_cast(index)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QTabWidget_CurrentIndex(const QTabWidget* self) { @@ -304,32 +324,48 @@ void QTabWidget_connect_TabBarDoubleClicked(QTabWidget* self, intptr_t slot) { }); } -struct miqt_string* QTabWidget_Tr2(const char* s, const char* c) { +struct miqt_string QTabWidget_Tr2(const char* s, const char* c) { QString _ret = QTabWidget::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTabWidget_Tr3(const char* s, const char* c, int n) { +struct miqt_string QTabWidget_Tr3(const char* s, const char* c, int n) { QString _ret = QTabWidget::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTabWidget_TrUtf82(const char* s, const char* c) { +struct miqt_string QTabWidget_TrUtf82(const char* s, const char* c) { QString _ret = QTabWidget::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTabWidget_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QTabWidget_TrUtf83(const char* s, const char* c, int n) { QString _ret = QTabWidget::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QTabWidget_SetCornerWidget2(QTabWidget* self, QWidget* w, int corner) { diff --git a/qt/gen_qtabwidget.go b/qt/gen_qtabwidget.go index 2d1f7073..39a8bd09 100644 --- a/qt/gen_qtabwidget.go +++ b/qt/gen_qtabwidget.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "runtime/cgo" "unsafe" @@ -80,49 +79,57 @@ func (this *QTabWidget) MetaObject() *QMetaObject { func (this *QTabWidget) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QTabWidget_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QTabWidget_Metacast(this.h, param1_Cstring)) } func QTabWidget_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTabWidget_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTabWidget_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QTabWidget_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTabWidget_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTabWidget_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QTabWidget) AddTab(widget *QWidget, param2 string) int { - param2_ms := libmiqt.Strdupg(param2) - defer C.free(param2_ms) - return (int)(C.QTabWidget_AddTab(this.h, widget.cPointer(), (*C.struct_miqt_string)(param2_ms))) + param2_ms := C.struct_miqt_string{} + param2_ms.data = C.CString(param2) + param2_ms.len = C.size_t(len(param2)) + defer C.free(unsafe.Pointer(param2_ms.data)) + return (int)(C.QTabWidget_AddTab(this.h, widget.cPointer(), param2_ms)) } func (this *QTabWidget) AddTab2(widget *QWidget, icon *QIcon, label string) int { - label_ms := libmiqt.Strdupg(label) - defer C.free(label_ms) - return (int)(C.QTabWidget_AddTab2(this.h, widget.cPointer(), icon.cPointer(), (*C.struct_miqt_string)(label_ms))) + label_ms := C.struct_miqt_string{} + label_ms.data = C.CString(label) + label_ms.len = C.size_t(len(label)) + defer C.free(unsafe.Pointer(label_ms.data)) + return (int)(C.QTabWidget_AddTab2(this.h, widget.cPointer(), icon.cPointer(), label_ms)) } func (this *QTabWidget) InsertTab(index int, widget *QWidget, param3 string) int { - param3_ms := libmiqt.Strdupg(param3) - defer C.free(param3_ms) - return (int)(C.QTabWidget_InsertTab(this.h, (C.int)(index), widget.cPointer(), (*C.struct_miqt_string)(param3_ms))) + param3_ms := C.struct_miqt_string{} + param3_ms.data = C.CString(param3) + param3_ms.len = C.size_t(len(param3)) + defer C.free(unsafe.Pointer(param3_ms.data)) + return (int)(C.QTabWidget_InsertTab(this.h, (C.int)(index), widget.cPointer(), param3_ms)) } func (this *QTabWidget) InsertTab2(index int, widget *QWidget, icon *QIcon, label string) int { - label_ms := libmiqt.Strdupg(label) - defer C.free(label_ms) - return (int)(C.QTabWidget_InsertTab2(this.h, (C.int)(index), widget.cPointer(), icon.cPointer(), (*C.struct_miqt_string)(label_ms))) + label_ms := C.struct_miqt_string{} + label_ms.data = C.CString(label) + label_ms.len = C.size_t(len(label)) + defer C.free(unsafe.Pointer(label_ms.data)) + return (int)(C.QTabWidget_InsertTab2(this.h, (C.int)(index), widget.cPointer(), icon.cPointer(), label_ms)) } func (this *QTabWidget) RemoveTab(index int) { @@ -146,16 +153,18 @@ func (this *QTabWidget) SetTabVisible(index int, visible bool) { } func (this *QTabWidget) TabText(index int) string { - var _ms *C.struct_miqt_string = C.QTabWidget_TabText(this.h, (C.int)(index)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTabWidget_TabText(this.h, (C.int)(index)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QTabWidget) SetTabText(index int, text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QTabWidget_SetTabText(this.h, (C.int)(index), (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QTabWidget_SetTabText(this.h, (C.int)(index), text_ms) } func (this *QTabWidget) TabIcon(index int) *QIcon { @@ -170,28 +179,32 @@ func (this *QTabWidget) SetTabIcon(index int, icon *QIcon) { } func (this *QTabWidget) SetTabToolTip(index int, tip string) { - tip_ms := libmiqt.Strdupg(tip) - defer C.free(tip_ms) - C.QTabWidget_SetTabToolTip(this.h, (C.int)(index), (*C.struct_miqt_string)(tip_ms)) + tip_ms := C.struct_miqt_string{} + tip_ms.data = C.CString(tip) + tip_ms.len = C.size_t(len(tip)) + defer C.free(unsafe.Pointer(tip_ms.data)) + C.QTabWidget_SetTabToolTip(this.h, (C.int)(index), tip_ms) } func (this *QTabWidget) TabToolTip(index int) string { - var _ms *C.struct_miqt_string = C.QTabWidget_TabToolTip(this.h, (C.int)(index)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTabWidget_TabToolTip(this.h, (C.int)(index)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QTabWidget) SetTabWhatsThis(index int, text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QTabWidget_SetTabWhatsThis(this.h, (C.int)(index), (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QTabWidget_SetTabWhatsThis(this.h, (C.int)(index), text_ms) } func (this *QTabWidget) TabWhatsThis(index int) string { - var _ms *C.struct_miqt_string = C.QTabWidget_TabWhatsThis(this.h, (C.int)(index)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTabWidget_TabWhatsThis(this.h, (C.int)(index)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -421,9 +434,9 @@ func QTabWidget_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTabWidget_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTabWidget_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -432,9 +445,9 @@ func QTabWidget_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTabWidget_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTabWidget_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -443,9 +456,9 @@ func QTabWidget_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTabWidget_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTabWidget_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -454,9 +467,9 @@ func QTabWidget_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTabWidget_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTabWidget_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qtabwidget.h b/qt/gen_qtabwidget.h index da66ba7b..671cd783 100644 --- a/qt/gen_qtabwidget.h +++ b/qt/gen_qtabwidget.h @@ -33,25 +33,25 @@ QTabWidget* QTabWidget_new(); QTabWidget* QTabWidget_new2(QWidget* parent); QMetaObject* QTabWidget_MetaObject(const QTabWidget* self); void* QTabWidget_Metacast(QTabWidget* self, const char* param1); -struct miqt_string* QTabWidget_Tr(const char* s); -struct miqt_string* QTabWidget_TrUtf8(const char* s); -int QTabWidget_AddTab(QTabWidget* self, QWidget* widget, struct miqt_string* param2); -int QTabWidget_AddTab2(QTabWidget* self, QWidget* widget, QIcon* icon, struct miqt_string* label); -int QTabWidget_InsertTab(QTabWidget* self, int index, QWidget* widget, struct miqt_string* param3); -int QTabWidget_InsertTab2(QTabWidget* self, int index, QWidget* widget, QIcon* icon, struct miqt_string* label); +struct miqt_string QTabWidget_Tr(const char* s); +struct miqt_string QTabWidget_TrUtf8(const char* s); +int QTabWidget_AddTab(QTabWidget* self, QWidget* widget, struct miqt_string param2); +int QTabWidget_AddTab2(QTabWidget* self, QWidget* widget, QIcon* icon, struct miqt_string label); +int QTabWidget_InsertTab(QTabWidget* self, int index, QWidget* widget, struct miqt_string param3); +int QTabWidget_InsertTab2(QTabWidget* self, int index, QWidget* widget, QIcon* icon, struct miqt_string label); void QTabWidget_RemoveTab(QTabWidget* self, int index); bool QTabWidget_IsTabEnabled(const QTabWidget* self, int index); void QTabWidget_SetTabEnabled(QTabWidget* self, int index, bool enabled); bool QTabWidget_IsTabVisible(const QTabWidget* self, int index); void QTabWidget_SetTabVisible(QTabWidget* self, int index, bool visible); -struct miqt_string* QTabWidget_TabText(const QTabWidget* self, int index); -void QTabWidget_SetTabText(QTabWidget* self, int index, struct miqt_string* text); +struct miqt_string QTabWidget_TabText(const QTabWidget* self, int index); +void QTabWidget_SetTabText(QTabWidget* self, int index, struct miqt_string text); QIcon* QTabWidget_TabIcon(const QTabWidget* self, int index); void QTabWidget_SetTabIcon(QTabWidget* self, int index, QIcon* icon); -void QTabWidget_SetTabToolTip(QTabWidget* self, int index, struct miqt_string* tip); -struct miqt_string* QTabWidget_TabToolTip(const QTabWidget* self, int index); -void QTabWidget_SetTabWhatsThis(QTabWidget* self, int index, struct miqt_string* text); -struct miqt_string* QTabWidget_TabWhatsThis(const QTabWidget* self, int index); +void QTabWidget_SetTabToolTip(QTabWidget* self, int index, struct miqt_string tip); +struct miqt_string QTabWidget_TabToolTip(const QTabWidget* self, int index); +void QTabWidget_SetTabWhatsThis(QTabWidget* self, int index, struct miqt_string text); +struct miqt_string QTabWidget_TabWhatsThis(const QTabWidget* self, int index); int QTabWidget_CurrentIndex(const QTabWidget* self); QWidget* QTabWidget_CurrentWidget(const QTabWidget* self); QWidget* QTabWidget_Widget(const QTabWidget* self, int index); @@ -93,10 +93,10 @@ void QTabWidget_TabBarClicked(QTabWidget* self, int index); void QTabWidget_connect_TabBarClicked(QTabWidget* self, intptr_t slot); void QTabWidget_TabBarDoubleClicked(QTabWidget* self, int index); void QTabWidget_connect_TabBarDoubleClicked(QTabWidget* self, intptr_t slot); -struct miqt_string* QTabWidget_Tr2(const char* s, const char* c); -struct miqt_string* QTabWidget_Tr3(const char* s, const char* c, int n); -struct miqt_string* QTabWidget_TrUtf82(const char* s, const char* c); -struct miqt_string* QTabWidget_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QTabWidget_Tr2(const char* s, const char* c); +struct miqt_string QTabWidget_Tr3(const char* s, const char* c, int n); +struct miqt_string QTabWidget_TrUtf82(const char* s, const char* c); +struct miqt_string QTabWidget_TrUtf83(const char* s, const char* c, int n); void QTabWidget_SetCornerWidget2(QTabWidget* self, QWidget* w, int corner); QWidget* QTabWidget_CornerWidget1(const QTabWidget* self, int corner); void QTabWidget_Delete(QTabWidget* self); diff --git a/qt/gen_qtemporarydir.cpp b/qt/gen_qtemporarydir.cpp index 38e53b09..c845933e 100644 --- a/qt/gen_qtemporarydir.cpp +++ b/qt/gen_qtemporarydir.cpp @@ -10,8 +10,8 @@ QTemporaryDir* QTemporaryDir_new() { return new QTemporaryDir(); } -QTemporaryDir* QTemporaryDir_new2(struct miqt_string* templateName) { - QString templateName_QString = QString::fromUtf8(&templateName->data, templateName->len); +QTemporaryDir* QTemporaryDir_new2(struct miqt_string templateName) { + QString templateName_QString = QString::fromUtf8(templateName.data, templateName.len); return new QTemporaryDir(templateName_QString); } @@ -19,11 +19,15 @@ bool QTemporaryDir_IsValid(const QTemporaryDir* self) { return self->isValid(); } -struct miqt_string* QTemporaryDir_ErrorString(const QTemporaryDir* self) { +struct miqt_string QTemporaryDir_ErrorString(const QTemporaryDir* self) { QString _ret = self->errorString(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } bool QTemporaryDir_AutoRemove(const QTemporaryDir* self) { @@ -38,19 +42,27 @@ bool QTemporaryDir_Remove(QTemporaryDir* self) { return self->remove(); } -struct miqt_string* QTemporaryDir_Path(const QTemporaryDir* self) { +struct miqt_string QTemporaryDir_Path(const QTemporaryDir* self) { QString _ret = self->path(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTemporaryDir_FilePath(const QTemporaryDir* self, struct miqt_string* fileName) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +struct miqt_string QTemporaryDir_FilePath(const QTemporaryDir* self, struct miqt_string fileName) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); QString _ret = self->filePath(fileName_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QTemporaryDir_Delete(QTemporaryDir* self) { diff --git a/qt/gen_qtemporarydir.go b/qt/gen_qtemporarydir.go index e50874f6..a8fb977a 100644 --- a/qt/gen_qtemporarydir.go +++ b/qt/gen_qtemporarydir.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -51,9 +50,11 @@ func NewQTemporaryDir() *QTemporaryDir { // NewQTemporaryDir2 constructs a new QTemporaryDir object. func NewQTemporaryDir2(templateName string) *QTemporaryDir { - templateName_ms := libmiqt.Strdupg(templateName) - defer C.free(templateName_ms) - ret := C.QTemporaryDir_new2((*C.struct_miqt_string)(templateName_ms)) + templateName_ms := C.struct_miqt_string{} + templateName_ms.data = C.CString(templateName) + templateName_ms.len = C.size_t(len(templateName)) + defer C.free(unsafe.Pointer(templateName_ms.data)) + ret := C.QTemporaryDir_new2(templateName_ms) return newQTemporaryDir(ret) } @@ -62,9 +63,9 @@ func (this *QTemporaryDir) IsValid() bool { } func (this *QTemporaryDir) ErrorString() string { - var _ms *C.struct_miqt_string = C.QTemporaryDir_ErrorString(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTemporaryDir_ErrorString(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -81,18 +82,20 @@ func (this *QTemporaryDir) Remove() bool { } func (this *QTemporaryDir) Path() string { - var _ms *C.struct_miqt_string = C.QTemporaryDir_Path(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTemporaryDir_Path(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QTemporaryDir) FilePath(fileName string) string { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - var _ms *C.struct_miqt_string = C.QTemporaryDir_FilePath(this.h, (*C.struct_miqt_string)(fileName_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + var _ms C.struct_miqt_string = C.QTemporaryDir_FilePath(this.h, fileName_ms) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qtemporarydir.h b/qt/gen_qtemporarydir.h index 7f508a67..b4103844 100644 --- a/qt/gen_qtemporarydir.h +++ b/qt/gen_qtemporarydir.h @@ -20,14 +20,14 @@ typedef struct QTemporaryDir QTemporaryDir; #endif QTemporaryDir* QTemporaryDir_new(); -QTemporaryDir* QTemporaryDir_new2(struct miqt_string* templateName); +QTemporaryDir* QTemporaryDir_new2(struct miqt_string templateName); bool QTemporaryDir_IsValid(const QTemporaryDir* self); -struct miqt_string* QTemporaryDir_ErrorString(const QTemporaryDir* self); +struct miqt_string QTemporaryDir_ErrorString(const QTemporaryDir* self); bool QTemporaryDir_AutoRemove(const QTemporaryDir* self); void QTemporaryDir_SetAutoRemove(QTemporaryDir* self, bool b); bool QTemporaryDir_Remove(QTemporaryDir* self); -struct miqt_string* QTemporaryDir_Path(const QTemporaryDir* self); -struct miqt_string* QTemporaryDir_FilePath(const QTemporaryDir* self, struct miqt_string* fileName); +struct miqt_string QTemporaryDir_Path(const QTemporaryDir* self); +struct miqt_string QTemporaryDir_FilePath(const QTemporaryDir* self, struct miqt_string fileName); void QTemporaryDir_Delete(QTemporaryDir* self); #ifdef __cplusplus diff --git a/qt/gen_qtemporaryfile.cpp b/qt/gen_qtemporaryfile.cpp index 13d7042d..2d377f02 100644 --- a/qt/gen_qtemporaryfile.cpp +++ b/qt/gen_qtemporaryfile.cpp @@ -13,8 +13,8 @@ QTemporaryFile* QTemporaryFile_new() { return new QTemporaryFile(); } -QTemporaryFile* QTemporaryFile_new2(struct miqt_string* templateName) { - QString templateName_QString = QString::fromUtf8(&templateName->data, templateName->len); +QTemporaryFile* QTemporaryFile_new2(struct miqt_string templateName) { + QString templateName_QString = QString::fromUtf8(templateName.data, templateName.len); return new QTemporaryFile(templateName_QString); } @@ -22,8 +22,8 @@ QTemporaryFile* QTemporaryFile_new3(QObject* parent) { return new QTemporaryFile(parent); } -QTemporaryFile* QTemporaryFile_new4(struct miqt_string* templateName, QObject* parent) { - QString templateName_QString = QString::fromUtf8(&templateName->data, templateName->len); +QTemporaryFile* QTemporaryFile_new4(struct miqt_string templateName, QObject* parent) { + QString templateName_QString = QString::fromUtf8(templateName.data, templateName.len); return new QTemporaryFile(templateName_QString, parent); } @@ -35,18 +35,26 @@ void* QTemporaryFile_Metacast(QTemporaryFile* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QTemporaryFile_Tr(const char* s) { +struct miqt_string QTemporaryFile_Tr(const char* s) { QString _ret = QTemporaryFile::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTemporaryFile_TrUtf8(const char* s) { +struct miqt_string QTemporaryFile_TrUtf8(const char* s) { QString _ret = QTemporaryFile::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } bool QTemporaryFile_AutoRemove(const QTemporaryFile* self) { @@ -61,32 +69,40 @@ bool QTemporaryFile_Open(QTemporaryFile* self) { return self->open(); } -struct miqt_string* QTemporaryFile_FileName(const QTemporaryFile* self) { +struct miqt_string QTemporaryFile_FileName(const QTemporaryFile* self) { QString _ret = self->fileName(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTemporaryFile_FileTemplate(const QTemporaryFile* self) { +struct miqt_string QTemporaryFile_FileTemplate(const QTemporaryFile* self) { QString _ret = self->fileTemplate(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QTemporaryFile_SetFileTemplate(QTemporaryFile* self, struct miqt_string* name) { - QString name_QString = QString::fromUtf8(&name->data, name->len); +void QTemporaryFile_SetFileTemplate(QTemporaryFile* self, struct miqt_string name) { + QString name_QString = QString::fromUtf8(name.data, name.len); self->setFileTemplate(name_QString); } -bool QTemporaryFile_Rename(QTemporaryFile* self, struct miqt_string* newName) { - QString newName_QString = QString::fromUtf8(&newName->data, newName->len); +bool QTemporaryFile_Rename(QTemporaryFile* self, struct miqt_string newName) { + QString newName_QString = QString::fromUtf8(newName.data, newName.len); return self->rename(newName_QString); } -QTemporaryFile* QTemporaryFile_CreateLocalFile(struct miqt_string* fileName) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +QTemporaryFile* QTemporaryFile_CreateLocalFile(struct miqt_string fileName) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); return QTemporaryFile::createLocalFile(fileName_QString); } @@ -94,8 +110,8 @@ QTemporaryFile* QTemporaryFile_CreateLocalFileWithFile(QFile* file) { return QTemporaryFile::createLocalFile(*file); } -QTemporaryFile* QTemporaryFile_CreateNativeFile(struct miqt_string* fileName) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +QTemporaryFile* QTemporaryFile_CreateNativeFile(struct miqt_string fileName) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); return QTemporaryFile::createNativeFile(fileName_QString); } @@ -103,32 +119,48 @@ QTemporaryFile* QTemporaryFile_CreateNativeFileWithFile(QFile* file) { return QTemporaryFile::createNativeFile(*file); } -struct miqt_string* QTemporaryFile_Tr2(const char* s, const char* c) { +struct miqt_string QTemporaryFile_Tr2(const char* s, const char* c) { QString _ret = QTemporaryFile::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTemporaryFile_Tr3(const char* s, const char* c, int n) { +struct miqt_string QTemporaryFile_Tr3(const char* s, const char* c, int n) { QString _ret = QTemporaryFile::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTemporaryFile_TrUtf82(const char* s, const char* c) { +struct miqt_string QTemporaryFile_TrUtf82(const char* s, const char* c) { QString _ret = QTemporaryFile::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTemporaryFile_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QTemporaryFile_TrUtf83(const char* s, const char* c, int n) { QString _ret = QTemporaryFile::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QTemporaryFile_Delete(QTemporaryFile* self) { diff --git a/qt/gen_qtemporaryfile.go b/qt/gen_qtemporaryfile.go index 6e7e51ad..d4b8e2f5 100644 --- a/qt/gen_qtemporaryfile.go +++ b/qt/gen_qtemporaryfile.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -52,9 +51,11 @@ func NewQTemporaryFile() *QTemporaryFile { // NewQTemporaryFile2 constructs a new QTemporaryFile object. func NewQTemporaryFile2(templateName string) *QTemporaryFile { - templateName_ms := libmiqt.Strdupg(templateName) - defer C.free(templateName_ms) - ret := C.QTemporaryFile_new2((*C.struct_miqt_string)(templateName_ms)) + templateName_ms := C.struct_miqt_string{} + templateName_ms.data = C.CString(templateName) + templateName_ms.len = C.size_t(len(templateName)) + defer C.free(unsafe.Pointer(templateName_ms.data)) + ret := C.QTemporaryFile_new2(templateName_ms) return newQTemporaryFile(ret) } @@ -66,9 +67,11 @@ func NewQTemporaryFile3(parent *QObject) *QTemporaryFile { // NewQTemporaryFile4 constructs a new QTemporaryFile object. func NewQTemporaryFile4(templateName string, parent *QObject) *QTemporaryFile { - templateName_ms := libmiqt.Strdupg(templateName) - defer C.free(templateName_ms) - ret := C.QTemporaryFile_new4((*C.struct_miqt_string)(templateName_ms), parent.cPointer()) + templateName_ms := C.struct_miqt_string{} + templateName_ms.data = C.CString(templateName) + templateName_ms.len = C.size_t(len(templateName)) + defer C.free(unsafe.Pointer(templateName_ms.data)) + ret := C.QTemporaryFile_new4(templateName_ms, parent.cPointer()) return newQTemporaryFile(ret) } @@ -79,24 +82,24 @@ func (this *QTemporaryFile) MetaObject() *QMetaObject { func (this *QTemporaryFile) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QTemporaryFile_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QTemporaryFile_Metacast(this.h, param1_Cstring)) } func QTemporaryFile_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTemporaryFile_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTemporaryFile_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QTemporaryFile_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTemporaryFile_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTemporaryFile_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -113,35 +116,41 @@ func (this *QTemporaryFile) Open() bool { } func (this *QTemporaryFile) FileName() string { - var _ms *C.struct_miqt_string = C.QTemporaryFile_FileName(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTemporaryFile_FileName(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QTemporaryFile) FileTemplate() string { - var _ms *C.struct_miqt_string = C.QTemporaryFile_FileTemplate(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTemporaryFile_FileTemplate(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QTemporaryFile) SetFileTemplate(name string) { - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - C.QTemporaryFile_SetFileTemplate(this.h, (*C.struct_miqt_string)(name_ms)) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + C.QTemporaryFile_SetFileTemplate(this.h, name_ms) } func (this *QTemporaryFile) Rename(newName string) bool { - newName_ms := libmiqt.Strdupg(newName) - defer C.free(newName_ms) - return (bool)(C.QTemporaryFile_Rename(this.h, (*C.struct_miqt_string)(newName_ms))) + newName_ms := C.struct_miqt_string{} + newName_ms.data = C.CString(newName) + newName_ms.len = C.size_t(len(newName)) + defer C.free(unsafe.Pointer(newName_ms.data)) + return (bool)(C.QTemporaryFile_Rename(this.h, newName_ms)) } func QTemporaryFile_CreateLocalFile(fileName string) *QTemporaryFile { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - return UnsafeNewQTemporaryFile(unsafe.Pointer(C.QTemporaryFile_CreateLocalFile((*C.struct_miqt_string)(fileName_ms)))) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + return UnsafeNewQTemporaryFile(unsafe.Pointer(C.QTemporaryFile_CreateLocalFile(fileName_ms))) } func QTemporaryFile_CreateLocalFileWithFile(file *QFile) *QTemporaryFile { @@ -149,9 +158,11 @@ func QTemporaryFile_CreateLocalFileWithFile(file *QFile) *QTemporaryFile { } func QTemporaryFile_CreateNativeFile(fileName string) *QTemporaryFile { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - return UnsafeNewQTemporaryFile(unsafe.Pointer(C.QTemporaryFile_CreateNativeFile((*C.struct_miqt_string)(fileName_ms)))) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + return UnsafeNewQTemporaryFile(unsafe.Pointer(C.QTemporaryFile_CreateNativeFile(fileName_ms))) } func QTemporaryFile_CreateNativeFileWithFile(file *QFile) *QTemporaryFile { @@ -163,9 +174,9 @@ func QTemporaryFile_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTemporaryFile_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTemporaryFile_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -174,9 +185,9 @@ func QTemporaryFile_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTemporaryFile_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTemporaryFile_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -185,9 +196,9 @@ func QTemporaryFile_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTemporaryFile_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTemporaryFile_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -196,9 +207,9 @@ func QTemporaryFile_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTemporaryFile_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTemporaryFile_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qtemporaryfile.h b/qt/gen_qtemporaryfile.h index 731287dd..cddc2a11 100644 --- a/qt/gen_qtemporaryfile.h +++ b/qt/gen_qtemporaryfile.h @@ -26,28 +26,28 @@ typedef struct QTemporaryFile QTemporaryFile; #endif QTemporaryFile* QTemporaryFile_new(); -QTemporaryFile* QTemporaryFile_new2(struct miqt_string* templateName); +QTemporaryFile* QTemporaryFile_new2(struct miqt_string templateName); QTemporaryFile* QTemporaryFile_new3(QObject* parent); -QTemporaryFile* QTemporaryFile_new4(struct miqt_string* templateName, QObject* parent); +QTemporaryFile* QTemporaryFile_new4(struct miqt_string templateName, QObject* parent); QMetaObject* QTemporaryFile_MetaObject(const QTemporaryFile* self); void* QTemporaryFile_Metacast(QTemporaryFile* self, const char* param1); -struct miqt_string* QTemporaryFile_Tr(const char* s); -struct miqt_string* QTemporaryFile_TrUtf8(const char* s); +struct miqt_string QTemporaryFile_Tr(const char* s); +struct miqt_string QTemporaryFile_TrUtf8(const char* s); bool QTemporaryFile_AutoRemove(const QTemporaryFile* self); void QTemporaryFile_SetAutoRemove(QTemporaryFile* self, bool b); bool QTemporaryFile_Open(QTemporaryFile* self); -struct miqt_string* QTemporaryFile_FileName(const QTemporaryFile* self); -struct miqt_string* QTemporaryFile_FileTemplate(const QTemporaryFile* self); -void QTemporaryFile_SetFileTemplate(QTemporaryFile* self, struct miqt_string* name); -bool QTemporaryFile_Rename(QTemporaryFile* self, struct miqt_string* newName); -QTemporaryFile* QTemporaryFile_CreateLocalFile(struct miqt_string* fileName); +struct miqt_string QTemporaryFile_FileName(const QTemporaryFile* self); +struct miqt_string QTemporaryFile_FileTemplate(const QTemporaryFile* self); +void QTemporaryFile_SetFileTemplate(QTemporaryFile* self, struct miqt_string name); +bool QTemporaryFile_Rename(QTemporaryFile* self, struct miqt_string newName); +QTemporaryFile* QTemporaryFile_CreateLocalFile(struct miqt_string fileName); QTemporaryFile* QTemporaryFile_CreateLocalFileWithFile(QFile* file); -QTemporaryFile* QTemporaryFile_CreateNativeFile(struct miqt_string* fileName); +QTemporaryFile* QTemporaryFile_CreateNativeFile(struct miqt_string fileName); QTemporaryFile* QTemporaryFile_CreateNativeFileWithFile(QFile* file); -struct miqt_string* QTemporaryFile_Tr2(const char* s, const char* c); -struct miqt_string* QTemporaryFile_Tr3(const char* s, const char* c, int n); -struct miqt_string* QTemporaryFile_TrUtf82(const char* s, const char* c); -struct miqt_string* QTemporaryFile_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QTemporaryFile_Tr2(const char* s, const char* c); +struct miqt_string QTemporaryFile_Tr3(const char* s, const char* c, int n); +struct miqt_string QTemporaryFile_TrUtf82(const char* s, const char* c); +struct miqt_string QTemporaryFile_TrUtf83(const char* s, const char* c, int n); void QTemporaryFile_Delete(QTemporaryFile* self); #ifdef __cplusplus diff --git a/qt/gen_qtextboundaryfinder.cpp b/qt/gen_qtextboundaryfinder.cpp index 47ac570e..cdaeacbf 100644 --- a/qt/gen_qtextboundaryfinder.cpp +++ b/qt/gen_qtextboundaryfinder.cpp @@ -15,8 +15,8 @@ QTextBoundaryFinder* QTextBoundaryFinder_new2(QTextBoundaryFinder* other) { return new QTextBoundaryFinder(*other); } -QTextBoundaryFinder* QTextBoundaryFinder_new3(int typeVal, struct miqt_string* stringVal) { - QString stringVal_QString = QString::fromUtf8(&stringVal->data, stringVal->len); +QTextBoundaryFinder* QTextBoundaryFinder_new3(int typeVal, struct miqt_string stringVal) { + QString stringVal_QString = QString::fromUtf8(stringVal.data, stringVal.len); return new QTextBoundaryFinder(static_cast(typeVal), stringVal_QString); } @@ -45,11 +45,15 @@ int QTextBoundaryFinder_Type(const QTextBoundaryFinder* self) { return static_cast(_ret); } -struct miqt_string* QTextBoundaryFinder_String(const QTextBoundaryFinder* self) { +struct miqt_string QTextBoundaryFinder_String(const QTextBoundaryFinder* self) { QString _ret = self->string(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QTextBoundaryFinder_ToStart(QTextBoundaryFinder* self) { diff --git a/qt/gen_qtextboundaryfinder.go b/qt/gen_qtextboundaryfinder.go index 64fe0e18..081f5410 100644 --- a/qt/gen_qtextboundaryfinder.go +++ b/qt/gen_qtextboundaryfinder.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -77,9 +76,11 @@ func NewQTextBoundaryFinder2(other *QTextBoundaryFinder) *QTextBoundaryFinder { // NewQTextBoundaryFinder3 constructs a new QTextBoundaryFinder object. func NewQTextBoundaryFinder3(typeVal QTextBoundaryFinder__BoundaryType, stringVal string) *QTextBoundaryFinder { - stringVal_ms := libmiqt.Strdupg(stringVal) - defer C.free(stringVal_ms) - ret := C.QTextBoundaryFinder_new3((C.int)(typeVal), (*C.struct_miqt_string)(stringVal_ms)) + stringVal_ms := C.struct_miqt_string{} + stringVal_ms.data = C.CString(stringVal) + stringVal_ms.len = C.size_t(len(stringVal)) + defer C.free(unsafe.Pointer(stringVal_ms.data)) + ret := C.QTextBoundaryFinder_new3((C.int)(typeVal), stringVal_ms) return newQTextBoundaryFinder(ret) } @@ -114,9 +115,9 @@ func (this *QTextBoundaryFinder) Type() QTextBoundaryFinder__BoundaryType { } func (this *QTextBoundaryFinder) String() string { - var _ms *C.struct_miqt_string = C.QTextBoundaryFinder_String(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextBoundaryFinder_String(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qtextboundaryfinder.h b/qt/gen_qtextboundaryfinder.h index 0856de60..3c4106fb 100644 --- a/qt/gen_qtextboundaryfinder.h +++ b/qt/gen_qtextboundaryfinder.h @@ -23,14 +23,14 @@ typedef struct QTextBoundaryFinder QTextBoundaryFinder; QTextBoundaryFinder* QTextBoundaryFinder_new(); QTextBoundaryFinder* QTextBoundaryFinder_new2(QTextBoundaryFinder* other); -QTextBoundaryFinder* QTextBoundaryFinder_new3(int typeVal, struct miqt_string* stringVal); +QTextBoundaryFinder* QTextBoundaryFinder_new3(int typeVal, struct miqt_string stringVal); QTextBoundaryFinder* QTextBoundaryFinder_new4(int typeVal, QChar* chars, int length); QTextBoundaryFinder* QTextBoundaryFinder_new5(int typeVal, QChar* chars, int length, unsigned char* buffer); QTextBoundaryFinder* QTextBoundaryFinder_new6(int typeVal, QChar* chars, int length, unsigned char* buffer, int bufferSize); void QTextBoundaryFinder_OperatorAssign(QTextBoundaryFinder* self, QTextBoundaryFinder* other); bool QTextBoundaryFinder_IsValid(const QTextBoundaryFinder* self); int QTextBoundaryFinder_Type(const QTextBoundaryFinder* self); -struct miqt_string* QTextBoundaryFinder_String(const QTextBoundaryFinder* self); +struct miqt_string QTextBoundaryFinder_String(const QTextBoundaryFinder* self); void QTextBoundaryFinder_ToStart(QTextBoundaryFinder* self); void QTextBoundaryFinder_ToEnd(QTextBoundaryFinder* self); int QTextBoundaryFinder_Position(const QTextBoundaryFinder* self); diff --git a/qt/gen_qtextbrowser.cpp b/qt/gen_qtextbrowser.cpp index 4de88743..31369554 100644 --- a/qt/gen_qtextbrowser.cpp +++ b/qt/gen_qtextbrowser.cpp @@ -27,18 +27,26 @@ void* QTextBrowser_Metacast(QTextBrowser* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QTextBrowser_Tr(const char* s) { +struct miqt_string QTextBrowser_Tr(const char* s) { QString _ret = QTextBrowser::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTextBrowser_TrUtf8(const char* s) { +struct miqt_string QTextBrowser_TrUtf8(const char* s) { QString _ret = QTextBrowser::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QUrl* QTextBrowser_Source(const QTextBrowser* self) { @@ -53,12 +61,16 @@ int QTextBrowser_SourceType(const QTextBrowser* self) { struct miqt_array* QTextBrowser_SearchPaths(const QTextBrowser* self) { QStringList _ret = self->searchPaths(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -66,12 +78,12 @@ struct miqt_array* QTextBrowser_SearchPaths(const QTextBrowser* self) { return _out; } -void QTextBrowser_SetSearchPaths(QTextBrowser* self, struct miqt_array* /* of struct miqt_string* */ paths) { +void QTextBrowser_SetSearchPaths(QTextBrowser* self, struct miqt_array* /* of struct miqt_string */ paths) { QStringList paths_QList; paths_QList.reserve(paths->len); - struct miqt_string** paths_arr = static_cast(paths->data); + struct miqt_string* paths_arr = static_cast(paths->data); for(size_t i = 0; i < paths->len; ++i) { - QString paths_arr_i_QString = QString::fromUtf8(&paths_arr[i]->data, paths_arr[i]->len); + QString paths_arr_i_QString = QString::fromUtf8(paths_arr[i].data, paths_arr[i].len); paths_QList.push_back(paths_arr_i_QString); } self->setSearchPaths(paths_QList); @@ -93,11 +105,15 @@ void QTextBrowser_ClearHistory(QTextBrowser* self) { self->clearHistory(); } -struct miqt_string* QTextBrowser_HistoryTitle(const QTextBrowser* self, int param1) { +struct miqt_string QTextBrowser_HistoryTitle(const QTextBrowser* self, int param1) { QString _ret = self->historyTitle(static_cast(param1)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QUrl* QTextBrowser_HistoryUrl(const QTextBrowser* self, int param1) { @@ -210,8 +226,8 @@ void QTextBrowser_connect_Highlighted(QTextBrowser* self, intptr_t slot) { }); } -void QTextBrowser_HighlightedWithQString(QTextBrowser* self, struct miqt_string* param1) { - QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); +void QTextBrowser_HighlightedWithQString(QTextBrowser* self, struct miqt_string param1) { + QString param1_QString = QString::fromUtf8(param1.data, param1.len); self->highlighted(param1_QString); } @@ -220,7 +236,11 @@ void QTextBrowser_connect_HighlightedWithQString(QTextBrowser* self, intptr_t sl const QString param1_ret = param1; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray param1_b = param1_ret.toUtf8(); - struct miqt_string* sigval1 = miqt_strdup(param1_b.data(), param1_b.length()); + struct miqt_string param1_ms; + param1_ms.len = param1_b.length(); + param1_ms.data = static_cast(malloc(param1_ms.len)); + memcpy(param1_ms.data, param1_b.data(), param1_ms.len); + struct miqt_string sigval1 = param1_ms; miqt_exec_callback_QTextBrowser_HighlightedWithQString(slot, sigval1); }); } @@ -238,32 +258,48 @@ void QTextBrowser_connect_AnchorClicked(QTextBrowser* self, intptr_t slot) { }); } -struct miqt_string* QTextBrowser_Tr2(const char* s, const char* c) { +struct miqt_string QTextBrowser_Tr2(const char* s, const char* c) { QString _ret = QTextBrowser::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTextBrowser_Tr3(const char* s, const char* c, int n) { +struct miqt_string QTextBrowser_Tr3(const char* s, const char* c, int n) { QString _ret = QTextBrowser::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTextBrowser_TrUtf82(const char* s, const char* c) { +struct miqt_string QTextBrowser_TrUtf82(const char* s, const char* c) { QString _ret = QTextBrowser::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTextBrowser_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QTextBrowser_TrUtf83(const char* s, const char* c, int n) { QString _ret = QTextBrowser::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QTextBrowser_Delete(QTextBrowser* self) { diff --git a/qt/gen_qtextbrowser.go b/qt/gen_qtextbrowser.go index 7714a6e3..58c54d37 100644 --- a/qt/gen_qtextbrowser.go +++ b/qt/gen_qtextbrowser.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "runtime/cgo" "unsafe" @@ -64,24 +63,24 @@ func (this *QTextBrowser) MetaObject() *QMetaObject { func (this *QTextBrowser) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QTextBrowser_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QTextBrowser_Metacast(this.h, param1_Cstring)) } func QTextBrowser_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTextBrowser_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextBrowser_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QTextBrowser_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTextBrowser_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextBrowser_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -99,11 +98,11 @@ func (this *QTextBrowser) SourceType() QTextDocument__ResourceType { func (this *QTextBrowser) SearchPaths() []string { var _ma *C.struct_miqt_array = C.QTextBrowser_SearchPaths(this.h) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -112,12 +111,14 @@ func (this *QTextBrowser) SearchPaths() []string { func (this *QTextBrowser) SetSearchPaths(paths []string) { // For the C ABI, malloc a C array of raw pointers - paths_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(paths)))) + paths_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(paths)))) defer C.free(unsafe.Pointer(paths_CArray)) for i := range paths { - paths_i_ms := libmiqt.Strdupg(paths[i]) - defer C.free(paths_i_ms) - paths_CArray[i] = (*C.struct_miqt_string)(paths_i_ms) + paths_i_ms := C.struct_miqt_string{} + paths_i_ms.data = C.CString(paths[i]) + paths_i_ms.len = C.size_t(len(paths[i])) + defer C.free(unsafe.Pointer(paths_i_ms.data)) + paths_CArray[i] = paths_i_ms } paths_ma := &C.struct_miqt_array{len: C.size_t(len(paths)), data: unsafe.Pointer(paths_CArray)} defer runtime.KeepAlive(unsafe.Pointer(paths_ma)) @@ -144,9 +145,9 @@ func (this *QTextBrowser) ClearHistory() { } func (this *QTextBrowser) HistoryTitle(param1 int) string { - var _ms *C.struct_miqt_string = C.QTextBrowser_HistoryTitle(this.h, (C.int)(param1)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextBrowser_HistoryTitle(this.h, (C.int)(param1)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -303,25 +304,27 @@ func miqt_exec_callback_QTextBrowser_Highlighted(cb C.intptr_t, param1 *C.QUrl) } func (this *QTextBrowser) HighlightedWithQString(param1 string) { - param1_ms := libmiqt.Strdupg(param1) - defer C.free(param1_ms) - C.QTextBrowser_HighlightedWithQString(this.h, (*C.struct_miqt_string)(param1_ms)) + param1_ms := C.struct_miqt_string{} + param1_ms.data = C.CString(param1) + param1_ms.len = C.size_t(len(param1)) + defer C.free(unsafe.Pointer(param1_ms.data)) + C.QTextBrowser_HighlightedWithQString(this.h, param1_ms) } func (this *QTextBrowser) OnHighlightedWithQString(slot func(param1 string)) { C.QTextBrowser_connect_HighlightedWithQString(this.h, C.intptr_t(cgo.NewHandle(slot))) } //export miqt_exec_callback_QTextBrowser_HighlightedWithQString -func miqt_exec_callback_QTextBrowser_HighlightedWithQString(cb C.intptr_t, param1 *C.struct_miqt_string) { +func miqt_exec_callback_QTextBrowser_HighlightedWithQString(cb C.intptr_t, param1 C.struct_miqt_string) { gofunc, ok := cgo.Handle(cb).Value().(func(param1 string)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") } // Convert all CABI parameters to Go parameters - var param1_ms *C.struct_miqt_string = param1 - param1_ret := C.GoStringN(¶m1_ms.data, C.int(int64(param1_ms.len))) - C.free(unsafe.Pointer(param1_ms)) + var param1_ms C.struct_miqt_string = param1 + param1_ret := C.GoStringN(param1_ms.data, C.int(int64(param1_ms.len))) + C.free(unsafe.Pointer(param1_ms.data)) slotval1 := param1_ret gofunc(slotval1) @@ -352,9 +355,9 @@ func QTextBrowser_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTextBrowser_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextBrowser_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -363,9 +366,9 @@ func QTextBrowser_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTextBrowser_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextBrowser_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -374,9 +377,9 @@ func QTextBrowser_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTextBrowser_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextBrowser_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -385,9 +388,9 @@ func QTextBrowser_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTextBrowser_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextBrowser_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qtextbrowser.h b/qt/gen_qtextbrowser.h index 18bbdd8c..35debf8b 100644 --- a/qt/gen_qtextbrowser.h +++ b/qt/gen_qtextbrowser.h @@ -31,17 +31,17 @@ QTextBrowser* QTextBrowser_new(); QTextBrowser* QTextBrowser_new2(QWidget* parent); QMetaObject* QTextBrowser_MetaObject(const QTextBrowser* self); void* QTextBrowser_Metacast(QTextBrowser* self, const char* param1); -struct miqt_string* QTextBrowser_Tr(const char* s); -struct miqt_string* QTextBrowser_TrUtf8(const char* s); +struct miqt_string QTextBrowser_Tr(const char* s); +struct miqt_string QTextBrowser_TrUtf8(const char* s); QUrl* QTextBrowser_Source(const QTextBrowser* self); int QTextBrowser_SourceType(const QTextBrowser* self); struct miqt_array* QTextBrowser_SearchPaths(const QTextBrowser* self); -void QTextBrowser_SetSearchPaths(QTextBrowser* self, struct miqt_array* /* of struct miqt_string* */ paths); +void QTextBrowser_SetSearchPaths(QTextBrowser* self, struct miqt_array* /* of struct miqt_string */ paths); QVariant* QTextBrowser_LoadResource(QTextBrowser* self, int typeVal, QUrl* name); bool QTextBrowser_IsBackwardAvailable(const QTextBrowser* self); bool QTextBrowser_IsForwardAvailable(const QTextBrowser* self); void QTextBrowser_ClearHistory(QTextBrowser* self); -struct miqt_string* QTextBrowser_HistoryTitle(const QTextBrowser* self, int param1); +struct miqt_string QTextBrowser_HistoryTitle(const QTextBrowser* self, int param1); QUrl* QTextBrowser_HistoryUrl(const QTextBrowser* self, int param1); int QTextBrowser_BackwardHistoryCount(const QTextBrowser* self); int QTextBrowser_ForwardHistoryCount(const QTextBrowser* self); @@ -65,14 +65,14 @@ void QTextBrowser_SourceChanged(QTextBrowser* self, QUrl* param1); void QTextBrowser_connect_SourceChanged(QTextBrowser* self, intptr_t slot); void QTextBrowser_Highlighted(QTextBrowser* self, QUrl* param1); void QTextBrowser_connect_Highlighted(QTextBrowser* self, intptr_t slot); -void QTextBrowser_HighlightedWithQString(QTextBrowser* self, struct miqt_string* param1); +void QTextBrowser_HighlightedWithQString(QTextBrowser* self, struct miqt_string param1); void QTextBrowser_connect_HighlightedWithQString(QTextBrowser* self, intptr_t slot); void QTextBrowser_AnchorClicked(QTextBrowser* self, QUrl* param1); void QTextBrowser_connect_AnchorClicked(QTextBrowser* self, intptr_t slot); -struct miqt_string* QTextBrowser_Tr2(const char* s, const char* c); -struct miqt_string* QTextBrowser_Tr3(const char* s, const char* c, int n); -struct miqt_string* QTextBrowser_TrUtf82(const char* s, const char* c); -struct miqt_string* QTextBrowser_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QTextBrowser_Tr2(const char* s, const char* c); +struct miqt_string QTextBrowser_Tr3(const char* s, const char* c, int n); +struct miqt_string QTextBrowser_TrUtf82(const char* s, const char* c); +struct miqt_string QTextBrowser_TrUtf83(const char* s, const char* c, int n); void QTextBrowser_Delete(QTextBrowser* self); #ifdef __cplusplus diff --git a/qt/gen_qtextcodec.cpp b/qt/gen_qtextcodec.cpp index 46ec2aca..7f6e1164 100644 --- a/qt/gen_qtextcodec.cpp +++ b/qt/gen_qtextcodec.cpp @@ -12,8 +12,9 @@ #include "gen_qtextcodec.h" #include "_cgo_export.h" -QTextCodec* QTextCodec_CodecForName(QByteArray* name) { - return QTextCodec::codecForName(*name); +QTextCodec* QTextCodec_CodecForName(struct miqt_string name) { + QByteArray name_QByteArray(name.data, name.len); + return QTextCodec::codecForName(name_QByteArray); } QTextCodec* QTextCodec_CodecForNameWithName(const char* name) { @@ -27,9 +28,14 @@ QTextCodec* QTextCodec_CodecForMib(int mib) { struct miqt_array* QTextCodec_AvailableCodecs() { QList _ret = QTextCodec::availableCodecs(); // Convert QList<> from C++ memory to manually-managed C memory - QByteArray** _arr = static_cast(malloc(sizeof(QByteArray*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { - _arr[i] = new QByteArray(_ret[i]); + QByteArray _lv_qb = _ret[i]; + struct miqt_string _lv_ms; + _lv_ms.len = _lv_qb.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_qb.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -58,59 +64,86 @@ void QTextCodec_SetCodecForLocale(QTextCodec* c) { QTextCodec::setCodecForLocale(c); } -QTextCodec* QTextCodec_CodecForHtml(QByteArray* ba) { - return QTextCodec::codecForHtml(*ba); +QTextCodec* QTextCodec_CodecForHtml(struct miqt_string ba) { + QByteArray ba_QByteArray(ba.data, ba.len); + return QTextCodec::codecForHtml(ba_QByteArray); } -QTextCodec* QTextCodec_CodecForHtml2(QByteArray* ba, QTextCodec* defaultCodec) { - return QTextCodec::codecForHtml(*ba, defaultCodec); +QTextCodec* QTextCodec_CodecForHtml2(struct miqt_string ba, QTextCodec* defaultCodec) { + QByteArray ba_QByteArray(ba.data, ba.len); + return QTextCodec::codecForHtml(ba_QByteArray, defaultCodec); } -QTextCodec* QTextCodec_CodecForUtfText(QByteArray* ba) { - return QTextCodec::codecForUtfText(*ba); +QTextCodec* QTextCodec_CodecForUtfText(struct miqt_string ba) { + QByteArray ba_QByteArray(ba.data, ba.len); + return QTextCodec::codecForUtfText(ba_QByteArray); } -QTextCodec* QTextCodec_CodecForUtfText2(QByteArray* ba, QTextCodec* defaultCodec) { - return QTextCodec::codecForUtfText(*ba, defaultCodec); +QTextCodec* QTextCodec_CodecForUtfText2(struct miqt_string ba, QTextCodec* defaultCodec) { + QByteArray ba_QByteArray(ba.data, ba.len); + return QTextCodec::codecForUtfText(ba_QByteArray, defaultCodec); } bool QTextCodec_CanEncode(const QTextCodec* self, QChar* param1) { return self->canEncode(*param1); } -bool QTextCodec_CanEncodeWithQString(const QTextCodec* self, struct miqt_string* param1) { - QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); +bool QTextCodec_CanEncodeWithQString(const QTextCodec* self, struct miqt_string param1) { + QString param1_QString = QString::fromUtf8(param1.data, param1.len); return self->canEncode(param1_QString); } -struct miqt_string* QTextCodec_ToUnicode(const QTextCodec* self, QByteArray* param1) { - QString _ret = self->toUnicode(*param1); +struct miqt_string QTextCodec_ToUnicode(const QTextCodec* self, struct miqt_string param1) { + QByteArray param1_QByteArray(param1.data, param1.len); + QString _ret = self->toUnicode(param1_QByteArray); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTextCodec_ToUnicodeWithChars(const QTextCodec* self, const char* chars) { +struct miqt_string QTextCodec_ToUnicodeWithChars(const QTextCodec* self, const char* chars) { QString _ret = self->toUnicode(chars); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -QByteArray* QTextCodec_FromUnicode(const QTextCodec* self, struct miqt_string* uc) { - QString uc_QString = QString::fromUtf8(&uc->data, uc->len); - return new QByteArray(self->fromUnicode(uc_QString)); +struct miqt_string QTextCodec_FromUnicode(const QTextCodec* self, struct miqt_string uc) { + QString uc_QString = QString::fromUtf8(uc.data, uc.len); + QByteArray _qb = self->fromUnicode(uc_QString); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } -struct miqt_string* QTextCodec_ToUnicode2(const QTextCodec* self, const char* in, int length) { +struct miqt_string QTextCodec_ToUnicode2(const QTextCodec* self, const char* in, int length) { QString _ret = self->toUnicode(in, static_cast(length)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -QByteArray* QTextCodec_FromUnicode2(const QTextCodec* self, QChar* in, int length) { - return new QByteArray(self->fromUnicode(in, static_cast(length))); +struct miqt_string QTextCodec_FromUnicode2(const QTextCodec* self, QChar* in, int length) { + QByteArray _qb = self->fromUnicode(in, static_cast(length)); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } QTextDecoder* QTextCodec_MakeDecoder(const QTextCodec* self) { @@ -121,16 +154,26 @@ QTextEncoder* QTextCodec_MakeEncoder(const QTextCodec* self) { return self->makeEncoder(); } -QByteArray* QTextCodec_Name(const QTextCodec* self) { - return new QByteArray(self->name()); +struct miqt_string QTextCodec_Name(const QTextCodec* self) { + QByteArray _qb = self->name(); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } struct miqt_array* QTextCodec_Aliases(const QTextCodec* self) { QList _ret = self->aliases(); // Convert QList<> from C++ memory to manually-managed C memory - QByteArray** _arr = static_cast(malloc(sizeof(QByteArray*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { - _arr[i] = new QByteArray(_ret[i]); + QByteArray _lv_qb = _ret[i]; + struct miqt_string _lv_ms; + _lv_ms.len = _lv_qb.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_qb.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -142,15 +185,24 @@ int QTextCodec_MibEnum(const QTextCodec* self) { return self->mibEnum(); } -struct miqt_string* QTextCodec_ToUnicode3(const QTextCodec* self, const char* in, int length, QTextCodec__ConverterState* state) { +struct miqt_string QTextCodec_ToUnicode3(const QTextCodec* self, const char* in, int length, QTextCodec__ConverterState* state) { QString _ret = self->toUnicode(in, static_cast(length), state); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -QByteArray* QTextCodec_FromUnicode3(const QTextCodec* self, QChar* in, int length, QTextCodec__ConverterState* state) { - return new QByteArray(self->fromUnicode(in, static_cast(length), state)); +struct miqt_string QTextCodec_FromUnicode3(const QTextCodec* self, QChar* in, int length, QTextCodec__ConverterState* state) { + QByteArray _qb = self->fromUnicode(in, static_cast(length), state); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } QTextDecoder* QTextCodec_MakeDecoder1(const QTextCodec* self, int flags) { @@ -169,13 +221,23 @@ QTextEncoder* QTextEncoder_new2(QTextCodec* codec, int flags) { return new QTextEncoder(codec, static_cast(flags)); } -QByteArray* QTextEncoder_FromUnicode(QTextEncoder* self, struct miqt_string* str) { - QString str_QString = QString::fromUtf8(&str->data, str->len); - return new QByteArray(self->fromUnicode(str_QString)); +struct miqt_string QTextEncoder_FromUnicode(QTextEncoder* self, struct miqt_string str) { + QString str_QString = QString::fromUtf8(str.data, str.len); + QByteArray _qb = self->fromUnicode(str_QString); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } -QByteArray* QTextEncoder_FromUnicode2(QTextEncoder* self, QChar* uc, int lenVal) { - return new QByteArray(self->fromUnicode(uc, static_cast(lenVal))); +struct miqt_string QTextEncoder_FromUnicode2(QTextEncoder* self, QChar* uc, int lenVal) { + QByteArray _qb = self->fromUnicode(uc, static_cast(lenVal)); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } bool QTextEncoder_HasFailure(const QTextEncoder* self) { @@ -194,18 +256,27 @@ QTextDecoder* QTextDecoder_new2(QTextCodec* codec, int flags) { return new QTextDecoder(codec, static_cast(flags)); } -struct miqt_string* QTextDecoder_ToUnicode(QTextDecoder* self, const char* chars, int lenVal) { +struct miqt_string QTextDecoder_ToUnicode(QTextDecoder* self, const char* chars, int lenVal) { QString _ret = self->toUnicode(chars, static_cast(lenVal)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTextDecoder_ToUnicodeWithBa(QTextDecoder* self, QByteArray* ba) { - QString _ret = self->toUnicode(*ba); +struct miqt_string QTextDecoder_ToUnicodeWithBa(QTextDecoder* self, struct miqt_string ba) { + QByteArray ba_QByteArray(ba.data, ba.len); + QString _ret = self->toUnicode(ba_QByteArray); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } bool QTextDecoder_HasFailure(const QTextDecoder* self) { diff --git a/qt/gen_qtextcodec.go b/qt/gen_qtextcodec.go index 6e4e7b70..df5e3882 100644 --- a/qt/gen_qtextcodec.go +++ b/qt/gen_qtextcodec.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -52,8 +51,11 @@ func UnsafeNewQTextCodec(h unsafe.Pointer) *QTextCodec { return newQTextCodec((*C.QTextCodec)(h)) } -func QTextCodec_CodecForName(name *QByteArray) *QTextCodec { - return UnsafeNewQTextCodec(unsafe.Pointer(C.QTextCodec_CodecForName(name.cPointer()))) +func QTextCodec_CodecForName(name []byte) *QTextCodec { + name_alias := C.struct_miqt_string{} + name_alias.data = (*C.char)(unsafe.Pointer(&name[0])) + name_alias.len = C.size_t(len(name)) + return UnsafeNewQTextCodec(unsafe.Pointer(C.QTextCodec_CodecForName(name_alias))) } func QTextCodec_CodecForNameWithName(name string) *QTextCodec { @@ -66,15 +68,15 @@ func QTextCodec_CodecForMib(mib int) *QTextCodec { return UnsafeNewQTextCodec(unsafe.Pointer(C.QTextCodec_CodecForMib((C.int)(mib)))) } -func QTextCodec_AvailableCodecs() []QByteArray { +func QTextCodec_AvailableCodecs() [][]byte { var _ma *C.struct_miqt_array = C.QTextCodec_AvailableCodecs() - _ret := make([]QByteArray, int(_ma.len)) - _outCast := (*[0xffff]*C.QByteArray)(unsafe.Pointer(_ma.data)) // hey ya + _ret := make([][]byte, int(_ma.len)) + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - _lv_ret := _outCast[i] - _lv_goptr := newQByteArray(_lv_ret) - _lv_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - _ret[i] = *_lv_goptr + var _lv_bytearray C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoBytes(unsafe.Pointer(_lv_bytearray.data), C.int(int64(_lv_bytearray.len))) + C.free(unsafe.Pointer(_lv_bytearray.data)) + _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) return _ret @@ -99,20 +101,32 @@ func QTextCodec_SetCodecForLocale(c *QTextCodec) { C.QTextCodec_SetCodecForLocale(c.cPointer()) } -func QTextCodec_CodecForHtml(ba *QByteArray) *QTextCodec { - return UnsafeNewQTextCodec(unsafe.Pointer(C.QTextCodec_CodecForHtml(ba.cPointer()))) +func QTextCodec_CodecForHtml(ba []byte) *QTextCodec { + ba_alias := C.struct_miqt_string{} + ba_alias.data = (*C.char)(unsafe.Pointer(&ba[0])) + ba_alias.len = C.size_t(len(ba)) + return UnsafeNewQTextCodec(unsafe.Pointer(C.QTextCodec_CodecForHtml(ba_alias))) } -func QTextCodec_CodecForHtml2(ba *QByteArray, defaultCodec *QTextCodec) *QTextCodec { - return UnsafeNewQTextCodec(unsafe.Pointer(C.QTextCodec_CodecForHtml2(ba.cPointer(), defaultCodec.cPointer()))) +func QTextCodec_CodecForHtml2(ba []byte, defaultCodec *QTextCodec) *QTextCodec { + ba_alias := C.struct_miqt_string{} + ba_alias.data = (*C.char)(unsafe.Pointer(&ba[0])) + ba_alias.len = C.size_t(len(ba)) + return UnsafeNewQTextCodec(unsafe.Pointer(C.QTextCodec_CodecForHtml2(ba_alias, defaultCodec.cPointer()))) } -func QTextCodec_CodecForUtfText(ba *QByteArray) *QTextCodec { - return UnsafeNewQTextCodec(unsafe.Pointer(C.QTextCodec_CodecForUtfText(ba.cPointer()))) +func QTextCodec_CodecForUtfText(ba []byte) *QTextCodec { + ba_alias := C.struct_miqt_string{} + ba_alias.data = (*C.char)(unsafe.Pointer(&ba[0])) + ba_alias.len = C.size_t(len(ba)) + return UnsafeNewQTextCodec(unsafe.Pointer(C.QTextCodec_CodecForUtfText(ba_alias))) } -func QTextCodec_CodecForUtfText2(ba *QByteArray, defaultCodec *QTextCodec) *QTextCodec { - return UnsafeNewQTextCodec(unsafe.Pointer(C.QTextCodec_CodecForUtfText2(ba.cPointer(), defaultCodec.cPointer()))) +func QTextCodec_CodecForUtfText2(ba []byte, defaultCodec *QTextCodec) *QTextCodec { + ba_alias := C.struct_miqt_string{} + ba_alias.data = (*C.char)(unsafe.Pointer(&ba[0])) + ba_alias.len = C.size_t(len(ba)) + return UnsafeNewQTextCodec(unsafe.Pointer(C.QTextCodec_CodecForUtfText2(ba_alias, defaultCodec.cPointer()))) } func (this *QTextCodec) CanEncode(param1 QChar) bool { @@ -120,50 +134,57 @@ func (this *QTextCodec) CanEncode(param1 QChar) bool { } func (this *QTextCodec) CanEncodeWithQString(param1 string) bool { - param1_ms := libmiqt.Strdupg(param1) - defer C.free(param1_ms) - return (bool)(C.QTextCodec_CanEncodeWithQString(this.h, (*C.struct_miqt_string)(param1_ms))) + param1_ms := C.struct_miqt_string{} + param1_ms.data = C.CString(param1) + param1_ms.len = C.size_t(len(param1)) + defer C.free(unsafe.Pointer(param1_ms.data)) + return (bool)(C.QTextCodec_CanEncodeWithQString(this.h, param1_ms)) } -func (this *QTextCodec) ToUnicode(param1 *QByteArray) string { - var _ms *C.struct_miqt_string = C.QTextCodec_ToUnicode(this.h, param1.cPointer()) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) +func (this *QTextCodec) ToUnicode(param1 []byte) string { + param1_alias := C.struct_miqt_string{} + param1_alias.data = (*C.char)(unsafe.Pointer(¶m1[0])) + param1_alias.len = C.size_t(len(param1)) + var _ms C.struct_miqt_string = C.QTextCodec_ToUnicode(this.h, param1_alias) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QTextCodec) ToUnicodeWithChars(chars string) string { chars_Cstring := C.CString(chars) defer C.free(unsafe.Pointer(chars_Cstring)) - var _ms *C.struct_miqt_string = C.QTextCodec_ToUnicodeWithChars(this.h, chars_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextCodec_ToUnicodeWithChars(this.h, chars_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } -func (this *QTextCodec) FromUnicode(uc string) *QByteArray { - uc_ms := libmiqt.Strdupg(uc) - defer C.free(uc_ms) - _ret := C.QTextCodec_FromUnicode(this.h, (*C.struct_miqt_string)(uc_ms)) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QTextCodec) FromUnicode(uc string) []byte { + uc_ms := C.struct_miqt_string{} + uc_ms.data = C.CString(uc) + uc_ms.len = C.size_t(len(uc)) + defer C.free(unsafe.Pointer(uc_ms.data)) + var _bytearray C.struct_miqt_string = C.QTextCodec_FromUnicode(this.h, uc_ms) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } func (this *QTextCodec) ToUnicode2(in string, length int) string { in_Cstring := C.CString(in) defer C.free(unsafe.Pointer(in_Cstring)) - var _ms *C.struct_miqt_string = C.QTextCodec_ToUnicode2(this.h, in_Cstring, (C.int)(length)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextCodec_ToUnicode2(this.h, in_Cstring, (C.int)(length)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } -func (this *QTextCodec) FromUnicode2(in *QChar, length int) *QByteArray { - _ret := C.QTextCodec_FromUnicode2(this.h, in.cPointer(), (C.int)(length)) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QTextCodec) FromUnicode2(in *QChar, length int) []byte { + var _bytearray C.struct_miqt_string = C.QTextCodec_FromUnicode2(this.h, in.cPointer(), (C.int)(length)) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } func (this *QTextCodec) MakeDecoder() *QTextDecoder { @@ -174,22 +195,22 @@ func (this *QTextCodec) MakeEncoder() *QTextEncoder { return UnsafeNewQTextEncoder(unsafe.Pointer(C.QTextCodec_MakeEncoder(this.h))) } -func (this *QTextCodec) Name() *QByteArray { - _ret := C.QTextCodec_Name(this.h) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QTextCodec) Name() []byte { + var _bytearray C.struct_miqt_string = C.QTextCodec_Name(this.h) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } -func (this *QTextCodec) Aliases() []QByteArray { +func (this *QTextCodec) Aliases() [][]byte { var _ma *C.struct_miqt_array = C.QTextCodec_Aliases(this.h) - _ret := make([]QByteArray, int(_ma.len)) - _outCast := (*[0xffff]*C.QByteArray)(unsafe.Pointer(_ma.data)) // hey ya + _ret := make([][]byte, int(_ma.len)) + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - _lv_ret := _outCast[i] - _lv_goptr := newQByteArray(_lv_ret) - _lv_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - _ret[i] = *_lv_goptr + var _lv_bytearray C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoBytes(unsafe.Pointer(_lv_bytearray.data), C.int(int64(_lv_bytearray.len))) + C.free(unsafe.Pointer(_lv_bytearray.data)) + _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) return _ret @@ -202,17 +223,17 @@ func (this *QTextCodec) MibEnum() int { func (this *QTextCodec) ToUnicode3(in string, length int, state *QTextCodec__ConverterState) string { in_Cstring := C.CString(in) defer C.free(unsafe.Pointer(in_Cstring)) - var _ms *C.struct_miqt_string = C.QTextCodec_ToUnicode3(this.h, in_Cstring, (C.int)(length), state.cPointer()) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextCodec_ToUnicode3(this.h, in_Cstring, (C.int)(length), state.cPointer()) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } -func (this *QTextCodec) FromUnicode3(in *QChar, length int, state *QTextCodec__ConverterState) *QByteArray { - _ret := C.QTextCodec_FromUnicode3(this.h, in.cPointer(), (C.int)(length), state.cPointer()) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QTextCodec) FromUnicode3(in *QChar, length int, state *QTextCodec__ConverterState) []byte { + var _bytearray C.struct_miqt_string = C.QTextCodec_FromUnicode3(this.h, in.cPointer(), (C.int)(length), state.cPointer()) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } func (this *QTextCodec) MakeDecoder1(flags QTextCodec__ConversionFlag) *QTextDecoder { @@ -264,20 +285,22 @@ func NewQTextEncoder2(codec *QTextCodec, flags QTextCodec__ConversionFlag) *QTex return newQTextEncoder(ret) } -func (this *QTextEncoder) FromUnicode(str string) *QByteArray { - str_ms := libmiqt.Strdupg(str) - defer C.free(str_ms) - _ret := C.QTextEncoder_FromUnicode(this.h, (*C.struct_miqt_string)(str_ms)) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QTextEncoder) FromUnicode(str string) []byte { + str_ms := C.struct_miqt_string{} + str_ms.data = C.CString(str) + str_ms.len = C.size_t(len(str)) + defer C.free(unsafe.Pointer(str_ms.data)) + var _bytearray C.struct_miqt_string = C.QTextEncoder_FromUnicode(this.h, str_ms) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } -func (this *QTextEncoder) FromUnicode2(uc *QChar, lenVal int) *QByteArray { - _ret := C.QTextEncoder_FromUnicode2(this.h, uc.cPointer(), (C.int)(lenVal)) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QTextEncoder) FromUnicode2(uc *QChar, lenVal int) []byte { + var _bytearray C.struct_miqt_string = C.QTextEncoder_FromUnicode2(this.h, uc.cPointer(), (C.int)(lenVal)) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } func (this *QTextEncoder) HasFailure() bool { @@ -342,16 +365,19 @@ func NewQTextDecoder2(codec *QTextCodec, flags QTextCodec__ConversionFlag) *QTex func (this *QTextDecoder) ToUnicode(chars string, lenVal int) string { chars_Cstring := C.CString(chars) defer C.free(unsafe.Pointer(chars_Cstring)) - var _ms *C.struct_miqt_string = C.QTextDecoder_ToUnicode(this.h, chars_Cstring, (C.int)(lenVal)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextDecoder_ToUnicode(this.h, chars_Cstring, (C.int)(lenVal)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } -func (this *QTextDecoder) ToUnicodeWithBa(ba *QByteArray) string { - var _ms *C.struct_miqt_string = C.QTextDecoder_ToUnicodeWithBa(this.h, ba.cPointer()) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) +func (this *QTextDecoder) ToUnicodeWithBa(ba []byte) string { + ba_alias := C.struct_miqt_string{} + ba_alias.data = (*C.char)(unsafe.Pointer(&ba[0])) + ba_alias.len = C.size_t(len(ba)) + var _ms C.struct_miqt_string = C.QTextDecoder_ToUnicodeWithBa(this.h, ba_alias) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qtextcodec.h b/qt/gen_qtextcodec.h index d7e0431f..e5cea3c7 100644 --- a/qt/gen_qtextcodec.h +++ b/qt/gen_qtextcodec.h @@ -33,45 +33,45 @@ typedef struct QTextDecoder QTextDecoder; typedef struct QTextEncoder QTextEncoder; #endif -QTextCodec* QTextCodec_CodecForName(QByteArray* name); +QTextCodec* QTextCodec_CodecForName(struct miqt_string name); QTextCodec* QTextCodec_CodecForNameWithName(const char* name); QTextCodec* QTextCodec_CodecForMib(int mib); struct miqt_array* QTextCodec_AvailableCodecs(); struct miqt_array* QTextCodec_AvailableMibs(); QTextCodec* QTextCodec_CodecForLocale(); void QTextCodec_SetCodecForLocale(QTextCodec* c); -QTextCodec* QTextCodec_CodecForHtml(QByteArray* ba); -QTextCodec* QTextCodec_CodecForHtml2(QByteArray* ba, QTextCodec* defaultCodec); -QTextCodec* QTextCodec_CodecForUtfText(QByteArray* ba); -QTextCodec* QTextCodec_CodecForUtfText2(QByteArray* ba, QTextCodec* defaultCodec); +QTextCodec* QTextCodec_CodecForHtml(struct miqt_string ba); +QTextCodec* QTextCodec_CodecForHtml2(struct miqt_string ba, QTextCodec* defaultCodec); +QTextCodec* QTextCodec_CodecForUtfText(struct miqt_string ba); +QTextCodec* QTextCodec_CodecForUtfText2(struct miqt_string ba, QTextCodec* defaultCodec); bool QTextCodec_CanEncode(const QTextCodec* self, QChar* param1); -bool QTextCodec_CanEncodeWithQString(const QTextCodec* self, struct miqt_string* param1); -struct miqt_string* QTextCodec_ToUnicode(const QTextCodec* self, QByteArray* param1); -struct miqt_string* QTextCodec_ToUnicodeWithChars(const QTextCodec* self, const char* chars); -QByteArray* QTextCodec_FromUnicode(const QTextCodec* self, struct miqt_string* uc); -struct miqt_string* QTextCodec_ToUnicode2(const QTextCodec* self, const char* in, int length); -QByteArray* QTextCodec_FromUnicode2(const QTextCodec* self, QChar* in, int length); +bool QTextCodec_CanEncodeWithQString(const QTextCodec* self, struct miqt_string param1); +struct miqt_string QTextCodec_ToUnicode(const QTextCodec* self, struct miqt_string param1); +struct miqt_string QTextCodec_ToUnicodeWithChars(const QTextCodec* self, const char* chars); +struct miqt_string QTextCodec_FromUnicode(const QTextCodec* self, struct miqt_string uc); +struct miqt_string QTextCodec_ToUnicode2(const QTextCodec* self, const char* in, int length); +struct miqt_string QTextCodec_FromUnicode2(const QTextCodec* self, QChar* in, int length); QTextDecoder* QTextCodec_MakeDecoder(const QTextCodec* self); QTextEncoder* QTextCodec_MakeEncoder(const QTextCodec* self); -QByteArray* QTextCodec_Name(const QTextCodec* self); +struct miqt_string QTextCodec_Name(const QTextCodec* self); struct miqt_array* QTextCodec_Aliases(const QTextCodec* self); int QTextCodec_MibEnum(const QTextCodec* self); -struct miqt_string* QTextCodec_ToUnicode3(const QTextCodec* self, const char* in, int length, QTextCodec__ConverterState* state); -QByteArray* QTextCodec_FromUnicode3(const QTextCodec* self, QChar* in, int length, QTextCodec__ConverterState* state); +struct miqt_string QTextCodec_ToUnicode3(const QTextCodec* self, const char* in, int length, QTextCodec__ConverterState* state); +struct miqt_string QTextCodec_FromUnicode3(const QTextCodec* self, QChar* in, int length, QTextCodec__ConverterState* state); QTextDecoder* QTextCodec_MakeDecoder1(const QTextCodec* self, int flags); QTextEncoder* QTextCodec_MakeEncoder1(const QTextCodec* self, int flags); QTextEncoder* QTextEncoder_new(QTextCodec* codec); QTextEncoder* QTextEncoder_new2(QTextCodec* codec, int flags); -QByteArray* QTextEncoder_FromUnicode(QTextEncoder* self, struct miqt_string* str); -QByteArray* QTextEncoder_FromUnicode2(QTextEncoder* self, QChar* uc, int lenVal); +struct miqt_string QTextEncoder_FromUnicode(QTextEncoder* self, struct miqt_string str); +struct miqt_string QTextEncoder_FromUnicode2(QTextEncoder* self, QChar* uc, int lenVal); bool QTextEncoder_HasFailure(const QTextEncoder* self); void QTextEncoder_Delete(QTextEncoder* self); QTextDecoder* QTextDecoder_new(QTextCodec* codec); QTextDecoder* QTextDecoder_new2(QTextCodec* codec, int flags); -struct miqt_string* QTextDecoder_ToUnicode(QTextDecoder* self, const char* chars, int lenVal); -struct miqt_string* QTextDecoder_ToUnicodeWithBa(QTextDecoder* self, QByteArray* ba); +struct miqt_string QTextDecoder_ToUnicode(QTextDecoder* self, const char* chars, int lenVal); +struct miqt_string QTextDecoder_ToUnicodeWithBa(QTextDecoder* self, struct miqt_string ba); bool QTextDecoder_HasFailure(const QTextDecoder* self); bool QTextDecoder_NeedsMoreData(const QTextDecoder* self); void QTextDecoder_Delete(QTextDecoder* self); diff --git a/qt/gen_qtextcursor.cpp b/qt/gen_qtextcursor.cpp index 48b3a8b1..8e9f05b0 100644 --- a/qt/gen_qtextcursor.cpp +++ b/qt/gen_qtextcursor.cpp @@ -67,13 +67,13 @@ int QTextCursor_Anchor(const QTextCursor* self) { return self->anchor(); } -void QTextCursor_InsertText(QTextCursor* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QTextCursor_InsertText(QTextCursor* self, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->insertText(text_QString); } -void QTextCursor_InsertText2(QTextCursor* self, struct miqt_string* text, QTextCharFormat* format) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QTextCursor_InsertText2(QTextCursor* self, struct miqt_string text, QTextCharFormat* format) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->insertText(text_QString, *format); } @@ -141,11 +141,15 @@ int QTextCursor_SelectionEnd(const QTextCursor* self) { return self->selectionEnd(); } -struct miqt_string* QTextCursor_SelectedText(const QTextCursor* self) { +struct miqt_string QTextCursor_SelectedText(const QTextCursor* self) { QString _ret = self->selectedText(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QTextDocumentFragment* QTextCursor_Selection(const QTextCursor* self) { @@ -268,8 +272,8 @@ void QTextCursor_InsertFragment(QTextCursor* self, QTextDocumentFragment* fragme self->insertFragment(*fragment); } -void QTextCursor_InsertHtml(QTextCursor* self, struct miqt_string* html) { - QString html_QString = QString::fromUtf8(&html->data, html->len); +void QTextCursor_InsertHtml(QTextCursor* self, struct miqt_string html) { + QString html_QString = QString::fromUtf8(html.data, html.len); self->insertHtml(html_QString); } @@ -281,8 +285,8 @@ void QTextCursor_InsertImageWithFormat(QTextCursor* self, QTextImageFormat* form self->insertImage(*format); } -void QTextCursor_InsertImageWithName(QTextCursor* self, struct miqt_string* name) { - QString name_QString = QString::fromUtf8(&name->data, name->len); +void QTextCursor_InsertImageWithName(QTextCursor* self, struct miqt_string name) { + QString name_QString = QString::fromUtf8(name.data, name.len); self->insertImage(name_QString); } @@ -354,8 +358,8 @@ bool QTextCursor_MovePosition3(QTextCursor* self, int op, int param2, int n) { return self->movePosition(static_cast(op), static_cast(param2), static_cast(n)); } -void QTextCursor_InsertImage2(QTextCursor* self, QImage* image, struct miqt_string* name) { - QString name_QString = QString::fromUtf8(&name->data, name->len); +void QTextCursor_InsertImage2(QTextCursor* self, QImage* image, struct miqt_string name) { + QString name_QString = QString::fromUtf8(name.data, name.len); self->insertImage(*image, name_QString); } diff --git a/qt/gen_qtextcursor.go b/qt/gen_qtextcursor.go index 08c8915b..6d24914f 100644 --- a/qt/gen_qtextcursor.go +++ b/qt/gen_qtextcursor.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -148,15 +147,19 @@ func (this *QTextCursor) Anchor() int { } func (this *QTextCursor) InsertText(text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QTextCursor_InsertText(this.h, (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QTextCursor_InsertText(this.h, text_ms) } func (this *QTextCursor) InsertText2(text string, format *QTextCharFormat) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QTextCursor_InsertText2(this.h, (*C.struct_miqt_string)(text_ms), format.cPointer()) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QTextCursor_InsertText2(this.h, text_ms, format.cPointer()) } func (this *QTextCursor) MovePosition(op QTextCursor__MoveOperation) bool { @@ -224,9 +227,9 @@ func (this *QTextCursor) SelectionEnd() int { } func (this *QTextCursor) SelectedText() string { - var _ms *C.struct_miqt_string = C.QTextCursor_SelectedText(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextCursor_SelectedText(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -366,9 +369,11 @@ func (this *QTextCursor) InsertFragment(fragment *QTextDocumentFragment) { } func (this *QTextCursor) InsertHtml(html string) { - html_ms := libmiqt.Strdupg(html) - defer C.free(html_ms) - C.QTextCursor_InsertHtml(this.h, (*C.struct_miqt_string)(html_ms)) + html_ms := C.struct_miqt_string{} + html_ms.data = C.CString(html) + html_ms.len = C.size_t(len(html)) + defer C.free(unsafe.Pointer(html_ms.data)) + C.QTextCursor_InsertHtml(this.h, html_ms) } func (this *QTextCursor) InsertImage(format *QTextImageFormat, alignment QTextFrameFormat__Position) { @@ -380,9 +385,11 @@ func (this *QTextCursor) InsertImageWithFormat(format *QTextImageFormat) { } func (this *QTextCursor) InsertImageWithName(name string) { - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - C.QTextCursor_InsertImageWithName(this.h, (*C.struct_miqt_string)(name_ms)) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + C.QTextCursor_InsertImageWithName(this.h, name_ms) } func (this *QTextCursor) InsertImageWithImage(image *QImage) { @@ -454,9 +461,11 @@ func (this *QTextCursor) MovePosition3(op QTextCursor__MoveOperation, param2 QTe } func (this *QTextCursor) InsertImage2(image *QImage, name string) { - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - C.QTextCursor_InsertImage2(this.h, image.cPointer(), (*C.struct_miqt_string)(name_ms)) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + C.QTextCursor_InsertImage2(this.h, image.cPointer(), name_ms) } // Delete this object from C++ memory. diff --git a/qt/gen_qtextcursor.h b/qt/gen_qtextcursor.h index 408ff664..17cc8d1b 100644 --- a/qt/gen_qtextcursor.h +++ b/qt/gen_qtextcursor.h @@ -57,8 +57,8 @@ void QTextCursor_SetPosition(QTextCursor* self, int pos); int QTextCursor_Position(const QTextCursor* self); int QTextCursor_PositionInBlock(const QTextCursor* self); int QTextCursor_Anchor(const QTextCursor* self); -void QTextCursor_InsertText(QTextCursor* self, struct miqt_string* text); -void QTextCursor_InsertText2(QTextCursor* self, struct miqt_string* text, QTextCharFormat* format); +void QTextCursor_InsertText(QTextCursor* self, struct miqt_string text); +void QTextCursor_InsertText2(QTextCursor* self, struct miqt_string text, QTextCharFormat* format); bool QTextCursor_MovePosition(QTextCursor* self, int op); bool QTextCursor_VisualNavigation(const QTextCursor* self); void QTextCursor_SetVisualNavigation(QTextCursor* self, bool b); @@ -75,7 +75,7 @@ void QTextCursor_RemoveSelectedText(QTextCursor* self); void QTextCursor_ClearSelection(QTextCursor* self); int QTextCursor_SelectionStart(const QTextCursor* self); int QTextCursor_SelectionEnd(const QTextCursor* self); -struct miqt_string* QTextCursor_SelectedText(const QTextCursor* self); +struct miqt_string QTextCursor_SelectedText(const QTextCursor* self); QTextDocumentFragment* QTextCursor_Selection(const QTextCursor* self); void QTextCursor_SelectedTableCells(const QTextCursor* self, int* firstRow, int* numRows, int* firstColumn, int* numColumns); QTextBlock* QTextCursor_Block(const QTextCursor* self); @@ -106,10 +106,10 @@ QTextTable* QTextCursor_CurrentTable(const QTextCursor* self); QTextFrame* QTextCursor_InsertFrame(QTextCursor* self, QTextFrameFormat* format); QTextFrame* QTextCursor_CurrentFrame(const QTextCursor* self); void QTextCursor_InsertFragment(QTextCursor* self, QTextDocumentFragment* fragment); -void QTextCursor_InsertHtml(QTextCursor* self, struct miqt_string* html); +void QTextCursor_InsertHtml(QTextCursor* self, struct miqt_string html); void QTextCursor_InsertImage(QTextCursor* self, QTextImageFormat* format, int alignment); void QTextCursor_InsertImageWithFormat(QTextCursor* self, QTextImageFormat* format); -void QTextCursor_InsertImageWithName(QTextCursor* self, struct miqt_string* name); +void QTextCursor_InsertImageWithName(QTextCursor* self, struct miqt_string name); void QTextCursor_InsertImageWithImage(QTextCursor* self, QImage* image); void QTextCursor_BeginEditBlock(QTextCursor* self); void QTextCursor_JoinPreviousEditBlock(QTextCursor* self); @@ -127,7 +127,7 @@ QTextDocument* QTextCursor_Document(const QTextCursor* self); void QTextCursor_SetPosition2(QTextCursor* self, int pos, int mode); bool QTextCursor_MovePosition2(QTextCursor* self, int op, int param2); bool QTextCursor_MovePosition3(QTextCursor* self, int op, int param2, int n); -void QTextCursor_InsertImage2(QTextCursor* self, QImage* image, struct miqt_string* name); +void QTextCursor_InsertImage2(QTextCursor* self, QImage* image, struct miqt_string name); void QTextCursor_Delete(QTextCursor* self); #ifdef __cplusplus diff --git a/qt/gen_qtextdocument.cpp b/qt/gen_qtextdocument.cpp index aed279c4..36840b4b 100644 --- a/qt/gen_qtextdocument.cpp +++ b/qt/gen_qtextdocument.cpp @@ -48,8 +48,8 @@ QTextDocument* QTextDocument_new() { return new QTextDocument(); } -QTextDocument* QTextDocument_new2(struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QTextDocument* QTextDocument_new2(struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QTextDocument(text_QString); } @@ -57,8 +57,8 @@ QTextDocument* QTextDocument_new3(QObject* parent) { return new QTextDocument(parent); } -QTextDocument* QTextDocument_new4(struct miqt_string* text, QObject* parent) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QTextDocument* QTextDocument_new4(struct miqt_string text, QObject* parent) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QTextDocument(text_QString, parent); } @@ -70,18 +70,26 @@ void* QTextDocument_Metacast(QTextDocument* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QTextDocument_Tr(const char* s) { +struct miqt_string QTextDocument_Tr(const char* s) { QString _ret = QTextDocument::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTextDocument_TrUtf8(const char* s) { +struct miqt_string QTextDocument_TrUtf8(const char* s) { QString _ret = QTextDocument::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QTextDocument* QTextDocument_Clone(const QTextDocument* self) { @@ -132,58 +140,78 @@ QAbstractTextDocumentLayout* QTextDocument_DocumentLayout(const QTextDocument* s return self->documentLayout(); } -void QTextDocument_SetMetaInformation(QTextDocument* self, int info, struct miqt_string* param2) { - QString param2_QString = QString::fromUtf8(¶m2->data, param2->len); +void QTextDocument_SetMetaInformation(QTextDocument* self, int info, struct miqt_string param2) { + QString param2_QString = QString::fromUtf8(param2.data, param2.len); self->setMetaInformation(static_cast(info), param2_QString); } -struct miqt_string* QTextDocument_MetaInformation(const QTextDocument* self, int info) { +struct miqt_string QTextDocument_MetaInformation(const QTextDocument* self, int info) { QString _ret = self->metaInformation(static_cast(info)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTextDocument_ToHtml(const QTextDocument* self) { +struct miqt_string QTextDocument_ToHtml(const QTextDocument* self) { QString _ret = self->toHtml(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QTextDocument_SetHtml(QTextDocument* self, struct miqt_string* html) { - QString html_QString = QString::fromUtf8(&html->data, html->len); +void QTextDocument_SetHtml(QTextDocument* self, struct miqt_string html) { + QString html_QString = QString::fromUtf8(html.data, html.len); self->setHtml(html_QString); } -struct miqt_string* QTextDocument_ToMarkdown(const QTextDocument* self) { +struct miqt_string QTextDocument_ToMarkdown(const QTextDocument* self) { QString _ret = self->toMarkdown(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QTextDocument_SetMarkdown(QTextDocument* self, struct miqt_string* markdown) { - QString markdown_QString = QString::fromUtf8(&markdown->data, markdown->len); +void QTextDocument_SetMarkdown(QTextDocument* self, struct miqt_string markdown) { + QString markdown_QString = QString::fromUtf8(markdown.data, markdown.len); self->setMarkdown(markdown_QString); } -struct miqt_string* QTextDocument_ToRawText(const QTextDocument* self) { +struct miqt_string QTextDocument_ToRawText(const QTextDocument* self) { QString _ret = self->toRawText(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTextDocument_ToPlainText(const QTextDocument* self) { +struct miqt_string QTextDocument_ToPlainText(const QTextDocument* self) { QString _ret = self->toPlainText(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QTextDocument_SetPlainText(QTextDocument* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QTextDocument_SetPlainText(QTextDocument* self, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->setPlainText(text_QString); } @@ -191,13 +219,13 @@ QChar* QTextDocument_CharacterAt(const QTextDocument* self, int pos) { return new QChar(self->characterAt(static_cast(pos))); } -QTextCursor* QTextDocument_Find(const QTextDocument* self, struct miqt_string* subString) { - QString subString_QString = QString::fromUtf8(&subString->data, subString->len); +QTextCursor* QTextDocument_Find(const QTextDocument* self, struct miqt_string subString) { + QString subString_QString = QString::fromUtf8(subString.data, subString.len); return new QTextCursor(self->find(subString_QString)); } -QTextCursor* QTextDocument_Find2(const QTextDocument* self, struct miqt_string* subString, QTextCursor* cursor) { - QString subString_QString = QString::fromUtf8(&subString->data, subString->len); +QTextCursor* QTextDocument_Find2(const QTextDocument* self, struct miqt_string subString, QTextCursor* cursor) { + QString subString_QString = QString::fromUtf8(subString.data, subString.len); return new QTextCursor(self->find(subString_QString, *cursor)); } @@ -378,16 +406,20 @@ int QTextDocument_CharacterCount(const QTextDocument* self) { return self->characterCount(); } -void QTextDocument_SetDefaultStyleSheet(QTextDocument* self, struct miqt_string* sheet) { - QString sheet_QString = QString::fromUtf8(&sheet->data, sheet->len); +void QTextDocument_SetDefaultStyleSheet(QTextDocument* self, struct miqt_string sheet) { + QString sheet_QString = QString::fromUtf8(sheet.data, sheet.len); self->setDefaultStyleSheet(sheet_QString); } -struct miqt_string* QTextDocument_DefaultStyleSheet(const QTextDocument* self) { +struct miqt_string QTextDocument_DefaultStyleSheet(const QTextDocument* self) { QString _ret = self->defaultStyleSheet(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QTextDocument_Undo(QTextDocument* self, QTextCursor* cursor) { @@ -564,69 +596,94 @@ void QTextDocument_SetModified(QTextDocument* self) { self->setModified(); } -struct miqt_string* QTextDocument_Tr2(const char* s, const char* c) { +struct miqt_string QTextDocument_Tr2(const char* s, const char* c) { QString _ret = QTextDocument::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTextDocument_Tr3(const char* s, const char* c, int n) { +struct miqt_string QTextDocument_Tr3(const char* s, const char* c, int n) { QString _ret = QTextDocument::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTextDocument_TrUtf82(const char* s, const char* c) { +struct miqt_string QTextDocument_TrUtf82(const char* s, const char* c) { QString _ret = QTextDocument::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTextDocument_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QTextDocument_TrUtf83(const char* s, const char* c, int n) { QString _ret = QTextDocument::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QTextDocument* QTextDocument_Clone1(const QTextDocument* self, QObject* parent) { return self->clone(parent); } -struct miqt_string* QTextDocument_ToHtml1(const QTextDocument* self, QByteArray* encoding) { - QString _ret = self->toHtml(*encoding); +struct miqt_string QTextDocument_ToHtml1(const QTextDocument* self, struct miqt_string encoding) { + QByteArray encoding_QByteArray(encoding.data, encoding.len); + QString _ret = self->toHtml(encoding_QByteArray); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTextDocument_ToMarkdown1(const QTextDocument* self, int features) { +struct miqt_string QTextDocument_ToMarkdown1(const QTextDocument* self, int features) { QString _ret = self->toMarkdown(static_cast(features)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QTextDocument_SetMarkdown2(QTextDocument* self, struct miqt_string* markdown, int features) { - QString markdown_QString = QString::fromUtf8(&markdown->data, markdown->len); +void QTextDocument_SetMarkdown2(QTextDocument* self, struct miqt_string markdown, int features) { + QString markdown_QString = QString::fromUtf8(markdown.data, markdown.len); self->setMarkdown(markdown_QString, static_cast(features)); } -QTextCursor* QTextDocument_Find22(const QTextDocument* self, struct miqt_string* subString, int from) { - QString subString_QString = QString::fromUtf8(&subString->data, subString->len); +QTextCursor* QTextDocument_Find22(const QTextDocument* self, struct miqt_string subString, int from) { + QString subString_QString = QString::fromUtf8(subString.data, subString.len); return new QTextCursor(self->find(subString_QString, static_cast(from))); } -QTextCursor* QTextDocument_Find32(const QTextDocument* self, struct miqt_string* subString, int from, int options) { - QString subString_QString = QString::fromUtf8(&subString->data, subString->len); +QTextCursor* QTextDocument_Find32(const QTextDocument* self, struct miqt_string subString, int from, int options) { + QString subString_QString = QString::fromUtf8(subString.data, subString.len); return new QTextCursor(self->find(subString_QString, static_cast(from), static_cast(options))); } -QTextCursor* QTextDocument_Find33(const QTextDocument* self, struct miqt_string* subString, QTextCursor* cursor, int options) { - QString subString_QString = QString::fromUtf8(&subString->data, subString->len); +QTextCursor* QTextDocument_Find33(const QTextDocument* self, struct miqt_string subString, QTextCursor* cursor, int options) { + QString subString_QString = QString::fromUtf8(subString.data, subString.len); return new QTextCursor(self->find(subString_QString, *cursor, static_cast(options))); } diff --git a/qt/gen_qtextdocument.go b/qt/gen_qtextdocument.go index e4d55ef4..3f695fe2 100644 --- a/qt/gen_qtextdocument.go +++ b/qt/gen_qtextdocument.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "runtime/cgo" "unsafe" @@ -150,9 +149,11 @@ func NewQTextDocument() *QTextDocument { // NewQTextDocument2 constructs a new QTextDocument object. func NewQTextDocument2(text string) *QTextDocument { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - ret := C.QTextDocument_new2((*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + ret := C.QTextDocument_new2(text_ms) return newQTextDocument(ret) } @@ -164,9 +165,11 @@ func NewQTextDocument3(parent *QObject) *QTextDocument { // NewQTextDocument4 constructs a new QTextDocument object. func NewQTextDocument4(text string, parent *QObject) *QTextDocument { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - ret := C.QTextDocument_new4((*C.struct_miqt_string)(text_ms), parent.cPointer()) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + ret := C.QTextDocument_new4(text_ms, parent.cPointer()) return newQTextDocument(ret) } @@ -177,24 +180,24 @@ func (this *QTextDocument) MetaObject() *QMetaObject { func (this *QTextDocument) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QTextDocument_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QTextDocument_Metacast(this.h, param1_Cstring)) } func QTextDocument_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTextDocument_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextDocument_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QTextDocument_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTextDocument_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextDocument_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -247,62 +250,70 @@ func (this *QTextDocument) DocumentLayout() *QAbstractTextDocumentLayout { } func (this *QTextDocument) SetMetaInformation(info QTextDocument__MetaInformation, param2 string) { - param2_ms := libmiqt.Strdupg(param2) - defer C.free(param2_ms) - C.QTextDocument_SetMetaInformation(this.h, (C.int)(info), (*C.struct_miqt_string)(param2_ms)) + param2_ms := C.struct_miqt_string{} + param2_ms.data = C.CString(param2) + param2_ms.len = C.size_t(len(param2)) + defer C.free(unsafe.Pointer(param2_ms.data)) + C.QTextDocument_SetMetaInformation(this.h, (C.int)(info), param2_ms) } func (this *QTextDocument) MetaInformation(info QTextDocument__MetaInformation) string { - var _ms *C.struct_miqt_string = C.QTextDocument_MetaInformation(this.h, (C.int)(info)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextDocument_MetaInformation(this.h, (C.int)(info)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QTextDocument) ToHtml() string { - var _ms *C.struct_miqt_string = C.QTextDocument_ToHtml(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextDocument_ToHtml(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QTextDocument) SetHtml(html string) { - html_ms := libmiqt.Strdupg(html) - defer C.free(html_ms) - C.QTextDocument_SetHtml(this.h, (*C.struct_miqt_string)(html_ms)) + html_ms := C.struct_miqt_string{} + html_ms.data = C.CString(html) + html_ms.len = C.size_t(len(html)) + defer C.free(unsafe.Pointer(html_ms.data)) + C.QTextDocument_SetHtml(this.h, html_ms) } func (this *QTextDocument) ToMarkdown() string { - var _ms *C.struct_miqt_string = C.QTextDocument_ToMarkdown(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextDocument_ToMarkdown(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QTextDocument) SetMarkdown(markdown string) { - markdown_ms := libmiqt.Strdupg(markdown) - defer C.free(markdown_ms) - C.QTextDocument_SetMarkdown(this.h, (*C.struct_miqt_string)(markdown_ms)) + markdown_ms := C.struct_miqt_string{} + markdown_ms.data = C.CString(markdown) + markdown_ms.len = C.size_t(len(markdown)) + defer C.free(unsafe.Pointer(markdown_ms.data)) + C.QTextDocument_SetMarkdown(this.h, markdown_ms) } func (this *QTextDocument) ToRawText() string { - var _ms *C.struct_miqt_string = C.QTextDocument_ToRawText(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextDocument_ToRawText(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QTextDocument) ToPlainText() string { - var _ms *C.struct_miqt_string = C.QTextDocument_ToPlainText(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextDocument_ToPlainText(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QTextDocument) SetPlainText(text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QTextDocument_SetPlainText(this.h, (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QTextDocument_SetPlainText(this.h, text_ms) } func (this *QTextDocument) CharacterAt(pos int) *QChar { @@ -313,18 +324,22 @@ func (this *QTextDocument) CharacterAt(pos int) *QChar { } func (this *QTextDocument) Find(subString string) *QTextCursor { - subString_ms := libmiqt.Strdupg(subString) - defer C.free(subString_ms) - _ret := C.QTextDocument_Find(this.h, (*C.struct_miqt_string)(subString_ms)) + subString_ms := C.struct_miqt_string{} + subString_ms.data = C.CString(subString) + subString_ms.len = C.size_t(len(subString)) + defer C.free(unsafe.Pointer(subString_ms.data)) + _ret := C.QTextDocument_Find(this.h, subString_ms) _goptr := newQTextCursor(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QTextDocument) Find2(subString string, cursor *QTextCursor) *QTextCursor { - subString_ms := libmiqt.Strdupg(subString) - defer C.free(subString_ms) - _ret := C.QTextDocument_Find2(this.h, (*C.struct_miqt_string)(subString_ms), cursor.cPointer()) + subString_ms := C.struct_miqt_string{} + subString_ms.data = C.CString(subString) + subString_ms.len = C.size_t(len(subString)) + defer C.free(unsafe.Pointer(subString_ms.data)) + _ret := C.QTextDocument_Find2(this.h, subString_ms, cursor.cPointer()) _goptr := newQTextCursor(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -550,15 +565,17 @@ func (this *QTextDocument) CharacterCount() int { } func (this *QTextDocument) SetDefaultStyleSheet(sheet string) { - sheet_ms := libmiqt.Strdupg(sheet) - defer C.free(sheet_ms) - C.QTextDocument_SetDefaultStyleSheet(this.h, (*C.struct_miqt_string)(sheet_ms)) + sheet_ms := C.struct_miqt_string{} + sheet_ms.data = C.CString(sheet) + sheet_ms.len = C.size_t(len(sheet)) + defer C.free(unsafe.Pointer(sheet_ms.data)) + C.QTextDocument_SetDefaultStyleSheet(this.h, sheet_ms) } func (this *QTextDocument) DefaultStyleSheet() string { - var _ms *C.struct_miqt_string = C.QTextDocument_DefaultStyleSheet(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextDocument_DefaultStyleSheet(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -828,9 +845,9 @@ func QTextDocument_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTextDocument_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextDocument_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -839,9 +856,9 @@ func QTextDocument_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTextDocument_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextDocument_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -850,9 +867,9 @@ func QTextDocument_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTextDocument_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextDocument_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -861,9 +878,9 @@ func QTextDocument_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTextDocument_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextDocument_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -871,48 +888,59 @@ func (this *QTextDocument) Clone1(parent *QObject) *QTextDocument { return UnsafeNewQTextDocument(unsafe.Pointer(C.QTextDocument_Clone1(this.h, parent.cPointer()))) } -func (this *QTextDocument) ToHtml1(encoding *QByteArray) string { - var _ms *C.struct_miqt_string = C.QTextDocument_ToHtml1(this.h, encoding.cPointer()) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) +func (this *QTextDocument) ToHtml1(encoding []byte) string { + encoding_alias := C.struct_miqt_string{} + encoding_alias.data = (*C.char)(unsafe.Pointer(&encoding[0])) + encoding_alias.len = C.size_t(len(encoding)) + var _ms C.struct_miqt_string = C.QTextDocument_ToHtml1(this.h, encoding_alias) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QTextDocument) ToMarkdown1(features QTextDocument__MarkdownFeature) string { - var _ms *C.struct_miqt_string = C.QTextDocument_ToMarkdown1(this.h, (C.int)(features)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextDocument_ToMarkdown1(this.h, (C.int)(features)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QTextDocument) SetMarkdown2(markdown string, features QTextDocument__MarkdownFeature) { - markdown_ms := libmiqt.Strdupg(markdown) - defer C.free(markdown_ms) - C.QTextDocument_SetMarkdown2(this.h, (*C.struct_miqt_string)(markdown_ms), (C.int)(features)) + markdown_ms := C.struct_miqt_string{} + markdown_ms.data = C.CString(markdown) + markdown_ms.len = C.size_t(len(markdown)) + defer C.free(unsafe.Pointer(markdown_ms.data)) + C.QTextDocument_SetMarkdown2(this.h, markdown_ms, (C.int)(features)) } func (this *QTextDocument) Find22(subString string, from int) *QTextCursor { - subString_ms := libmiqt.Strdupg(subString) - defer C.free(subString_ms) - _ret := C.QTextDocument_Find22(this.h, (*C.struct_miqt_string)(subString_ms), (C.int)(from)) + subString_ms := C.struct_miqt_string{} + subString_ms.data = C.CString(subString) + subString_ms.len = C.size_t(len(subString)) + defer C.free(unsafe.Pointer(subString_ms.data)) + _ret := C.QTextDocument_Find22(this.h, subString_ms, (C.int)(from)) _goptr := newQTextCursor(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QTextDocument) Find32(subString string, from int, options QTextDocument__FindFlag) *QTextCursor { - subString_ms := libmiqt.Strdupg(subString) - defer C.free(subString_ms) - _ret := C.QTextDocument_Find32(this.h, (*C.struct_miqt_string)(subString_ms), (C.int)(from), (C.int)(options)) + subString_ms := C.struct_miqt_string{} + subString_ms.data = C.CString(subString) + subString_ms.len = C.size_t(len(subString)) + defer C.free(unsafe.Pointer(subString_ms.data)) + _ret := C.QTextDocument_Find32(this.h, subString_ms, (C.int)(from), (C.int)(options)) _goptr := newQTextCursor(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QTextDocument) Find33(subString string, cursor *QTextCursor, options QTextDocument__FindFlag) *QTextCursor { - subString_ms := libmiqt.Strdupg(subString) - defer C.free(subString_ms) - _ret := C.QTextDocument_Find33(this.h, (*C.struct_miqt_string)(subString_ms), cursor.cPointer(), (C.int)(options)) + subString_ms := C.struct_miqt_string{} + subString_ms.data = C.CString(subString) + subString_ms.len = C.size_t(len(subString)) + defer C.free(unsafe.Pointer(subString_ms.data)) + _ret := C.QTextDocument_Find33(this.h, subString_ms, cursor.cPointer(), (C.int)(options)) _goptr := newQTextCursor(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr diff --git a/qt/gen_qtextdocument.h b/qt/gen_qtextdocument.h index aae489d5..cab25be5 100644 --- a/qt/gen_qtextdocument.h +++ b/qt/gen_qtextdocument.h @@ -67,13 +67,13 @@ void QAbstractUndoItem_OperatorAssign(QAbstractUndoItem* self, QAbstractUndoItem void QAbstractUndoItem_Delete(QAbstractUndoItem* self); QTextDocument* QTextDocument_new(); -QTextDocument* QTextDocument_new2(struct miqt_string* text); +QTextDocument* QTextDocument_new2(struct miqt_string text); QTextDocument* QTextDocument_new3(QObject* parent); -QTextDocument* QTextDocument_new4(struct miqt_string* text, QObject* parent); +QTextDocument* QTextDocument_new4(struct miqt_string text, QObject* parent); QMetaObject* QTextDocument_MetaObject(const QTextDocument* self); void* QTextDocument_Metacast(QTextDocument* self, const char* param1); -struct miqt_string* QTextDocument_Tr(const char* s); -struct miqt_string* QTextDocument_TrUtf8(const char* s); +struct miqt_string QTextDocument_Tr(const char* s); +struct miqt_string QTextDocument_TrUtf8(const char* s); QTextDocument* QTextDocument_Clone(const QTextDocument* self); bool QTextDocument_IsEmpty(const QTextDocument* self); void QTextDocument_Clear(QTextDocument* self); @@ -86,18 +86,18 @@ int QTextDocument_AvailableRedoSteps(const QTextDocument* self); int QTextDocument_Revision(const QTextDocument* self); void QTextDocument_SetDocumentLayout(QTextDocument* self, QAbstractTextDocumentLayout* layout); QAbstractTextDocumentLayout* QTextDocument_DocumentLayout(const QTextDocument* self); -void QTextDocument_SetMetaInformation(QTextDocument* self, int info, struct miqt_string* param2); -struct miqt_string* QTextDocument_MetaInformation(const QTextDocument* self, int info); -struct miqt_string* QTextDocument_ToHtml(const QTextDocument* self); -void QTextDocument_SetHtml(QTextDocument* self, struct miqt_string* html); -struct miqt_string* QTextDocument_ToMarkdown(const QTextDocument* self); -void QTextDocument_SetMarkdown(QTextDocument* self, struct miqt_string* markdown); -struct miqt_string* QTextDocument_ToRawText(const QTextDocument* self); -struct miqt_string* QTextDocument_ToPlainText(const QTextDocument* self); -void QTextDocument_SetPlainText(QTextDocument* self, struct miqt_string* text); +void QTextDocument_SetMetaInformation(QTextDocument* self, int info, struct miqt_string param2); +struct miqt_string QTextDocument_MetaInformation(const QTextDocument* self, int info); +struct miqt_string QTextDocument_ToHtml(const QTextDocument* self); +void QTextDocument_SetHtml(QTextDocument* self, struct miqt_string html); +struct miqt_string QTextDocument_ToMarkdown(const QTextDocument* self); +void QTextDocument_SetMarkdown(QTextDocument* self, struct miqt_string markdown); +struct miqt_string QTextDocument_ToRawText(const QTextDocument* self); +struct miqt_string QTextDocument_ToPlainText(const QTextDocument* self); +void QTextDocument_SetPlainText(QTextDocument* self, struct miqt_string text); QChar* QTextDocument_CharacterAt(const QTextDocument* self, int pos); -QTextCursor* QTextDocument_Find(const QTextDocument* self, struct miqt_string* subString); -QTextCursor* QTextDocument_Find2(const QTextDocument* self, struct miqt_string* subString, QTextCursor* cursor); +QTextCursor* QTextDocument_Find(const QTextDocument* self, struct miqt_string subString); +QTextCursor* QTextDocument_Find2(const QTextDocument* self, struct miqt_string subString, QTextCursor* cursor); QTextCursor* QTextDocument_FindWithExpr(const QTextDocument* self, QRegExp* expr); QTextCursor* QTextDocument_Find3(const QTextDocument* self, QRegExp* expr, QTextCursor* cursor); QTextCursor* QTextDocument_Find4(const QTextDocument* self, QRegularExpression* expr); @@ -139,8 +139,8 @@ QSizeF* QTextDocument_Size(const QTextDocument* self); int QTextDocument_BlockCount(const QTextDocument* self); int QTextDocument_LineCount(const QTextDocument* self); int QTextDocument_CharacterCount(const QTextDocument* self); -void QTextDocument_SetDefaultStyleSheet(QTextDocument* self, struct miqt_string* sheet); -struct miqt_string* QTextDocument_DefaultStyleSheet(const QTextDocument* self); +void QTextDocument_SetDefaultStyleSheet(QTextDocument* self, struct miqt_string sheet); +struct miqt_string QTextDocument_DefaultStyleSheet(const QTextDocument* self); void QTextDocument_Undo(QTextDocument* self, QTextCursor* cursor); void QTextDocument_Redo(QTextDocument* self, QTextCursor* cursor); void QTextDocument_ClearUndoRedoStacks(QTextDocument* self); @@ -176,17 +176,17 @@ void QTextDocument_Undo2(QTextDocument* self); void QTextDocument_Redo2(QTextDocument* self); void QTextDocument_AppendUndoItem(QTextDocument* self, QAbstractUndoItem* param1); void QTextDocument_SetModified(QTextDocument* self); -struct miqt_string* QTextDocument_Tr2(const char* s, const char* c); -struct miqt_string* QTextDocument_Tr3(const char* s, const char* c, int n); -struct miqt_string* QTextDocument_TrUtf82(const char* s, const char* c); -struct miqt_string* QTextDocument_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QTextDocument_Tr2(const char* s, const char* c); +struct miqt_string QTextDocument_Tr3(const char* s, const char* c, int n); +struct miqt_string QTextDocument_TrUtf82(const char* s, const char* c); +struct miqt_string QTextDocument_TrUtf83(const char* s, const char* c, int n); QTextDocument* QTextDocument_Clone1(const QTextDocument* self, QObject* parent); -struct miqt_string* QTextDocument_ToHtml1(const QTextDocument* self, QByteArray* encoding); -struct miqt_string* QTextDocument_ToMarkdown1(const QTextDocument* self, int features); -void QTextDocument_SetMarkdown2(QTextDocument* self, struct miqt_string* markdown, int features); -QTextCursor* QTextDocument_Find22(const QTextDocument* self, struct miqt_string* subString, int from); -QTextCursor* QTextDocument_Find32(const QTextDocument* self, struct miqt_string* subString, int from, int options); -QTextCursor* QTextDocument_Find33(const QTextDocument* self, struct miqt_string* subString, QTextCursor* cursor, int options); +struct miqt_string QTextDocument_ToHtml1(const QTextDocument* self, struct miqt_string encoding); +struct miqt_string QTextDocument_ToMarkdown1(const QTextDocument* self, int features); +void QTextDocument_SetMarkdown2(QTextDocument* self, struct miqt_string markdown, int features); +QTextCursor* QTextDocument_Find22(const QTextDocument* self, struct miqt_string subString, int from); +QTextCursor* QTextDocument_Find32(const QTextDocument* self, struct miqt_string subString, int from, int options); +QTextCursor* QTextDocument_Find33(const QTextDocument* self, struct miqt_string subString, QTextCursor* cursor, int options); QTextCursor* QTextDocument_Find23(const QTextDocument* self, QRegExp* expr, int from); QTextCursor* QTextDocument_Find34(const QTextDocument* self, QRegExp* expr, int from, int options); QTextCursor* QTextDocument_Find35(const QTextDocument* self, QRegExp* expr, QTextCursor* cursor, int options); diff --git a/qt/gen_qtextdocumentfragment.cpp b/qt/gen_qtextdocumentfragment.cpp index e7d5e497..fa052105 100644 --- a/qt/gen_qtextdocumentfragment.cpp +++ b/qt/gen_qtextdocumentfragment.cpp @@ -33,40 +33,53 @@ bool QTextDocumentFragment_IsEmpty(const QTextDocumentFragment* self) { return self->isEmpty(); } -struct miqt_string* QTextDocumentFragment_ToPlainText(const QTextDocumentFragment* self) { +struct miqt_string QTextDocumentFragment_ToPlainText(const QTextDocumentFragment* self) { QString _ret = self->toPlainText(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTextDocumentFragment_ToHtml(const QTextDocumentFragment* self) { +struct miqt_string QTextDocumentFragment_ToHtml(const QTextDocumentFragment* self) { QString _ret = self->toHtml(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -QTextDocumentFragment* QTextDocumentFragment_FromPlainText(struct miqt_string* plainText) { - QString plainText_QString = QString::fromUtf8(&plainText->data, plainText->len); +QTextDocumentFragment* QTextDocumentFragment_FromPlainText(struct miqt_string plainText) { + QString plainText_QString = QString::fromUtf8(plainText.data, plainText.len); return new QTextDocumentFragment(QTextDocumentFragment::fromPlainText(plainText_QString)); } -QTextDocumentFragment* QTextDocumentFragment_FromHtml(struct miqt_string* html) { - QString html_QString = QString::fromUtf8(&html->data, html->len); +QTextDocumentFragment* QTextDocumentFragment_FromHtml(struct miqt_string html) { + QString html_QString = QString::fromUtf8(html.data, html.len); return new QTextDocumentFragment(QTextDocumentFragment::fromHtml(html_QString)); } -QTextDocumentFragment* QTextDocumentFragment_FromHtml2(struct miqt_string* html, QTextDocument* resourceProvider) { - QString html_QString = QString::fromUtf8(&html->data, html->len); +QTextDocumentFragment* QTextDocumentFragment_FromHtml2(struct miqt_string html, QTextDocument* resourceProvider) { + QString html_QString = QString::fromUtf8(html.data, html.len); return new QTextDocumentFragment(QTextDocumentFragment::fromHtml(html_QString, resourceProvider)); } -struct miqt_string* QTextDocumentFragment_ToHtml1(const QTextDocumentFragment* self, QByteArray* encoding) { - QString _ret = self->toHtml(*encoding); +struct miqt_string QTextDocumentFragment_ToHtml1(const QTextDocumentFragment* self, struct miqt_string encoding) { + QByteArray encoding_QByteArray(encoding.data, encoding.len); + QString _ret = self->toHtml(encoding_QByteArray); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QTextDocumentFragment_Delete(QTextDocumentFragment* self) { diff --git a/qt/gen_qtextdocumentfragment.go b/qt/gen_qtextdocumentfragment.go index 72987254..d76f714d 100644 --- a/qt/gen_qtextdocumentfragment.go +++ b/qt/gen_qtextdocumentfragment.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -76,50 +75,59 @@ func (this *QTextDocumentFragment) IsEmpty() bool { } func (this *QTextDocumentFragment) ToPlainText() string { - var _ms *C.struct_miqt_string = C.QTextDocumentFragment_ToPlainText(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextDocumentFragment_ToPlainText(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QTextDocumentFragment) ToHtml() string { - var _ms *C.struct_miqt_string = C.QTextDocumentFragment_ToHtml(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextDocumentFragment_ToHtml(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QTextDocumentFragment_FromPlainText(plainText string) *QTextDocumentFragment { - plainText_ms := libmiqt.Strdupg(plainText) - defer C.free(plainText_ms) - _ret := C.QTextDocumentFragment_FromPlainText((*C.struct_miqt_string)(plainText_ms)) + plainText_ms := C.struct_miqt_string{} + plainText_ms.data = C.CString(plainText) + plainText_ms.len = C.size_t(len(plainText)) + defer C.free(unsafe.Pointer(plainText_ms.data)) + _ret := C.QTextDocumentFragment_FromPlainText(plainText_ms) _goptr := newQTextDocumentFragment(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func QTextDocumentFragment_FromHtml(html string) *QTextDocumentFragment { - html_ms := libmiqt.Strdupg(html) - defer C.free(html_ms) - _ret := C.QTextDocumentFragment_FromHtml((*C.struct_miqt_string)(html_ms)) + html_ms := C.struct_miqt_string{} + html_ms.data = C.CString(html) + html_ms.len = C.size_t(len(html)) + defer C.free(unsafe.Pointer(html_ms.data)) + _ret := C.QTextDocumentFragment_FromHtml(html_ms) _goptr := newQTextDocumentFragment(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func QTextDocumentFragment_FromHtml2(html string, resourceProvider *QTextDocument) *QTextDocumentFragment { - html_ms := libmiqt.Strdupg(html) - defer C.free(html_ms) - _ret := C.QTextDocumentFragment_FromHtml2((*C.struct_miqt_string)(html_ms), resourceProvider.cPointer()) + html_ms := C.struct_miqt_string{} + html_ms.data = C.CString(html) + html_ms.len = C.size_t(len(html)) + defer C.free(unsafe.Pointer(html_ms.data)) + _ret := C.QTextDocumentFragment_FromHtml2(html_ms, resourceProvider.cPointer()) _goptr := newQTextDocumentFragment(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QTextDocumentFragment) ToHtml1(encoding *QByteArray) string { - var _ms *C.struct_miqt_string = C.QTextDocumentFragment_ToHtml1(this.h, encoding.cPointer()) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) +func (this *QTextDocumentFragment) ToHtml1(encoding []byte) string { + encoding_alias := C.struct_miqt_string{} + encoding_alias.data = (*C.char)(unsafe.Pointer(&encoding[0])) + encoding_alias.len = C.size_t(len(encoding)) + var _ms C.struct_miqt_string = C.QTextDocumentFragment_ToHtml1(this.h, encoding_alias) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qtextdocumentfragment.h b/qt/gen_qtextdocumentfragment.h index 1503816f..a0235752 100644 --- a/qt/gen_qtextdocumentfragment.h +++ b/qt/gen_qtextdocumentfragment.h @@ -31,12 +31,12 @@ QTextDocumentFragment* QTextDocumentFragment_new3(QTextCursor* rangeVal); QTextDocumentFragment* QTextDocumentFragment_new4(QTextDocumentFragment* rhs); void QTextDocumentFragment_OperatorAssign(QTextDocumentFragment* self, QTextDocumentFragment* rhs); bool QTextDocumentFragment_IsEmpty(const QTextDocumentFragment* self); -struct miqt_string* QTextDocumentFragment_ToPlainText(const QTextDocumentFragment* self); -struct miqt_string* QTextDocumentFragment_ToHtml(const QTextDocumentFragment* self); -QTextDocumentFragment* QTextDocumentFragment_FromPlainText(struct miqt_string* plainText); -QTextDocumentFragment* QTextDocumentFragment_FromHtml(struct miqt_string* html); -QTextDocumentFragment* QTextDocumentFragment_FromHtml2(struct miqt_string* html, QTextDocument* resourceProvider); -struct miqt_string* QTextDocumentFragment_ToHtml1(const QTextDocumentFragment* self, QByteArray* encoding); +struct miqt_string QTextDocumentFragment_ToPlainText(const QTextDocumentFragment* self); +struct miqt_string QTextDocumentFragment_ToHtml(const QTextDocumentFragment* self); +QTextDocumentFragment* QTextDocumentFragment_FromPlainText(struct miqt_string plainText); +QTextDocumentFragment* QTextDocumentFragment_FromHtml(struct miqt_string html); +QTextDocumentFragment* QTextDocumentFragment_FromHtml2(struct miqt_string html, QTextDocument* resourceProvider); +struct miqt_string QTextDocumentFragment_ToHtml1(const QTextDocumentFragment* self, struct miqt_string encoding); void QTextDocumentFragment_Delete(QTextDocumentFragment* self); #ifdef __cplusplus diff --git a/qt/gen_qtextdocumentwriter.cpp b/qt/gen_qtextdocumentwriter.cpp index 06a92db0..64d125fa 100644 --- a/qt/gen_qtextdocumentwriter.cpp +++ b/qt/gen_qtextdocumentwriter.cpp @@ -16,26 +16,34 @@ QTextDocumentWriter* QTextDocumentWriter_new() { return new QTextDocumentWriter(); } -QTextDocumentWriter* QTextDocumentWriter_new2(QIODevice* device, QByteArray* format) { - return new QTextDocumentWriter(device, *format); +QTextDocumentWriter* QTextDocumentWriter_new2(QIODevice* device, struct miqt_string format) { + QByteArray format_QByteArray(format.data, format.len); + return new QTextDocumentWriter(device, format_QByteArray); } -QTextDocumentWriter* QTextDocumentWriter_new3(struct miqt_string* fileName) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +QTextDocumentWriter* QTextDocumentWriter_new3(struct miqt_string fileName) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); return new QTextDocumentWriter(fileName_QString); } -QTextDocumentWriter* QTextDocumentWriter_new4(struct miqt_string* fileName, QByteArray* format) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); - return new QTextDocumentWriter(fileName_QString, *format); +QTextDocumentWriter* QTextDocumentWriter_new4(struct miqt_string fileName, struct miqt_string format) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); + QByteArray format_QByteArray(format.data, format.len); + return new QTextDocumentWriter(fileName_QString, format_QByteArray); } -void QTextDocumentWriter_SetFormat(QTextDocumentWriter* self, QByteArray* format) { - self->setFormat(*format); +void QTextDocumentWriter_SetFormat(QTextDocumentWriter* self, struct miqt_string format) { + QByteArray format_QByteArray(format.data, format.len); + self->setFormat(format_QByteArray); } -QByteArray* QTextDocumentWriter_Format(const QTextDocumentWriter* self) { - return new QByteArray(self->format()); +struct miqt_string QTextDocumentWriter_Format(const QTextDocumentWriter* self) { + QByteArray _qb = self->format(); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } void QTextDocumentWriter_SetDevice(QTextDocumentWriter* self, QIODevice* device) { @@ -46,16 +54,20 @@ QIODevice* QTextDocumentWriter_Device(const QTextDocumentWriter* self) { return self->device(); } -void QTextDocumentWriter_SetFileName(QTextDocumentWriter* self, struct miqt_string* fileName) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); +void QTextDocumentWriter_SetFileName(QTextDocumentWriter* self, struct miqt_string fileName) { + QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); self->setFileName(fileName_QString); } -struct miqt_string* QTextDocumentWriter_FileName(const QTextDocumentWriter* self) { +struct miqt_string QTextDocumentWriter_FileName(const QTextDocumentWriter* self) { QString _ret = self->fileName(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } bool QTextDocumentWriter_Write(QTextDocumentWriter* self, QTextDocument* document) { @@ -77,9 +89,14 @@ QTextCodec* QTextDocumentWriter_Codec(const QTextDocumentWriter* self) { struct miqt_array* QTextDocumentWriter_SupportedDocumentFormats() { QList _ret = QTextDocumentWriter::supportedDocumentFormats(); // Convert QList<> from C++ memory to manually-managed C memory - QByteArray** _arr = static_cast(malloc(sizeof(QByteArray*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { - _arr[i] = new QByteArray(_ret[i]); + QByteArray _lv_qb = _ret[i]; + struct miqt_string _lv_ms; + _lv_ms.len = _lv_qb.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_qb.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); diff --git a/qt/gen_qtextdocumentwriter.go b/qt/gen_qtextdocumentwriter.go index 7d05cac6..89a5b158 100644 --- a/qt/gen_qtextdocumentwriter.go +++ b/qt/gen_qtextdocumentwriter.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -50,36 +49,49 @@ func NewQTextDocumentWriter() *QTextDocumentWriter { } // NewQTextDocumentWriter2 constructs a new QTextDocumentWriter object. -func NewQTextDocumentWriter2(device *QIODevice, format *QByteArray) *QTextDocumentWriter { - ret := C.QTextDocumentWriter_new2(device.cPointer(), format.cPointer()) +func NewQTextDocumentWriter2(device *QIODevice, format []byte) *QTextDocumentWriter { + format_alias := C.struct_miqt_string{} + format_alias.data = (*C.char)(unsafe.Pointer(&format[0])) + format_alias.len = C.size_t(len(format)) + ret := C.QTextDocumentWriter_new2(device.cPointer(), format_alias) return newQTextDocumentWriter(ret) } // NewQTextDocumentWriter3 constructs a new QTextDocumentWriter object. func NewQTextDocumentWriter3(fileName string) *QTextDocumentWriter { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - ret := C.QTextDocumentWriter_new3((*C.struct_miqt_string)(fileName_ms)) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + ret := C.QTextDocumentWriter_new3(fileName_ms) return newQTextDocumentWriter(ret) } // NewQTextDocumentWriter4 constructs a new QTextDocumentWriter object. -func NewQTextDocumentWriter4(fileName string, format *QByteArray) *QTextDocumentWriter { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - ret := C.QTextDocumentWriter_new4((*C.struct_miqt_string)(fileName_ms), format.cPointer()) +func NewQTextDocumentWriter4(fileName string, format []byte) *QTextDocumentWriter { + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + format_alias := C.struct_miqt_string{} + format_alias.data = (*C.char)(unsafe.Pointer(&format[0])) + format_alias.len = C.size_t(len(format)) + ret := C.QTextDocumentWriter_new4(fileName_ms, format_alias) return newQTextDocumentWriter(ret) } -func (this *QTextDocumentWriter) SetFormat(format *QByteArray) { - C.QTextDocumentWriter_SetFormat(this.h, format.cPointer()) +func (this *QTextDocumentWriter) SetFormat(format []byte) { + format_alias := C.struct_miqt_string{} + format_alias.data = (*C.char)(unsafe.Pointer(&format[0])) + format_alias.len = C.size_t(len(format)) + C.QTextDocumentWriter_SetFormat(this.h, format_alias) } -func (this *QTextDocumentWriter) Format() *QByteArray { - _ret := C.QTextDocumentWriter_Format(this.h) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QTextDocumentWriter) Format() []byte { + var _bytearray C.struct_miqt_string = C.QTextDocumentWriter_Format(this.h) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } func (this *QTextDocumentWriter) SetDevice(device *QIODevice) { @@ -91,15 +103,17 @@ func (this *QTextDocumentWriter) Device() *QIODevice { } func (this *QTextDocumentWriter) SetFileName(fileName string) { - fileName_ms := libmiqt.Strdupg(fileName) - defer C.free(fileName_ms) - C.QTextDocumentWriter_SetFileName(this.h, (*C.struct_miqt_string)(fileName_ms)) + fileName_ms := C.struct_miqt_string{} + fileName_ms.data = C.CString(fileName) + fileName_ms.len = C.size_t(len(fileName)) + defer C.free(unsafe.Pointer(fileName_ms.data)) + C.QTextDocumentWriter_SetFileName(this.h, fileName_ms) } func (this *QTextDocumentWriter) FileName() string { - var _ms *C.struct_miqt_string = C.QTextDocumentWriter_FileName(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextDocumentWriter_FileName(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -119,15 +133,15 @@ func (this *QTextDocumentWriter) Codec() *QTextCodec { return UnsafeNewQTextCodec(unsafe.Pointer(C.QTextDocumentWriter_Codec(this.h))) } -func QTextDocumentWriter_SupportedDocumentFormats() []QByteArray { +func QTextDocumentWriter_SupportedDocumentFormats() [][]byte { var _ma *C.struct_miqt_array = C.QTextDocumentWriter_SupportedDocumentFormats() - _ret := make([]QByteArray, int(_ma.len)) - _outCast := (*[0xffff]*C.QByteArray)(unsafe.Pointer(_ma.data)) // hey ya + _ret := make([][]byte, int(_ma.len)) + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - _lv_ret := _outCast[i] - _lv_goptr := newQByteArray(_lv_ret) - _lv_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - _ret[i] = *_lv_goptr + var _lv_bytearray C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoBytes(unsafe.Pointer(_lv_bytearray.data), C.int(int64(_lv_bytearray.len))) + C.free(unsafe.Pointer(_lv_bytearray.data)) + _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) return _ret diff --git a/qt/gen_qtextdocumentwriter.h b/qt/gen_qtextdocumentwriter.h index e94507f8..0226f0b4 100644 --- a/qt/gen_qtextdocumentwriter.h +++ b/qt/gen_qtextdocumentwriter.h @@ -30,15 +30,15 @@ typedef struct QTextDocumentWriter QTextDocumentWriter; #endif QTextDocumentWriter* QTextDocumentWriter_new(); -QTextDocumentWriter* QTextDocumentWriter_new2(QIODevice* device, QByteArray* format); -QTextDocumentWriter* QTextDocumentWriter_new3(struct miqt_string* fileName); -QTextDocumentWriter* QTextDocumentWriter_new4(struct miqt_string* fileName, QByteArray* format); -void QTextDocumentWriter_SetFormat(QTextDocumentWriter* self, QByteArray* format); -QByteArray* QTextDocumentWriter_Format(const QTextDocumentWriter* self); +QTextDocumentWriter* QTextDocumentWriter_new2(QIODevice* device, struct miqt_string format); +QTextDocumentWriter* QTextDocumentWriter_new3(struct miqt_string fileName); +QTextDocumentWriter* QTextDocumentWriter_new4(struct miqt_string fileName, struct miqt_string format); +void QTextDocumentWriter_SetFormat(QTextDocumentWriter* self, struct miqt_string format); +struct miqt_string QTextDocumentWriter_Format(const QTextDocumentWriter* self); void QTextDocumentWriter_SetDevice(QTextDocumentWriter* self, QIODevice* device); QIODevice* QTextDocumentWriter_Device(const QTextDocumentWriter* self); -void QTextDocumentWriter_SetFileName(QTextDocumentWriter* self, struct miqt_string* fileName); -struct miqt_string* QTextDocumentWriter_FileName(const QTextDocumentWriter* self); +void QTextDocumentWriter_SetFileName(QTextDocumentWriter* self, struct miqt_string fileName); +struct miqt_string QTextDocumentWriter_FileName(const QTextDocumentWriter* self); bool QTextDocumentWriter_Write(QTextDocumentWriter* self, QTextDocument* document); bool QTextDocumentWriter_WriteWithFragment(QTextDocumentWriter* self, QTextDocumentFragment* fragment); void QTextDocumentWriter_SetCodec(QTextDocumentWriter* self, QTextCodec* codec); diff --git a/qt/gen_qtextedit.cpp b/qt/gen_qtextedit.cpp index 1aec3831..e23b01e8 100644 --- a/qt/gen_qtextedit.cpp +++ b/qt/gen_qtextedit.cpp @@ -27,8 +27,8 @@ QTextEdit* QTextEdit_new() { return new QTextEdit(); } -QTextEdit* QTextEdit_new2(struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QTextEdit* QTextEdit_new2(struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QTextEdit(text_QString); } @@ -36,8 +36,8 @@ QTextEdit* QTextEdit_new3(QWidget* parent) { return new QTextEdit(parent); } -QTextEdit* QTextEdit_new4(struct miqt_string* text, QWidget* parent) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QTextEdit* QTextEdit_new4(struct miqt_string text, QWidget* parent) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QTextEdit(text_QString, parent); } @@ -49,18 +49,26 @@ void* QTextEdit_Metacast(QTextEdit* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QTextEdit_Tr(const char* s) { +struct miqt_string QTextEdit_Tr(const char* s) { QString _ret = QTextEdit::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTextEdit_TrUtf8(const char* s) { +struct miqt_string QTextEdit_TrUtf8(const char* s) { QString _ret = QTextEdit::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QTextEdit_SetDocument(QTextEdit* self, QTextDocument* document) { @@ -71,16 +79,20 @@ QTextDocument* QTextEdit_Document(const QTextEdit* self) { return self->document(); } -void QTextEdit_SetPlaceholderText(QTextEdit* self, struct miqt_string* placeholderText) { - QString placeholderText_QString = QString::fromUtf8(&placeholderText->data, placeholderText->len); +void QTextEdit_SetPlaceholderText(QTextEdit* self, struct miqt_string placeholderText) { + QString placeholderText_QString = QString::fromUtf8(placeholderText.data, placeholderText.len); self->setPlaceholderText(placeholderText_QString); } -struct miqt_string* QTextEdit_PlaceholderText(const QTextEdit* self) { +struct miqt_string QTextEdit_PlaceholderText(const QTextEdit* self) { QString _ret = self->placeholderText(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QTextEdit_SetTextCursor(QTextEdit* self, QTextCursor* cursor) { @@ -113,11 +125,15 @@ double QTextEdit_FontPointSize(const QTextEdit* self) { return static_cast(_ret); } -struct miqt_string* QTextEdit_FontFamily(const QTextEdit* self) { +struct miqt_string QTextEdit_FontFamily(const QTextEdit* self) { QString _ret = self->fontFamily(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QTextEdit_FontWeight(const QTextEdit* self) { @@ -178,16 +194,20 @@ void QTextEdit_SetTabChangesFocus(QTextEdit* self, bool b) { self->setTabChangesFocus(b); } -void QTextEdit_SetDocumentTitle(QTextEdit* self, struct miqt_string* title) { - QString title_QString = QString::fromUtf8(&title->data, title->len); +void QTextEdit_SetDocumentTitle(QTextEdit* self, struct miqt_string title) { + QString title_QString = QString::fromUtf8(title.data, title.len); self->setDocumentTitle(title_QString); } -struct miqt_string* QTextEdit_DocumentTitle(const QTextEdit* self) { +struct miqt_string QTextEdit_DocumentTitle(const QTextEdit* self) { QString _ret = self->documentTitle(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } bool QTextEdit_IsUndoRedoEnabled(const QTextEdit* self) { @@ -224,8 +244,8 @@ void QTextEdit_SetWordWrapMode(QTextEdit* self, int policy) { self->setWordWrapMode(static_cast(policy)); } -bool QTextEdit_Find(QTextEdit* self, struct miqt_string* exp) { - QString exp_QString = QString::fromUtf8(&exp->data, exp->len); +bool QTextEdit_Find(QTextEdit* self, struct miqt_string exp) { + QString exp_QString = QString::fromUtf8(exp.data, exp.len); return self->find(exp_QString); } @@ -237,25 +257,37 @@ bool QTextEdit_Find2(QTextEdit* self, QRegularExpression* exp) { return self->find(*exp); } -struct miqt_string* QTextEdit_ToPlainText(const QTextEdit* self) { +struct miqt_string QTextEdit_ToPlainText(const QTextEdit* self) { QString _ret = self->toPlainText(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTextEdit_ToHtml(const QTextEdit* self) { +struct miqt_string QTextEdit_ToHtml(const QTextEdit* self) { QString _ret = self->toHtml(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTextEdit_ToMarkdown(const QTextEdit* self) { +struct miqt_string QTextEdit_ToMarkdown(const QTextEdit* self) { QString _ret = self->toMarkdown(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QTextEdit_EnsureCursorVisible(QTextEdit* self) { @@ -286,11 +318,15 @@ QRect* QTextEdit_CursorRect2(const QTextEdit* self) { return new QRect(self->cursorRect()); } -struct miqt_string* QTextEdit_AnchorAt(const QTextEdit* self, QPoint* pos) { +struct miqt_string QTextEdit_AnchorAt(const QTextEdit* self, QPoint* pos) { QString _ret = self->anchorAt(*pos); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } bool QTextEdit_OverwriteMode(const QTextEdit* self) { @@ -381,8 +417,8 @@ void QTextEdit_SetFontPointSize(QTextEdit* self, double s) { self->setFontPointSize(static_cast(s)); } -void QTextEdit_SetFontFamily(QTextEdit* self, struct miqt_string* fontFamily) { - QString fontFamily_QString = QString::fromUtf8(&fontFamily->data, fontFamily->len); +void QTextEdit_SetFontFamily(QTextEdit* self, struct miqt_string fontFamily) { + QString fontFamily_QString = QString::fromUtf8(fontFamily.data, fontFamily.len); self->setFontFamily(fontFamily_QString); } @@ -414,23 +450,23 @@ void QTextEdit_SetAlignment(QTextEdit* self, int a) { self->setAlignment(static_cast(a)); } -void QTextEdit_SetPlainText(QTextEdit* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QTextEdit_SetPlainText(QTextEdit* self, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->setPlainText(text_QString); } -void QTextEdit_SetHtml(QTextEdit* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QTextEdit_SetHtml(QTextEdit* self, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->setHtml(text_QString); } -void QTextEdit_SetMarkdown(QTextEdit* self, struct miqt_string* markdown) { - QString markdown_QString = QString::fromUtf8(&markdown->data, markdown->len); +void QTextEdit_SetMarkdown(QTextEdit* self, struct miqt_string markdown) { + QString markdown_QString = QString::fromUtf8(markdown.data, markdown.len); self->setMarkdown(markdown_QString); } -void QTextEdit_SetText(QTextEdit* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QTextEdit_SetText(QTextEdit* self, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->setText(text_QString); } @@ -462,23 +498,23 @@ void QTextEdit_SelectAll(QTextEdit* self) { self->selectAll(); } -void QTextEdit_InsertPlainText(QTextEdit* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QTextEdit_InsertPlainText(QTextEdit* self, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->insertPlainText(text_QString); } -void QTextEdit_InsertHtml(QTextEdit* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QTextEdit_InsertHtml(QTextEdit* self, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->insertHtml(text_QString); } -void QTextEdit_Append(QTextEdit* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QTextEdit_Append(QTextEdit* self, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->append(text_QString); } -void QTextEdit_ScrollToAnchor(QTextEdit* self, struct miqt_string* name) { - QString name_QString = QString::fromUtf8(&name->data, name->len); +void QTextEdit_ScrollToAnchor(QTextEdit* self, struct miqt_string name) { + QString name_QString = QString::fromUtf8(name.data, name.len); self->scrollToAnchor(name_QString); } @@ -566,36 +602,52 @@ void QTextEdit_connect_CursorPositionChanged(QTextEdit* self, intptr_t slot) { }); } -struct miqt_string* QTextEdit_Tr2(const char* s, const char* c) { +struct miqt_string QTextEdit_Tr2(const char* s, const char* c) { QString _ret = QTextEdit::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTextEdit_Tr3(const char* s, const char* c, int n) { +struct miqt_string QTextEdit_Tr3(const char* s, const char* c, int n) { QString _ret = QTextEdit::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTextEdit_TrUtf82(const char* s, const char* c) { +struct miqt_string QTextEdit_TrUtf82(const char* s, const char* c) { QString _ret = QTextEdit::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTextEdit_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QTextEdit_TrUtf83(const char* s, const char* c, int n) { QString _ret = QTextEdit::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -bool QTextEdit_Find22(QTextEdit* self, struct miqt_string* exp, int options) { - QString exp_QString = QString::fromUtf8(&exp->data, exp->len); +bool QTextEdit_Find22(QTextEdit* self, struct miqt_string exp, int options) { + QString exp_QString = QString::fromUtf8(exp.data, exp.len); return self->find(exp_QString, static_cast(options)); } @@ -607,11 +659,15 @@ bool QTextEdit_Find24(QTextEdit* self, QRegularExpression* exp, int options) { return self->find(*exp, static_cast(options)); } -struct miqt_string* QTextEdit_ToMarkdown1(const QTextEdit* self, int features) { +struct miqt_string QTextEdit_ToMarkdown1(const QTextEdit* self, int features) { QString _ret = self->toMarkdown(static_cast(features)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QTextEdit_MoveCursor2(QTextEdit* self, int operation, int mode) { diff --git a/qt/gen_qtextedit.go b/qt/gen_qtextedit.go index fb904f4b..fbdf8acb 100644 --- a/qt/gen_qtextedit.go +++ b/qt/gen_qtextedit.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "runtime/cgo" "unsafe" @@ -70,9 +69,11 @@ func NewQTextEdit() *QTextEdit { // NewQTextEdit2 constructs a new QTextEdit object. func NewQTextEdit2(text string) *QTextEdit { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - ret := C.QTextEdit_new2((*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + ret := C.QTextEdit_new2(text_ms) return newQTextEdit(ret) } @@ -84,9 +85,11 @@ func NewQTextEdit3(parent *QWidget) *QTextEdit { // NewQTextEdit4 constructs a new QTextEdit object. func NewQTextEdit4(text string, parent *QWidget) *QTextEdit { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - ret := C.QTextEdit_new4((*C.struct_miqt_string)(text_ms), parent.cPointer()) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + ret := C.QTextEdit_new4(text_ms, parent.cPointer()) return newQTextEdit(ret) } @@ -97,24 +100,24 @@ func (this *QTextEdit) MetaObject() *QMetaObject { func (this *QTextEdit) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QTextEdit_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QTextEdit_Metacast(this.h, param1_Cstring)) } func QTextEdit_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTextEdit_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextEdit_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QTextEdit_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTextEdit_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextEdit_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -127,15 +130,17 @@ func (this *QTextEdit) Document() *QTextDocument { } func (this *QTextEdit) SetPlaceholderText(placeholderText string) { - placeholderText_ms := libmiqt.Strdupg(placeholderText) - defer C.free(placeholderText_ms) - C.QTextEdit_SetPlaceholderText(this.h, (*C.struct_miqt_string)(placeholderText_ms)) + placeholderText_ms := C.struct_miqt_string{} + placeholderText_ms.data = C.CString(placeholderText) + placeholderText_ms.len = C.size_t(len(placeholderText)) + defer C.free(unsafe.Pointer(placeholderText_ms.data)) + C.QTextEdit_SetPlaceholderText(this.h, placeholderText_ms) } func (this *QTextEdit) PlaceholderText() string { - var _ms *C.struct_miqt_string = C.QTextEdit_PlaceholderText(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextEdit_PlaceholderText(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -171,9 +176,9 @@ func (this *QTextEdit) FontPointSize() float64 { } func (this *QTextEdit) FontFamily() string { - var _ms *C.struct_miqt_string = C.QTextEdit_FontFamily(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextEdit_FontFamily(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -246,15 +251,17 @@ func (this *QTextEdit) SetTabChangesFocus(b bool) { } func (this *QTextEdit) SetDocumentTitle(title string) { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - C.QTextEdit_SetDocumentTitle(this.h, (*C.struct_miqt_string)(title_ms)) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + C.QTextEdit_SetDocumentTitle(this.h, title_ms) } func (this *QTextEdit) DocumentTitle() string { - var _ms *C.struct_miqt_string = C.QTextEdit_DocumentTitle(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextEdit_DocumentTitle(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -291,9 +298,11 @@ func (this *QTextEdit) SetWordWrapMode(policy QTextOption__WrapMode) { } func (this *QTextEdit) Find(exp string) bool { - exp_ms := libmiqt.Strdupg(exp) - defer C.free(exp_ms) - return (bool)(C.QTextEdit_Find(this.h, (*C.struct_miqt_string)(exp_ms))) + exp_ms := C.struct_miqt_string{} + exp_ms.data = C.CString(exp) + exp_ms.len = C.size_t(len(exp)) + defer C.free(unsafe.Pointer(exp_ms.data)) + return (bool)(C.QTextEdit_Find(this.h, exp_ms)) } func (this *QTextEdit) FindWithExp(exp *QRegExp) bool { @@ -305,23 +314,23 @@ func (this *QTextEdit) Find2(exp *QRegularExpression) bool { } func (this *QTextEdit) ToPlainText() string { - var _ms *C.struct_miqt_string = C.QTextEdit_ToPlainText(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextEdit_ToPlainText(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QTextEdit) ToHtml() string { - var _ms *C.struct_miqt_string = C.QTextEdit_ToHtml(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextEdit_ToHtml(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QTextEdit) ToMarkdown() string { - var _ms *C.struct_miqt_string = C.QTextEdit_ToMarkdown(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextEdit_ToMarkdown(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -366,9 +375,9 @@ func (this *QTextEdit) CursorRect2() *QRect { } func (this *QTextEdit) AnchorAt(pos *QPoint) string { - var _ms *C.struct_miqt_string = C.QTextEdit_AnchorAt(this.h, pos.cPointer()) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextEdit_AnchorAt(this.h, pos.cPointer()) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -469,9 +478,11 @@ func (this *QTextEdit) SetFontPointSize(s float64) { } func (this *QTextEdit) SetFontFamily(fontFamily string) { - fontFamily_ms := libmiqt.Strdupg(fontFamily) - defer C.free(fontFamily_ms) - C.QTextEdit_SetFontFamily(this.h, (*C.struct_miqt_string)(fontFamily_ms)) + fontFamily_ms := C.struct_miqt_string{} + fontFamily_ms.data = C.CString(fontFamily) + fontFamily_ms.len = C.size_t(len(fontFamily)) + defer C.free(unsafe.Pointer(fontFamily_ms.data)) + C.QTextEdit_SetFontFamily(this.h, fontFamily_ms) } func (this *QTextEdit) SetFontWeight(w int) { @@ -503,27 +514,35 @@ func (this *QTextEdit) SetAlignment(a AlignmentFlag) { } func (this *QTextEdit) SetPlainText(text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QTextEdit_SetPlainText(this.h, (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QTextEdit_SetPlainText(this.h, text_ms) } func (this *QTextEdit) SetHtml(text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QTextEdit_SetHtml(this.h, (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QTextEdit_SetHtml(this.h, text_ms) } func (this *QTextEdit) SetMarkdown(markdown string) { - markdown_ms := libmiqt.Strdupg(markdown) - defer C.free(markdown_ms) - C.QTextEdit_SetMarkdown(this.h, (*C.struct_miqt_string)(markdown_ms)) + markdown_ms := C.struct_miqt_string{} + markdown_ms.data = C.CString(markdown) + markdown_ms.len = C.size_t(len(markdown)) + defer C.free(unsafe.Pointer(markdown_ms.data)) + C.QTextEdit_SetMarkdown(this.h, markdown_ms) } func (this *QTextEdit) SetText(text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QTextEdit_SetText(this.h, (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QTextEdit_SetText(this.h, text_ms) } func (this *QTextEdit) Cut() { @@ -555,27 +574,35 @@ func (this *QTextEdit) SelectAll() { } func (this *QTextEdit) InsertPlainText(text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QTextEdit_InsertPlainText(this.h, (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QTextEdit_InsertPlainText(this.h, text_ms) } func (this *QTextEdit) InsertHtml(text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QTextEdit_InsertHtml(this.h, (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QTextEdit_InsertHtml(this.h, text_ms) } func (this *QTextEdit) Append(text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QTextEdit_Append(this.h, (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QTextEdit_Append(this.h, text_ms) } func (this *QTextEdit) ScrollToAnchor(name string) { - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - C.QTextEdit_ScrollToAnchor(this.h, (*C.struct_miqt_string)(name_ms)) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + C.QTextEdit_ScrollToAnchor(this.h, name_ms) } func (this *QTextEdit) ZoomIn() { @@ -722,9 +749,9 @@ func QTextEdit_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTextEdit_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextEdit_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -733,9 +760,9 @@ func QTextEdit_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTextEdit_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextEdit_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -744,9 +771,9 @@ func QTextEdit_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTextEdit_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextEdit_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -755,16 +782,18 @@ func QTextEdit_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTextEdit_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextEdit_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QTextEdit) Find22(exp string, options QTextDocument__FindFlag) bool { - exp_ms := libmiqt.Strdupg(exp) - defer C.free(exp_ms) - return (bool)(C.QTextEdit_Find22(this.h, (*C.struct_miqt_string)(exp_ms), (C.int)(options))) + exp_ms := C.struct_miqt_string{} + exp_ms.data = C.CString(exp) + exp_ms.len = C.size_t(len(exp)) + defer C.free(unsafe.Pointer(exp_ms.data)) + return (bool)(C.QTextEdit_Find22(this.h, exp_ms, (C.int)(options))) } func (this *QTextEdit) Find23(exp *QRegExp, options QTextDocument__FindFlag) bool { @@ -776,9 +805,9 @@ func (this *QTextEdit) Find24(exp *QRegularExpression, options QTextDocument__Fi } func (this *QTextEdit) ToMarkdown1(features QTextDocument__MarkdownFeature) string { - var _ms *C.struct_miqt_string = C.QTextEdit_ToMarkdown1(this.h, (C.int)(features)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextEdit_ToMarkdown1(this.h, (C.int)(features)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qtextedit.h b/qt/gen_qtextedit.h index 0a10286c..1a7ca251 100644 --- a/qt/gen_qtextedit.h +++ b/qt/gen_qtextedit.h @@ -56,17 +56,17 @@ typedef struct QWidget QWidget; #endif QTextEdit* QTextEdit_new(); -QTextEdit* QTextEdit_new2(struct miqt_string* text); +QTextEdit* QTextEdit_new2(struct miqt_string text); QTextEdit* QTextEdit_new3(QWidget* parent); -QTextEdit* QTextEdit_new4(struct miqt_string* text, QWidget* parent); +QTextEdit* QTextEdit_new4(struct miqt_string text, QWidget* parent); QMetaObject* QTextEdit_MetaObject(const QTextEdit* self); void* QTextEdit_Metacast(QTextEdit* self, const char* param1); -struct miqt_string* QTextEdit_Tr(const char* s); -struct miqt_string* QTextEdit_TrUtf8(const char* s); +struct miqt_string QTextEdit_Tr(const char* s); +struct miqt_string QTextEdit_TrUtf8(const char* s); void QTextEdit_SetDocument(QTextEdit* self, QTextDocument* document); QTextDocument* QTextEdit_Document(const QTextEdit* self); -void QTextEdit_SetPlaceholderText(QTextEdit* self, struct miqt_string* placeholderText); -struct miqt_string* QTextEdit_PlaceholderText(const QTextEdit* self); +void QTextEdit_SetPlaceholderText(QTextEdit* self, struct miqt_string placeholderText); +struct miqt_string QTextEdit_PlaceholderText(const QTextEdit* self); void QTextEdit_SetTextCursor(QTextEdit* self, QTextCursor* cursor); QTextCursor* QTextEdit_TextCursor(const QTextEdit* self); bool QTextEdit_IsReadOnly(const QTextEdit* self); @@ -74,7 +74,7 @@ void QTextEdit_SetReadOnly(QTextEdit* self, bool ro); void QTextEdit_SetTextInteractionFlags(QTextEdit* self, int flags); int QTextEdit_TextInteractionFlags(const QTextEdit* self); double QTextEdit_FontPointSize(const QTextEdit* self); -struct miqt_string* QTextEdit_FontFamily(const QTextEdit* self); +struct miqt_string QTextEdit_FontFamily(const QTextEdit* self); int QTextEdit_FontWeight(const QTextEdit* self); bool QTextEdit_FontUnderline(const QTextEdit* self); bool QTextEdit_FontItalic(const QTextEdit* self); @@ -89,8 +89,8 @@ int QTextEdit_AutoFormatting(const QTextEdit* self); void QTextEdit_SetAutoFormatting(QTextEdit* self, int features); bool QTextEdit_TabChangesFocus(const QTextEdit* self); void QTextEdit_SetTabChangesFocus(QTextEdit* self, bool b); -void QTextEdit_SetDocumentTitle(QTextEdit* self, struct miqt_string* title); -struct miqt_string* QTextEdit_DocumentTitle(const QTextEdit* self); +void QTextEdit_SetDocumentTitle(QTextEdit* self, struct miqt_string title); +struct miqt_string QTextEdit_DocumentTitle(const QTextEdit* self); bool QTextEdit_IsUndoRedoEnabled(const QTextEdit* self); void QTextEdit_SetUndoRedoEnabled(QTextEdit* self, bool enable); int QTextEdit_LineWrapMode(const QTextEdit* self); @@ -99,12 +99,12 @@ int QTextEdit_LineWrapColumnOrWidth(const QTextEdit* self); void QTextEdit_SetLineWrapColumnOrWidth(QTextEdit* self, int w); int QTextEdit_WordWrapMode(const QTextEdit* self); void QTextEdit_SetWordWrapMode(QTextEdit* self, int policy); -bool QTextEdit_Find(QTextEdit* self, struct miqt_string* exp); +bool QTextEdit_Find(QTextEdit* self, struct miqt_string exp); bool QTextEdit_FindWithExp(QTextEdit* self, QRegExp* exp); bool QTextEdit_Find2(QTextEdit* self, QRegularExpression* exp); -struct miqt_string* QTextEdit_ToPlainText(const QTextEdit* self); -struct miqt_string* QTextEdit_ToHtml(const QTextEdit* self); -struct miqt_string* QTextEdit_ToMarkdown(const QTextEdit* self); +struct miqt_string QTextEdit_ToPlainText(const QTextEdit* self); +struct miqt_string QTextEdit_ToHtml(const QTextEdit* self); +struct miqt_string QTextEdit_ToMarkdown(const QTextEdit* self); void QTextEdit_EnsureCursorVisible(QTextEdit* self); QVariant* QTextEdit_LoadResource(QTextEdit* self, int typeVal, QUrl* name); QMenu* QTextEdit_CreateStandardContextMenu(QTextEdit* self); @@ -112,7 +112,7 @@ QMenu* QTextEdit_CreateStandardContextMenuWithPosition(QTextEdit* self, QPoint* QTextCursor* QTextEdit_CursorForPosition(const QTextEdit* self, QPoint* pos); QRect* QTextEdit_CursorRect(const QTextEdit* self, QTextCursor* cursor); QRect* QTextEdit_CursorRect2(const QTextEdit* self); -struct miqt_string* QTextEdit_AnchorAt(const QTextEdit* self, QPoint* pos); +struct miqt_string QTextEdit_AnchorAt(const QTextEdit* self, QPoint* pos); bool QTextEdit_OverwriteMode(const QTextEdit* self); void QTextEdit_SetOverwriteMode(QTextEdit* self, bool overwrite); int QTextEdit_TabStopWidth(const QTextEdit* self); @@ -131,7 +131,7 @@ void QTextEdit_Print(const QTextEdit* self, QPagedPaintDevice* printer); QVariant* QTextEdit_InputMethodQuery(const QTextEdit* self, int property); QVariant* QTextEdit_InputMethodQuery2(const QTextEdit* self, int query, QVariant* argument); void QTextEdit_SetFontPointSize(QTextEdit* self, double s); -void QTextEdit_SetFontFamily(QTextEdit* self, struct miqt_string* fontFamily); +void QTextEdit_SetFontFamily(QTextEdit* self, struct miqt_string fontFamily); void QTextEdit_SetFontWeight(QTextEdit* self, int w); void QTextEdit_SetFontUnderline(QTextEdit* self, bool b); void QTextEdit_SetFontItalic(QTextEdit* self, bool b); @@ -139,10 +139,10 @@ void QTextEdit_SetTextColor(QTextEdit* self, QColor* c); void QTextEdit_SetTextBackgroundColor(QTextEdit* self, QColor* c); void QTextEdit_SetCurrentFont(QTextEdit* self, QFont* f); void QTextEdit_SetAlignment(QTextEdit* self, int a); -void QTextEdit_SetPlainText(QTextEdit* self, struct miqt_string* text); -void QTextEdit_SetHtml(QTextEdit* self, struct miqt_string* text); -void QTextEdit_SetMarkdown(QTextEdit* self, struct miqt_string* markdown); -void QTextEdit_SetText(QTextEdit* self, struct miqt_string* text); +void QTextEdit_SetPlainText(QTextEdit* self, struct miqt_string text); +void QTextEdit_SetHtml(QTextEdit* self, struct miqt_string text); +void QTextEdit_SetMarkdown(QTextEdit* self, struct miqt_string markdown); +void QTextEdit_SetText(QTextEdit* self, struct miqt_string text); void QTextEdit_Cut(QTextEdit* self); void QTextEdit_Copy(QTextEdit* self); void QTextEdit_Paste(QTextEdit* self); @@ -150,10 +150,10 @@ void QTextEdit_Undo(QTextEdit* self); void QTextEdit_Redo(QTextEdit* self); void QTextEdit_Clear(QTextEdit* self); void QTextEdit_SelectAll(QTextEdit* self); -void QTextEdit_InsertPlainText(QTextEdit* self, struct miqt_string* text); -void QTextEdit_InsertHtml(QTextEdit* self, struct miqt_string* text); -void QTextEdit_Append(QTextEdit* self, struct miqt_string* text); -void QTextEdit_ScrollToAnchor(QTextEdit* self, struct miqt_string* name); +void QTextEdit_InsertPlainText(QTextEdit* self, struct miqt_string text); +void QTextEdit_InsertHtml(QTextEdit* self, struct miqt_string text); +void QTextEdit_Append(QTextEdit* self, struct miqt_string text); +void QTextEdit_ScrollToAnchor(QTextEdit* self, struct miqt_string name); void QTextEdit_ZoomIn(QTextEdit* self); void QTextEdit_ZoomOut(QTextEdit* self); void QTextEdit_TextChanged(QTextEdit* self); @@ -170,14 +170,14 @@ void QTextEdit_SelectionChanged(QTextEdit* self); void QTextEdit_connect_SelectionChanged(QTextEdit* self, intptr_t slot); void QTextEdit_CursorPositionChanged(QTextEdit* self); void QTextEdit_connect_CursorPositionChanged(QTextEdit* self, intptr_t slot); -struct miqt_string* QTextEdit_Tr2(const char* s, const char* c); -struct miqt_string* QTextEdit_Tr3(const char* s, const char* c, int n); -struct miqt_string* QTextEdit_TrUtf82(const char* s, const char* c); -struct miqt_string* QTextEdit_TrUtf83(const char* s, const char* c, int n); -bool QTextEdit_Find22(QTextEdit* self, struct miqt_string* exp, int options); +struct miqt_string QTextEdit_Tr2(const char* s, const char* c); +struct miqt_string QTextEdit_Tr3(const char* s, const char* c, int n); +struct miqt_string QTextEdit_TrUtf82(const char* s, const char* c); +struct miqt_string QTextEdit_TrUtf83(const char* s, const char* c, int n); +bool QTextEdit_Find22(QTextEdit* self, struct miqt_string exp, int options); bool QTextEdit_Find23(QTextEdit* self, QRegExp* exp, int options); bool QTextEdit_Find24(QTextEdit* self, QRegularExpression* exp, int options); -struct miqt_string* QTextEdit_ToMarkdown1(const QTextEdit* self, int features); +struct miqt_string QTextEdit_ToMarkdown1(const QTextEdit* self, int features); void QTextEdit_MoveCursor2(QTextEdit* self, int operation, int mode); void QTextEdit_ZoomIn1(QTextEdit* self, int rangeVal); void QTextEdit_ZoomOut1(QTextEdit* self, int rangeVal); diff --git a/qt/gen_qtextformat.cpp b/qt/gen_qtextformat.cpp index 46942565..7c74a9e8 100644 --- a/qt/gen_qtextformat.cpp +++ b/qt/gen_qtextformat.cpp @@ -133,11 +133,15 @@ double QTextFormat_DoubleProperty(const QTextFormat* self, int propertyId) { return static_cast(_ret); } -struct miqt_string* QTextFormat_StringProperty(const QTextFormat* self, int propertyId) { +struct miqt_string QTextFormat_StringProperty(const QTextFormat* self, int propertyId) { QString _ret = self->stringProperty(static_cast(propertyId)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QColor* QTextFormat_ColorProperty(const QTextFormat* self, int propertyId) { @@ -316,24 +320,28 @@ QFont* QTextCharFormat_Font(const QTextCharFormat* self) { return new QFont(self->font()); } -void QTextCharFormat_SetFontFamily(QTextCharFormat* self, struct miqt_string* family) { - QString family_QString = QString::fromUtf8(&family->data, family->len); +void QTextCharFormat_SetFontFamily(QTextCharFormat* self, struct miqt_string family) { + QString family_QString = QString::fromUtf8(family.data, family.len); self->setFontFamily(family_QString); } -struct miqt_string* QTextCharFormat_FontFamily(const QTextCharFormat* self) { +struct miqt_string QTextCharFormat_FontFamily(const QTextCharFormat* self) { QString _ret = self->fontFamily(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QTextCharFormat_SetFontFamilies(QTextCharFormat* self, struct miqt_array* /* of struct miqt_string* */ families) { +void QTextCharFormat_SetFontFamilies(QTextCharFormat* self, struct miqt_array* /* of struct miqt_string */ families) { QStringList families_QList; families_QList.reserve(families->len); - struct miqt_string** families_arr = static_cast(families->data); + struct miqt_string* families_arr = static_cast(families->data); for(size_t i = 0; i < families->len; ++i) { - QString families_arr_i_QString = QString::fromUtf8(&families_arr[i]->data, families_arr[i]->len); + QString families_arr_i_QString = QString::fromUtf8(families_arr[i].data, families_arr[i].len); families_QList.push_back(families_arr_i_QString); } self->setFontFamilies(families_QList); @@ -343,8 +351,8 @@ QVariant* QTextCharFormat_FontFamilies(const QTextCharFormat* self) { return new QVariant(self->fontFamilies()); } -void QTextCharFormat_SetFontStyleName(QTextCharFormat* self, struct miqt_string* styleName) { - QString styleName_QString = QString::fromUtf8(&styleName->data, styleName->len); +void QTextCharFormat_SetFontStyleName(QTextCharFormat* self, struct miqt_string styleName) { + QString styleName_QString = QString::fromUtf8(styleName.data, styleName.len); self->setFontStyleName(styleName_QString); } @@ -522,16 +530,20 @@ QPen* QTextCharFormat_TextOutline(const QTextCharFormat* self) { return new QPen(self->textOutline()); } -void QTextCharFormat_SetToolTip(QTextCharFormat* self, struct miqt_string* tip) { - QString tip_QString = QString::fromUtf8(&tip->data, tip->len); +void QTextCharFormat_SetToolTip(QTextCharFormat* self, struct miqt_string tip) { + QString tip_QString = QString::fromUtf8(tip.data, tip.len); self->setToolTip(tip_QString); } -struct miqt_string* QTextCharFormat_ToolTip(const QTextCharFormat* self) { +struct miqt_string QTextCharFormat_ToolTip(const QTextCharFormat* self) { QString _ret = self->toolTip(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QTextCharFormat_SetAnchor(QTextCharFormat* self, bool anchor) { @@ -542,36 +554,44 @@ bool QTextCharFormat_IsAnchor(const QTextCharFormat* self) { return self->isAnchor(); } -void QTextCharFormat_SetAnchorHref(QTextCharFormat* self, struct miqt_string* value) { - QString value_QString = QString::fromUtf8(&value->data, value->len); +void QTextCharFormat_SetAnchorHref(QTextCharFormat* self, struct miqt_string value) { + QString value_QString = QString::fromUtf8(value.data, value.len); self->setAnchorHref(value_QString); } -struct miqt_string* QTextCharFormat_AnchorHref(const QTextCharFormat* self) { +struct miqt_string QTextCharFormat_AnchorHref(const QTextCharFormat* self) { QString _ret = self->anchorHref(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QTextCharFormat_SetAnchorName(QTextCharFormat* self, struct miqt_string* name) { - QString name_QString = QString::fromUtf8(&name->data, name->len); +void QTextCharFormat_SetAnchorName(QTextCharFormat* self, struct miqt_string name) { + QString name_QString = QString::fromUtf8(name.data, name.len); self->setAnchorName(name_QString); } -struct miqt_string* QTextCharFormat_AnchorName(const QTextCharFormat* self) { +struct miqt_string QTextCharFormat_AnchorName(const QTextCharFormat* self) { QString _ret = self->anchorName(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QTextCharFormat_SetAnchorNames(QTextCharFormat* self, struct miqt_array* /* of struct miqt_string* */ names) { +void QTextCharFormat_SetAnchorNames(QTextCharFormat* self, struct miqt_array* /* of struct miqt_string */ names) { QStringList names_QList; names_QList.reserve(names->len); - struct miqt_string** names_arr = static_cast(names->data); + struct miqt_string* names_arr = static_cast(names->data); for(size_t i = 0; i < names->len; ++i) { - QString names_arr_i_QString = QString::fromUtf8(&names_arr[i]->data, names_arr[i]->len); + QString names_arr_i_QString = QString::fromUtf8(names_arr[i].data, names_arr[i].len); names_QList.push_back(names_arr_i_QString); } self->setAnchorNames(names_QList); @@ -580,12 +600,16 @@ void QTextCharFormat_SetAnchorNames(QTextCharFormat* self, struct miqt_array* /* struct miqt_array* QTextCharFormat_AnchorNames(const QTextCharFormat* self) { QStringList _ret = self->anchorNames(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -799,28 +823,36 @@ int QTextListFormat_Indent(const QTextListFormat* self) { return self->indent(); } -void QTextListFormat_SetNumberPrefix(QTextListFormat* self, struct miqt_string* numberPrefix) { - QString numberPrefix_QString = QString::fromUtf8(&numberPrefix->data, numberPrefix->len); +void QTextListFormat_SetNumberPrefix(QTextListFormat* self, struct miqt_string numberPrefix) { + QString numberPrefix_QString = QString::fromUtf8(numberPrefix.data, numberPrefix.len); self->setNumberPrefix(numberPrefix_QString); } -struct miqt_string* QTextListFormat_NumberPrefix(const QTextListFormat* self) { +struct miqt_string QTextListFormat_NumberPrefix(const QTextListFormat* self) { QString _ret = self->numberPrefix(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QTextListFormat_SetNumberSuffix(QTextListFormat* self, struct miqt_string* numberSuffix) { - QString numberSuffix_QString = QString::fromUtf8(&numberSuffix->data, numberSuffix->len); +void QTextListFormat_SetNumberSuffix(QTextListFormat* self, struct miqt_string numberSuffix) { + QString numberSuffix_QString = QString::fromUtf8(numberSuffix.data, numberSuffix.len); self->setNumberSuffix(numberSuffix_QString); } -struct miqt_string* QTextListFormat_NumberSuffix(const QTextListFormat* self) { +struct miqt_string QTextListFormat_NumberSuffix(const QTextListFormat* self) { QString _ret = self->numberSuffix(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QTextListFormat_Delete(QTextListFormat* self) { @@ -835,16 +867,20 @@ bool QTextImageFormat_IsValid(const QTextImageFormat* self) { return self->isValid(); } -void QTextImageFormat_SetName(QTextImageFormat* self, struct miqt_string* name) { - QString name_QString = QString::fromUtf8(&name->data, name->len); +void QTextImageFormat_SetName(QTextImageFormat* self, struct miqt_string name) { + QString name_QString = QString::fromUtf8(name.data, name.len); self->setName(name_QString); } -struct miqt_string* QTextImageFormat_Name(const QTextImageFormat* self) { +struct miqt_string QTextImageFormat_Name(const QTextImageFormat* self) { QString _ret = self->name(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QTextImageFormat_SetWidth(QTextImageFormat* self, double width) { diff --git a/qt/gen_qtextformat.go b/qt/gen_qtextformat.go index 60524903..57105794 100644 --- a/qt/gen_qtextformat.go +++ b/qt/gen_qtextformat.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -442,9 +441,9 @@ func (this *QTextFormat) DoubleProperty(propertyId int) float64 { } func (this *QTextFormat) StringProperty(propertyId int) string { - var _ms *C.struct_miqt_string = C.QTextFormat_StringProperty(this.h, (C.int)(propertyId)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextFormat_StringProperty(this.h, (C.int)(propertyId)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -713,26 +712,30 @@ func (this *QTextCharFormat) Font() *QFont { } func (this *QTextCharFormat) SetFontFamily(family string) { - family_ms := libmiqt.Strdupg(family) - defer C.free(family_ms) - C.QTextCharFormat_SetFontFamily(this.h, (*C.struct_miqt_string)(family_ms)) + family_ms := C.struct_miqt_string{} + family_ms.data = C.CString(family) + family_ms.len = C.size_t(len(family)) + defer C.free(unsafe.Pointer(family_ms.data)) + C.QTextCharFormat_SetFontFamily(this.h, family_ms) } func (this *QTextCharFormat) FontFamily() string { - var _ms *C.struct_miqt_string = C.QTextCharFormat_FontFamily(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextCharFormat_FontFamily(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QTextCharFormat) SetFontFamilies(families []string) { // For the C ABI, malloc a C array of raw pointers - families_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(families)))) + families_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(families)))) defer C.free(unsafe.Pointer(families_CArray)) for i := range families { - families_i_ms := libmiqt.Strdupg(families[i]) - defer C.free(families_i_ms) - families_CArray[i] = (*C.struct_miqt_string)(families_i_ms) + families_i_ms := C.struct_miqt_string{} + families_i_ms.data = C.CString(families[i]) + families_i_ms.len = C.size_t(len(families[i])) + defer C.free(unsafe.Pointer(families_i_ms.data)) + families_CArray[i] = families_i_ms } families_ma := &C.struct_miqt_array{len: C.size_t(len(families)), data: unsafe.Pointer(families_CArray)} defer runtime.KeepAlive(unsafe.Pointer(families_ma)) @@ -747,9 +750,11 @@ func (this *QTextCharFormat) FontFamilies() *QVariant { } func (this *QTextCharFormat) SetFontStyleName(styleName string) { - styleName_ms := libmiqt.Strdupg(styleName) - defer C.free(styleName_ms) - C.QTextCharFormat_SetFontStyleName(this.h, (*C.struct_miqt_string)(styleName_ms)) + styleName_ms := C.struct_miqt_string{} + styleName_ms.data = C.CString(styleName) + styleName_ms.len = C.size_t(len(styleName)) + defer C.free(unsafe.Pointer(styleName_ms.data)) + C.QTextCharFormat_SetFontStyleName(this.h, styleName_ms) } func (this *QTextCharFormat) FontStyleName() *QVariant { @@ -926,15 +931,17 @@ func (this *QTextCharFormat) TextOutline() *QPen { } func (this *QTextCharFormat) SetToolTip(tip string) { - tip_ms := libmiqt.Strdupg(tip) - defer C.free(tip_ms) - C.QTextCharFormat_SetToolTip(this.h, (*C.struct_miqt_string)(tip_ms)) + tip_ms := C.struct_miqt_string{} + tip_ms.data = C.CString(tip) + tip_ms.len = C.size_t(len(tip)) + defer C.free(unsafe.Pointer(tip_ms.data)) + C.QTextCharFormat_SetToolTip(this.h, tip_ms) } func (this *QTextCharFormat) ToolTip() string { - var _ms *C.struct_miqt_string = C.QTextCharFormat_ToolTip(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextCharFormat_ToolTip(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -947,39 +954,45 @@ func (this *QTextCharFormat) IsAnchor() bool { } func (this *QTextCharFormat) SetAnchorHref(value string) { - value_ms := libmiqt.Strdupg(value) - defer C.free(value_ms) - C.QTextCharFormat_SetAnchorHref(this.h, (*C.struct_miqt_string)(value_ms)) + value_ms := C.struct_miqt_string{} + value_ms.data = C.CString(value) + value_ms.len = C.size_t(len(value)) + defer C.free(unsafe.Pointer(value_ms.data)) + C.QTextCharFormat_SetAnchorHref(this.h, value_ms) } func (this *QTextCharFormat) AnchorHref() string { - var _ms *C.struct_miqt_string = C.QTextCharFormat_AnchorHref(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextCharFormat_AnchorHref(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QTextCharFormat) SetAnchorName(name string) { - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - C.QTextCharFormat_SetAnchorName(this.h, (*C.struct_miqt_string)(name_ms)) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + C.QTextCharFormat_SetAnchorName(this.h, name_ms) } func (this *QTextCharFormat) AnchorName() string { - var _ms *C.struct_miqt_string = C.QTextCharFormat_AnchorName(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextCharFormat_AnchorName(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QTextCharFormat) SetAnchorNames(names []string) { // For the C ABI, malloc a C array of raw pointers - names_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(names)))) + names_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(names)))) defer C.free(unsafe.Pointer(names_CArray)) for i := range names { - names_i_ms := libmiqt.Strdupg(names[i]) - defer C.free(names_i_ms) - names_CArray[i] = (*C.struct_miqt_string)(names_i_ms) + names_i_ms := C.struct_miqt_string{} + names_i_ms.data = C.CString(names[i]) + names_i_ms.len = C.size_t(len(names[i])) + defer C.free(unsafe.Pointer(names_i_ms.data)) + names_CArray[i] = names_i_ms } names_ma := &C.struct_miqt_array{len: C.size_t(len(names)), data: unsafe.Pointer(names_CArray)} defer runtime.KeepAlive(unsafe.Pointer(names_ma)) @@ -989,11 +1002,11 @@ func (this *QTextCharFormat) SetAnchorNames(names []string) { func (this *QTextCharFormat) AnchorNames() []string { var _ma *C.struct_miqt_array = C.QTextCharFormat_AnchorNames(this.h) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -1287,28 +1300,32 @@ func (this *QTextListFormat) Indent() int { } func (this *QTextListFormat) SetNumberPrefix(numberPrefix string) { - numberPrefix_ms := libmiqt.Strdupg(numberPrefix) - defer C.free(numberPrefix_ms) - C.QTextListFormat_SetNumberPrefix(this.h, (*C.struct_miqt_string)(numberPrefix_ms)) + numberPrefix_ms := C.struct_miqt_string{} + numberPrefix_ms.data = C.CString(numberPrefix) + numberPrefix_ms.len = C.size_t(len(numberPrefix)) + defer C.free(unsafe.Pointer(numberPrefix_ms.data)) + C.QTextListFormat_SetNumberPrefix(this.h, numberPrefix_ms) } func (this *QTextListFormat) NumberPrefix() string { - var _ms *C.struct_miqt_string = C.QTextListFormat_NumberPrefix(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextListFormat_NumberPrefix(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QTextListFormat) SetNumberSuffix(numberSuffix string) { - numberSuffix_ms := libmiqt.Strdupg(numberSuffix) - defer C.free(numberSuffix_ms) - C.QTextListFormat_SetNumberSuffix(this.h, (*C.struct_miqt_string)(numberSuffix_ms)) + numberSuffix_ms := C.struct_miqt_string{} + numberSuffix_ms.data = C.CString(numberSuffix) + numberSuffix_ms.len = C.size_t(len(numberSuffix)) + defer C.free(unsafe.Pointer(numberSuffix_ms.data)) + C.QTextListFormat_SetNumberSuffix(this.h, numberSuffix_ms) } func (this *QTextListFormat) NumberSuffix() string { - var _ms *C.struct_miqt_string = C.QTextListFormat_NumberSuffix(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextListFormat_NumberSuffix(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -1367,15 +1384,17 @@ func (this *QTextImageFormat) IsValid() bool { } func (this *QTextImageFormat) SetName(name string) { - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - C.QTextImageFormat_SetName(this.h, (*C.struct_miqt_string)(name_ms)) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + C.QTextImageFormat_SetName(this.h, name_ms) } func (this *QTextImageFormat) Name() string { - var _ms *C.struct_miqt_string = C.QTextImageFormat_Name(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextImageFormat_Name(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qtextformat.h b/qt/gen_qtextformat.h index 1903cec3..1e0e1eda 100644 --- a/qt/gen_qtextformat.h +++ b/qt/gen_qtextformat.h @@ -79,7 +79,7 @@ bool QTextFormat_HasProperty(const QTextFormat* self, int propertyId); bool QTextFormat_BoolProperty(const QTextFormat* self, int propertyId); int QTextFormat_IntProperty(const QTextFormat* self, int propertyId); double QTextFormat_DoubleProperty(const QTextFormat* self, int propertyId); -struct miqt_string* QTextFormat_StringProperty(const QTextFormat* self, int propertyId); +struct miqt_string QTextFormat_StringProperty(const QTextFormat* self, int propertyId); QColor* QTextFormat_ColorProperty(const QTextFormat* self, int propertyId); QPen* QTextFormat_PenProperty(const QTextFormat* self, int propertyId); QBrush* QTextFormat_BrushProperty(const QTextFormat* self, int propertyId); @@ -121,11 +121,11 @@ bool QTextCharFormat_IsValid(const QTextCharFormat* self); void QTextCharFormat_SetFont(QTextCharFormat* self, QFont* font, int behavior); void QTextCharFormat_SetFontWithFont(QTextCharFormat* self, QFont* font); QFont* QTextCharFormat_Font(const QTextCharFormat* self); -void QTextCharFormat_SetFontFamily(QTextCharFormat* self, struct miqt_string* family); -struct miqt_string* QTextCharFormat_FontFamily(const QTextCharFormat* self); -void QTextCharFormat_SetFontFamilies(QTextCharFormat* self, struct miqt_array* /* of struct miqt_string* */ families); +void QTextCharFormat_SetFontFamily(QTextCharFormat* self, struct miqt_string family); +struct miqt_string QTextCharFormat_FontFamily(const QTextCharFormat* self); +void QTextCharFormat_SetFontFamilies(QTextCharFormat* self, struct miqt_array* /* of struct miqt_string */ families); QVariant* QTextCharFormat_FontFamilies(const QTextCharFormat* self); -void QTextCharFormat_SetFontStyleName(QTextCharFormat* self, struct miqt_string* styleName); +void QTextCharFormat_SetFontStyleName(QTextCharFormat* self, struct miqt_string styleName); QVariant* QTextCharFormat_FontStyleName(const QTextCharFormat* self); void QTextCharFormat_SetFontPointSize(QTextCharFormat* self, double size); double QTextCharFormat_FontPointSize(const QTextCharFormat* self); @@ -167,15 +167,15 @@ void QTextCharFormat_SetVerticalAlignment(QTextCharFormat* self, int alignment); int QTextCharFormat_VerticalAlignment(const QTextCharFormat* self); void QTextCharFormat_SetTextOutline(QTextCharFormat* self, QPen* pen); QPen* QTextCharFormat_TextOutline(const QTextCharFormat* self); -void QTextCharFormat_SetToolTip(QTextCharFormat* self, struct miqt_string* tip); -struct miqt_string* QTextCharFormat_ToolTip(const QTextCharFormat* self); +void QTextCharFormat_SetToolTip(QTextCharFormat* self, struct miqt_string tip); +struct miqt_string QTextCharFormat_ToolTip(const QTextCharFormat* self); void QTextCharFormat_SetAnchor(QTextCharFormat* self, bool anchor); bool QTextCharFormat_IsAnchor(const QTextCharFormat* self); -void QTextCharFormat_SetAnchorHref(QTextCharFormat* self, struct miqt_string* value); -struct miqt_string* QTextCharFormat_AnchorHref(const QTextCharFormat* self); -void QTextCharFormat_SetAnchorName(QTextCharFormat* self, struct miqt_string* name); -struct miqt_string* QTextCharFormat_AnchorName(const QTextCharFormat* self); -void QTextCharFormat_SetAnchorNames(QTextCharFormat* self, struct miqt_array* /* of struct miqt_string* */ names); +void QTextCharFormat_SetAnchorHref(QTextCharFormat* self, struct miqt_string value); +struct miqt_string QTextCharFormat_AnchorHref(const QTextCharFormat* self); +void QTextCharFormat_SetAnchorName(QTextCharFormat* self, struct miqt_string name); +struct miqt_string QTextCharFormat_AnchorName(const QTextCharFormat* self); +void QTextCharFormat_SetAnchorNames(QTextCharFormat* self, struct miqt_array* /* of struct miqt_string */ names); struct miqt_array* QTextCharFormat_AnchorNames(const QTextCharFormat* self); void QTextCharFormat_SetTableCellRowSpan(QTextCharFormat* self, int tableCellRowSpan); int QTextCharFormat_TableCellRowSpan(const QTextCharFormat* self); @@ -224,16 +224,16 @@ void QTextListFormat_SetStyle(QTextListFormat* self, int style); int QTextListFormat_Style(const QTextListFormat* self); void QTextListFormat_SetIndent(QTextListFormat* self, int indent); int QTextListFormat_Indent(const QTextListFormat* self); -void QTextListFormat_SetNumberPrefix(QTextListFormat* self, struct miqt_string* numberPrefix); -struct miqt_string* QTextListFormat_NumberPrefix(const QTextListFormat* self); -void QTextListFormat_SetNumberSuffix(QTextListFormat* self, struct miqt_string* numberSuffix); -struct miqt_string* QTextListFormat_NumberSuffix(const QTextListFormat* self); +void QTextListFormat_SetNumberPrefix(QTextListFormat* self, struct miqt_string numberPrefix); +struct miqt_string QTextListFormat_NumberPrefix(const QTextListFormat* self); +void QTextListFormat_SetNumberSuffix(QTextListFormat* self, struct miqt_string numberSuffix); +struct miqt_string QTextListFormat_NumberSuffix(const QTextListFormat* self); void QTextListFormat_Delete(QTextListFormat* self); QTextImageFormat* QTextImageFormat_new(); bool QTextImageFormat_IsValid(const QTextImageFormat* self); -void QTextImageFormat_SetName(QTextImageFormat* self, struct miqt_string* name); -struct miqt_string* QTextImageFormat_Name(const QTextImageFormat* self); +void QTextImageFormat_SetName(QTextImageFormat* self, struct miqt_string name); +struct miqt_string QTextImageFormat_Name(const QTextImageFormat* self); void QTextImageFormat_SetWidth(QTextImageFormat* self, double width); double QTextImageFormat_Width(const QTextImageFormat* self); void QTextImageFormat_SetHeight(QTextImageFormat* self, double height); diff --git a/qt/gen_qtextlayout.cpp b/qt/gen_qtextlayout.cpp index 7b7550c1..d681d7fe 100644 --- a/qt/gen_qtextlayout.cpp +++ b/qt/gen_qtextlayout.cpp @@ -89,13 +89,13 @@ QTextLayout* QTextLayout_new() { return new QTextLayout(); } -QTextLayout* QTextLayout_new2(struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QTextLayout* QTextLayout_new2(struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QTextLayout(text_QString); } -QTextLayout* QTextLayout_new3(struct miqt_string* text, QFont* font) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QTextLayout* QTextLayout_new3(struct miqt_string text, QFont* font) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QTextLayout(text_QString, *font); } @@ -103,8 +103,8 @@ QTextLayout* QTextLayout_new4(QTextBlock* b) { return new QTextLayout(*b); } -QTextLayout* QTextLayout_new5(struct miqt_string* text, QFont* font, QPaintDevice* paintdevice) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QTextLayout* QTextLayout_new5(struct miqt_string text, QFont* font, QPaintDevice* paintdevice) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QTextLayout(text_QString, *font, paintdevice); } @@ -120,16 +120,20 @@ void QTextLayout_SetRawFont(QTextLayout* self, QRawFont* rawFont) { self->setRawFont(*rawFont); } -void QTextLayout_SetText(QTextLayout* self, struct miqt_string* stringVal) { - QString stringVal_QString = QString::fromUtf8(&stringVal->data, stringVal->len); +void QTextLayout_SetText(QTextLayout* self, struct miqt_string stringVal) { + QString stringVal_QString = QString::fromUtf8(stringVal.data, stringVal.len); self->setText(stringVal_QString); } -struct miqt_string* QTextLayout_Text(const QTextLayout* self) { +struct miqt_string QTextLayout_Text(const QTextLayout* self) { QString _ret = self->text(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QTextLayout_SetTextOption(QTextLayout* self, QTextOption* option) { @@ -142,8 +146,8 @@ QTextOption* QTextLayout_TextOption(const QTextLayout* self) { return const_cast(&_ret); } -void QTextLayout_SetPreeditArea(QTextLayout* self, int position, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QTextLayout_SetPreeditArea(QTextLayout* self, int position, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->setPreeditArea(static_cast(position), text_QString); } @@ -151,11 +155,15 @@ int QTextLayout_PreeditAreaPosition(const QTextLayout* self) { return self->preeditAreaPosition(); } -struct miqt_string* QTextLayout_PreeditAreaText(const QTextLayout* self) { +struct miqt_string QTextLayout_PreeditAreaText(const QTextLayout* self) { QString _ret = self->preeditAreaText(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QTextLayout_SetAdditionalFormats(QTextLayout* self, struct miqt_array* /* of QTextLayout__FormatRange* */ overrides) { diff --git a/qt/gen_qtextlayout.go b/qt/gen_qtextlayout.go index 7ca27295..372cc375 100644 --- a/qt/gen_qtextlayout.go +++ b/qt/gen_qtextlayout.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -179,17 +178,21 @@ func NewQTextLayout() *QTextLayout { // NewQTextLayout2 constructs a new QTextLayout object. func NewQTextLayout2(text string) *QTextLayout { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - ret := C.QTextLayout_new2((*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + ret := C.QTextLayout_new2(text_ms) return newQTextLayout(ret) } // NewQTextLayout3 constructs a new QTextLayout object. func NewQTextLayout3(text string, font *QFont) *QTextLayout { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - ret := C.QTextLayout_new3((*C.struct_miqt_string)(text_ms), font.cPointer()) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + ret := C.QTextLayout_new3(text_ms, font.cPointer()) return newQTextLayout(ret) } @@ -201,9 +204,11 @@ func NewQTextLayout4(b *QTextBlock) *QTextLayout { // NewQTextLayout5 constructs a new QTextLayout object. func NewQTextLayout5(text string, font *QFont, paintdevice *QPaintDevice) *QTextLayout { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - ret := C.QTextLayout_new5((*C.struct_miqt_string)(text_ms), font.cPointer(), paintdevice.cPointer()) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + ret := C.QTextLayout_new5(text_ms, font.cPointer(), paintdevice.cPointer()) return newQTextLayout(ret) } @@ -223,15 +228,17 @@ func (this *QTextLayout) SetRawFont(rawFont *QRawFont) { } func (this *QTextLayout) SetText(stringVal string) { - stringVal_ms := libmiqt.Strdupg(stringVal) - defer C.free(stringVal_ms) - C.QTextLayout_SetText(this.h, (*C.struct_miqt_string)(stringVal_ms)) + stringVal_ms := C.struct_miqt_string{} + stringVal_ms.data = C.CString(stringVal) + stringVal_ms.len = C.size_t(len(stringVal)) + defer C.free(unsafe.Pointer(stringVal_ms.data)) + C.QTextLayout_SetText(this.h, stringVal_ms) } func (this *QTextLayout) Text() string { - var _ms *C.struct_miqt_string = C.QTextLayout_Text(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextLayout_Text(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -244,9 +251,11 @@ func (this *QTextLayout) TextOption() *QTextOption { } func (this *QTextLayout) SetPreeditArea(position int, text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QTextLayout_SetPreeditArea(this.h, (C.int)(position), (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QTextLayout_SetPreeditArea(this.h, (C.int)(position), text_ms) } func (this *QTextLayout) PreeditAreaPosition() int { @@ -254,9 +263,9 @@ func (this *QTextLayout) PreeditAreaPosition() int { } func (this *QTextLayout) PreeditAreaText() string { - var _ms *C.struct_miqt_string = C.QTextLayout_PreeditAreaText(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextLayout_PreeditAreaText(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qtextlayout.h b/qt/gen_qtextlayout.h index dcdcf9b3..630022a3 100644 --- a/qt/gen_qtextlayout.h +++ b/qt/gen_qtextlayout.h @@ -66,20 +66,20 @@ QTextFormat* QTextInlineObject_Format(const QTextInlineObject* self); void QTextInlineObject_Delete(QTextInlineObject* self); QTextLayout* QTextLayout_new(); -QTextLayout* QTextLayout_new2(struct miqt_string* text); -QTextLayout* QTextLayout_new3(struct miqt_string* text, QFont* font); +QTextLayout* QTextLayout_new2(struct miqt_string text); +QTextLayout* QTextLayout_new3(struct miqt_string text, QFont* font); QTextLayout* QTextLayout_new4(QTextBlock* b); -QTextLayout* QTextLayout_new5(struct miqt_string* text, QFont* font, QPaintDevice* paintdevice); +QTextLayout* QTextLayout_new5(struct miqt_string text, QFont* font, QPaintDevice* paintdevice); void QTextLayout_SetFont(QTextLayout* self, QFont* f); QFont* QTextLayout_Font(const QTextLayout* self); void QTextLayout_SetRawFont(QTextLayout* self, QRawFont* rawFont); -void QTextLayout_SetText(QTextLayout* self, struct miqt_string* stringVal); -struct miqt_string* QTextLayout_Text(const QTextLayout* self); +void QTextLayout_SetText(QTextLayout* self, struct miqt_string stringVal); +struct miqt_string QTextLayout_Text(const QTextLayout* self); void QTextLayout_SetTextOption(QTextLayout* self, QTextOption* option); QTextOption* QTextLayout_TextOption(const QTextLayout* self); -void QTextLayout_SetPreeditArea(QTextLayout* self, int position, struct miqt_string* text); +void QTextLayout_SetPreeditArea(QTextLayout* self, int position, struct miqt_string text); int QTextLayout_PreeditAreaPosition(const QTextLayout* self); -struct miqt_string* QTextLayout_PreeditAreaText(const QTextLayout* self); +struct miqt_string QTextLayout_PreeditAreaText(const QTextLayout* self); void QTextLayout_SetAdditionalFormats(QTextLayout* self, struct miqt_array* /* of QTextLayout__FormatRange* */ overrides); struct miqt_array* QTextLayout_AdditionalFormats(const QTextLayout* self); void QTextLayout_ClearAdditionalFormats(QTextLayout* self); diff --git a/qt/gen_qtextlist.cpp b/qt/gen_qtextlist.cpp index 803287ea..262e1008 100644 --- a/qt/gen_qtextlist.cpp +++ b/qt/gen_qtextlist.cpp @@ -22,18 +22,26 @@ void* QTextList_Metacast(QTextList* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QTextList_Tr(const char* s) { +struct miqt_string QTextList_Tr(const char* s) { QString _ret = QTextList::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTextList_TrUtf8(const char* s) { +struct miqt_string QTextList_TrUtf8(const char* s) { QString _ret = QTextList::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QTextList_Count(const QTextList* self) { @@ -52,11 +60,15 @@ int QTextList_ItemNumber(const QTextList* self, QTextBlock* param1) { return self->itemNumber(*param1); } -struct miqt_string* QTextList_ItemText(const QTextList* self, QTextBlock* param1) { +struct miqt_string QTextList_ItemText(const QTextList* self, QTextBlock* param1) { QString _ret = self->itemText(*param1); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QTextList_RemoveItem(QTextList* self, int i) { @@ -79,32 +91,48 @@ QTextListFormat* QTextList_Format(const QTextList* self) { return new QTextListFormat(self->format()); } -struct miqt_string* QTextList_Tr2(const char* s, const char* c) { +struct miqt_string QTextList_Tr2(const char* s, const char* c) { QString _ret = QTextList::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTextList_Tr3(const char* s, const char* c, int n) { +struct miqt_string QTextList_Tr3(const char* s, const char* c, int n) { QString _ret = QTextList::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTextList_TrUtf82(const char* s, const char* c) { +struct miqt_string QTextList_TrUtf82(const char* s, const char* c) { QString _ret = QTextList::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTextList_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QTextList_TrUtf83(const char* s, const char* c, int n) { QString _ret = QTextList::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QTextList_Delete(QTextList* self) { diff --git a/qt/gen_qtextlist.go b/qt/gen_qtextlist.go index 0b16e612..3aabf720 100644 --- a/qt/gen_qtextlist.go +++ b/qt/gen_qtextlist.go @@ -56,24 +56,24 @@ func (this *QTextList) MetaObject() *QMetaObject { func (this *QTextList) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QTextList_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QTextList_Metacast(this.h, param1_Cstring)) } func QTextList_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTextList_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextList_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QTextList_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTextList_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextList_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -97,9 +97,9 @@ func (this *QTextList) ItemNumber(param1 *QTextBlock) int { } func (this *QTextList) ItemText(param1 *QTextBlock) string { - var _ms *C.struct_miqt_string = C.QTextList_ItemText(this.h, param1.cPointer()) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextList_ItemText(this.h, param1.cPointer()) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -131,9 +131,9 @@ func QTextList_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTextList_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextList_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -142,9 +142,9 @@ func QTextList_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTextList_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextList_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -153,9 +153,9 @@ func QTextList_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTextList_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextList_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -164,9 +164,9 @@ func QTextList_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTextList_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextList_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qtextlist.h b/qt/gen_qtextlist.h index 1d06242b..ff130def 100644 --- a/qt/gen_qtextlist.h +++ b/qt/gen_qtextlist.h @@ -30,22 +30,22 @@ typedef struct QTextListFormat QTextListFormat; QTextList* QTextList_new(QTextDocument* doc); QMetaObject* QTextList_MetaObject(const QTextList* self); void* QTextList_Metacast(QTextList* self, const char* param1); -struct miqt_string* QTextList_Tr(const char* s); -struct miqt_string* QTextList_TrUtf8(const char* s); +struct miqt_string QTextList_Tr(const char* s); +struct miqt_string QTextList_TrUtf8(const char* s); int QTextList_Count(const QTextList* self); bool QTextList_IsEmpty(const QTextList* self); QTextBlock* QTextList_Item(const QTextList* self, int i); int QTextList_ItemNumber(const QTextList* self, QTextBlock* param1); -struct miqt_string* QTextList_ItemText(const QTextList* self, QTextBlock* param1); +struct miqt_string QTextList_ItemText(const QTextList* self, QTextBlock* param1); void QTextList_RemoveItem(QTextList* self, int i); void QTextList_Remove(QTextList* self, QTextBlock* param1); void QTextList_Add(QTextList* self, QTextBlock* block); void QTextList_SetFormat(QTextList* self, QTextListFormat* format); QTextListFormat* QTextList_Format(const QTextList* self); -struct miqt_string* QTextList_Tr2(const char* s, const char* c); -struct miqt_string* QTextList_Tr3(const char* s, const char* c, int n); -struct miqt_string* QTextList_TrUtf82(const char* s, const char* c); -struct miqt_string* QTextList_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QTextList_Tr2(const char* s, const char* c); +struct miqt_string QTextList_Tr3(const char* s, const char* c, int n); +struct miqt_string QTextList_TrUtf82(const char* s, const char* c); +struct miqt_string QTextList_TrUtf83(const char* s, const char* c, int n); void QTextList_Delete(QTextList* self); #ifdef __cplusplus diff --git a/qt/gen_qtextobject.cpp b/qt/gen_qtextobject.cpp index 3d80a9cb..4c552538 100644 --- a/qt/gen_qtextobject.cpp +++ b/qt/gen_qtextobject.cpp @@ -34,18 +34,26 @@ void* QTextObject_Metacast(QTextObject* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QTextObject_Tr(const char* s) { +struct miqt_string QTextObject_Tr(const char* s) { QString _ret = QTextObject::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTextObject_TrUtf8(const char* s) { +struct miqt_string QTextObject_TrUtf8(const char* s) { QString _ret = QTextObject::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QTextFormat* QTextObject_Format(const QTextObject* self) { @@ -64,32 +72,48 @@ int QTextObject_ObjectIndex(const QTextObject* self) { return self->objectIndex(); } -struct miqt_string* QTextObject_Tr2(const char* s, const char* c) { +struct miqt_string QTextObject_Tr2(const char* s, const char* c) { QString _ret = QTextObject::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTextObject_Tr3(const char* s, const char* c, int n) { +struct miqt_string QTextObject_Tr3(const char* s, const char* c, int n) { QString _ret = QTextObject::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTextObject_TrUtf82(const char* s, const char* c) { +struct miqt_string QTextObject_TrUtf82(const char* s, const char* c) { QString _ret = QTextObject::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTextObject_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QTextObject_TrUtf83(const char* s, const char* c, int n) { QString _ret = QTextObject::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QMetaObject* QTextBlockGroup_MetaObject(const QTextBlockGroup* self) { @@ -100,46 +124,70 @@ void* QTextBlockGroup_Metacast(QTextBlockGroup* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QTextBlockGroup_Tr(const char* s) { +struct miqt_string QTextBlockGroup_Tr(const char* s) { QString _ret = QTextBlockGroup::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTextBlockGroup_TrUtf8(const char* s) { +struct miqt_string QTextBlockGroup_TrUtf8(const char* s) { QString _ret = QTextBlockGroup::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTextBlockGroup_Tr2(const char* s, const char* c) { +struct miqt_string QTextBlockGroup_Tr2(const char* s, const char* c) { QString _ret = QTextBlockGroup::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTextBlockGroup_Tr3(const char* s, const char* c, int n) { +struct miqt_string QTextBlockGroup_Tr3(const char* s, const char* c, int n) { QString _ret = QTextBlockGroup::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTextBlockGroup_TrUtf82(const char* s, const char* c) { +struct miqt_string QTextBlockGroup_TrUtf82(const char* s, const char* c) { QString _ret = QTextBlockGroup::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTextBlockGroup_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QTextBlockGroup_TrUtf83(const char* s, const char* c, int n) { QString _ret = QTextBlockGroup::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QTextFrameLayoutData_OperatorAssign(QTextFrameLayoutData* self, QTextFrameLayoutData* param1) { @@ -162,18 +210,26 @@ void* QTextFrame_Metacast(QTextFrame* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QTextFrame_Tr(const char* s) { +struct miqt_string QTextFrame_Tr(const char* s) { QString _ret = QTextFrame::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTextFrame_TrUtf8(const char* s) { +struct miqt_string QTextFrame_TrUtf8(const char* s) { QString _ret = QTextFrame::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QTextFrame_SetFrameFormat(QTextFrame* self, QTextFrameFormat* format) { @@ -233,32 +289,48 @@ QTextFrame__iterator* QTextFrame_End(const QTextFrame* self) { return new QTextFrame::iterator(self->end()); } -struct miqt_string* QTextFrame_Tr2(const char* s, const char* c) { +struct miqt_string QTextFrame_Tr2(const char* s, const char* c) { QString _ret = QTextFrame::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTextFrame_Tr3(const char* s, const char* c, int n) { +struct miqt_string QTextFrame_Tr3(const char* s, const char* c, int n) { QString _ret = QTextFrame::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTextFrame_TrUtf82(const char* s, const char* c) { +struct miqt_string QTextFrame_TrUtf82(const char* s, const char* c) { QString _ret = QTextFrame::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTextFrame_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QTextFrame_TrUtf83(const char* s, const char* c, int n) { QString _ret = QTextFrame::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QTextFrame_Delete(QTextFrame* self) { @@ -342,11 +414,15 @@ int QTextBlock_TextDirection(const QTextBlock* self) { return static_cast(_ret); } -struct miqt_string* QTextBlock_Text(const QTextBlock* self) { +struct miqt_string QTextBlock_Text(const QTextBlock* self) { QString _ret = self->text(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } struct miqt_array* QTextBlock_TextFormats(const QTextBlock* self) { @@ -490,11 +566,15 @@ int QTextFragment_CharFormatIndex(const QTextFragment* self) { return self->charFormatIndex(); } -struct miqt_string* QTextFragment_Text(const QTextFragment* self) { +struct miqt_string QTextFragment_Text(const QTextFragment* self) { QString _ret = self->text(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } struct miqt_array* QTextFragment_GlyphRuns(const QTextFragment* self) { diff --git a/qt/gen_qtextobject.go b/qt/gen_qtextobject.go index 3d04f08b..9c0099b6 100644 --- a/qt/gen_qtextobject.go +++ b/qt/gen_qtextobject.go @@ -50,24 +50,24 @@ func (this *QTextObject) MetaObject() *QMetaObject { func (this *QTextObject) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QTextObject_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QTextObject_Metacast(this.h, param1_Cstring)) } func QTextObject_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTextObject_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextObject_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QTextObject_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTextObject_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextObject_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -95,9 +95,9 @@ func QTextObject_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTextObject_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextObject_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -106,9 +106,9 @@ func QTextObject_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTextObject_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextObject_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -117,9 +117,9 @@ func QTextObject_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTextObject_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextObject_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -128,9 +128,9 @@ func QTextObject_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTextObject_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextObject_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -171,24 +171,24 @@ func (this *QTextBlockGroup) MetaObject() *QMetaObject { func (this *QTextBlockGroup) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QTextBlockGroup_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QTextBlockGroup_Metacast(this.h, param1_Cstring)) } func QTextBlockGroup_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTextBlockGroup_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextBlockGroup_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QTextBlockGroup_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTextBlockGroup_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextBlockGroup_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -197,9 +197,9 @@ func QTextBlockGroup_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTextBlockGroup_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextBlockGroup_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -208,9 +208,9 @@ func QTextBlockGroup_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTextBlockGroup_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextBlockGroup_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -219,9 +219,9 @@ func QTextBlockGroup_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTextBlockGroup_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextBlockGroup_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -230,9 +230,9 @@ func QTextBlockGroup_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTextBlockGroup_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextBlockGroup_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -326,24 +326,24 @@ func (this *QTextFrame) MetaObject() *QMetaObject { func (this *QTextFrame) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QTextFrame_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QTextFrame_Metacast(this.h, param1_Cstring)) } func QTextFrame_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTextFrame_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextFrame_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QTextFrame_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTextFrame_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextFrame_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -422,9 +422,9 @@ func QTextFrame_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTextFrame_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextFrame_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -433,9 +433,9 @@ func QTextFrame_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTextFrame_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextFrame_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -444,9 +444,9 @@ func QTextFrame_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTextFrame_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextFrame_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -455,9 +455,9 @@ func QTextFrame_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTextFrame_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextFrame_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -630,9 +630,9 @@ func (this *QTextBlock) TextDirection() LayoutDirection { } func (this *QTextBlock) Text() string { - var _ms *C.struct_miqt_string = C.QTextBlock_Text(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextBlock_Text(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -837,9 +837,9 @@ func (this *QTextFragment) CharFormatIndex() int { } func (this *QTextFragment) Text() string { - var _ms *C.struct_miqt_string = C.QTextFragment_Text(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextFragment_Text(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qtextobject.h b/qt/gen_qtextobject.h index ec8a73ce..63d3d3b6 100644 --- a/qt/gen_qtextobject.h +++ b/qt/gen_qtextobject.h @@ -71,25 +71,25 @@ typedef struct QTextObject QTextObject; QMetaObject* QTextObject_MetaObject(const QTextObject* self); void* QTextObject_Metacast(QTextObject* self, const char* param1); -struct miqt_string* QTextObject_Tr(const char* s); -struct miqt_string* QTextObject_TrUtf8(const char* s); +struct miqt_string QTextObject_Tr(const char* s); +struct miqt_string QTextObject_TrUtf8(const char* s); QTextFormat* QTextObject_Format(const QTextObject* self); int QTextObject_FormatIndex(const QTextObject* self); QTextDocument* QTextObject_Document(const QTextObject* self); int QTextObject_ObjectIndex(const QTextObject* self); -struct miqt_string* QTextObject_Tr2(const char* s, const char* c); -struct miqt_string* QTextObject_Tr3(const char* s, const char* c, int n); -struct miqt_string* QTextObject_TrUtf82(const char* s, const char* c); -struct miqt_string* QTextObject_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QTextObject_Tr2(const char* s, const char* c); +struct miqt_string QTextObject_Tr3(const char* s, const char* c, int n); +struct miqt_string QTextObject_TrUtf82(const char* s, const char* c); +struct miqt_string QTextObject_TrUtf83(const char* s, const char* c, int n); QMetaObject* QTextBlockGroup_MetaObject(const QTextBlockGroup* self); void* QTextBlockGroup_Metacast(QTextBlockGroup* self, const char* param1); -struct miqt_string* QTextBlockGroup_Tr(const char* s); -struct miqt_string* QTextBlockGroup_TrUtf8(const char* s); -struct miqt_string* QTextBlockGroup_Tr2(const char* s, const char* c); -struct miqt_string* QTextBlockGroup_Tr3(const char* s, const char* c, int n); -struct miqt_string* QTextBlockGroup_TrUtf82(const char* s, const char* c); -struct miqt_string* QTextBlockGroup_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QTextBlockGroup_Tr(const char* s); +struct miqt_string QTextBlockGroup_TrUtf8(const char* s); +struct miqt_string QTextBlockGroup_Tr2(const char* s, const char* c); +struct miqt_string QTextBlockGroup_Tr3(const char* s, const char* c, int n); +struct miqt_string QTextBlockGroup_TrUtf82(const char* s, const char* c); +struct miqt_string QTextBlockGroup_TrUtf83(const char* s, const char* c, int n); void QTextFrameLayoutData_OperatorAssign(QTextFrameLayoutData* self, QTextFrameLayoutData* param1); void QTextFrameLayoutData_Delete(QTextFrameLayoutData* self); @@ -97,8 +97,8 @@ void QTextFrameLayoutData_Delete(QTextFrameLayoutData* self); QTextFrame* QTextFrame_new(QTextDocument* doc); QMetaObject* QTextFrame_MetaObject(const QTextFrame* self); void* QTextFrame_Metacast(QTextFrame* self, const char* param1); -struct miqt_string* QTextFrame_Tr(const char* s); -struct miqt_string* QTextFrame_TrUtf8(const char* s); +struct miqt_string QTextFrame_Tr(const char* s); +struct miqt_string QTextFrame_TrUtf8(const char* s); void QTextFrame_SetFrameFormat(QTextFrame* self, QTextFrameFormat* format); QTextFrameFormat* QTextFrame_FrameFormat(const QTextFrame* self); QTextCursor* QTextFrame_FirstCursorPosition(const QTextFrame* self); @@ -111,10 +111,10 @@ struct miqt_array* QTextFrame_ChildFrames(const QTextFrame* self); QTextFrame* QTextFrame_ParentFrame(const QTextFrame* self); QTextFrame__iterator* QTextFrame_Begin(const QTextFrame* self); QTextFrame__iterator* QTextFrame_End(const QTextFrame* self); -struct miqt_string* QTextFrame_Tr2(const char* s, const char* c); -struct miqt_string* QTextFrame_Tr3(const char* s, const char* c, int n); -struct miqt_string* QTextFrame_TrUtf82(const char* s, const char* c); -struct miqt_string* QTextFrame_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QTextFrame_Tr2(const char* s, const char* c); +struct miqt_string QTextFrame_Tr3(const char* s, const char* c, int n); +struct miqt_string QTextFrame_TrUtf82(const char* s, const char* c); +struct miqt_string QTextFrame_TrUtf83(const char* s, const char* c, int n); void QTextFrame_Delete(QTextFrame* self); void QTextBlockUserData_OperatorAssign(QTextBlockUserData* self, QTextBlockUserData* param1); @@ -137,7 +137,7 @@ int QTextBlock_BlockFormatIndex(const QTextBlock* self); QTextCharFormat* QTextBlock_CharFormat(const QTextBlock* self); int QTextBlock_CharFormatIndex(const QTextBlock* self); int QTextBlock_TextDirection(const QTextBlock* self); -struct miqt_string* QTextBlock_Text(const QTextBlock* self); +struct miqt_string QTextBlock_Text(const QTextBlock* self); struct miqt_array* QTextBlock_TextFormats(const QTextBlock* self); QTextDocument* QTextBlock_Document(const QTextBlock* self); QTextList* QTextBlock_TextList(const QTextBlock* self); @@ -172,7 +172,7 @@ int QTextFragment_Length(const QTextFragment* self); bool QTextFragment_Contains(const QTextFragment* self, int position); QTextCharFormat* QTextFragment_CharFormat(const QTextFragment* self); int QTextFragment_CharFormatIndex(const QTextFragment* self); -struct miqt_string* QTextFragment_Text(const QTextFragment* self); +struct miqt_string QTextFragment_Text(const QTextFragment* self); struct miqt_array* QTextFragment_GlyphRuns(const QTextFragment* self); struct miqt_array* QTextFragment_GlyphRuns1(const QTextFragment* self, int from); struct miqt_array* QTextFragment_GlyphRuns2(const QTextFragment* self, int from, int length); diff --git a/qt/gen_qtextstream.cpp b/qt/gen_qtextstream.cpp index f9aa1047..54dc2ef6 100644 --- a/qt/gen_qtextstream.cpp +++ b/qt/gen_qtextstream.cpp @@ -19,20 +19,14 @@ QTextStream* QTextStream_new2(QIODevice* device) { return new QTextStream(device); } -QTextStream* QTextStream_new3(QByteArray* array) { - return new QTextStream(array); +QTextStream* QTextStream_new3(struct miqt_string array) { + QByteArray array_QByteArray(array.data, array.len); + return new QTextStream(array_QByteArray); } -QTextStream* QTextStream_new4(QByteArray* array) { - return new QTextStream(*array); -} - -QTextStream* QTextStream_new5(QByteArray* array, int openMode) { - return new QTextStream(array, static_cast(openMode)); -} - -QTextStream* QTextStream_new6(QByteArray* array, int openMode) { - return new QTextStream(*array, static_cast(openMode)); +QTextStream* QTextStream_new4(struct miqt_string array, int openMode) { + QByteArray array_QByteArray(array.data, array.len); + return new QTextStream(array_QByteArray, static_cast(openMode)); } void QTextStream_SetCodec(QTextStream* self, QTextCodec* codec) { @@ -79,11 +73,15 @@ QIODevice* QTextStream_Device(const QTextStream* self) { return self->device(); } -struct miqt_string* QTextStream_String(const QTextStream* self) { +struct miqt_string QTextStream_String(const QTextStream* self) { QString* _ret = self->string(); // Convert QString pointer from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret->toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QTextStream_Status(const QTextStream* self) { @@ -124,25 +122,37 @@ void QTextStream_SkipWhiteSpace(QTextStream* self) { self->skipWhiteSpace(); } -struct miqt_string* QTextStream_ReadLine(QTextStream* self) { +struct miqt_string QTextStream_ReadLine(QTextStream* self) { QString _ret = self->readLine(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTextStream_ReadAll(QTextStream* self) { +struct miqt_string QTextStream_ReadAll(QTextStream* self) { QString _ret = self->readAll(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTextStream_Read(QTextStream* self, long long maxlen) { +struct miqt_string QTextStream_Read(QTextStream* self, long long maxlen) { QString _ret = self->read(static_cast(maxlen)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QTextStream_SetFieldAlignment(QTextStream* self, int alignment) { @@ -276,15 +286,16 @@ QTextStream* QTextStream_OperatorShiftRightWithDouble(QTextStream* self, double* return &_ret; } -QTextStream* QTextStream_OperatorShiftRightWithQString(QTextStream* self, struct miqt_string* s) { - QString s_QString = QString::fromUtf8(&s->data, s->len); +QTextStream* QTextStream_OperatorShiftRightWithQString(QTextStream* self, struct miqt_string s) { + QString s_QString = QString::fromUtf8(s.data, s.len); QTextStream& _ret = self->operator>>(s_QString); // Cast returned reference into pointer return &_ret; } -QTextStream* QTextStream_OperatorShiftRightWithArray(QTextStream* self, QByteArray* array) { - QTextStream& _ret = self->operator>>(*array); +QTextStream* QTextStream_OperatorShiftRightWithArray(QTextStream* self, struct miqt_string array) { + QByteArray array_QByteArray(array.data, array.len); + QTextStream& _ret = self->operator>>(array_QByteArray); // Cast returned reference into pointer return &_ret; } @@ -367,15 +378,16 @@ QTextStream* QTextStream_OperatorShiftLeftWithDouble(QTextStream* self, double f return &_ret; } -QTextStream* QTextStream_OperatorShiftLeftWithQString(QTextStream* self, struct miqt_string* s) { - QString s_QString = QString::fromUtf8(&s->data, s->len); +QTextStream* QTextStream_OperatorShiftLeftWithQString(QTextStream* self, struct miqt_string s) { + QString s_QString = QString::fromUtf8(s.data, s.len); QTextStream& _ret = self->operator<<(s_QString); // Cast returned reference into pointer return &_ret; } -QTextStream* QTextStream_OperatorShiftLeftWithArray(QTextStream* self, QByteArray* array) { - QTextStream& _ret = self->operator<<(*array); +QTextStream* QTextStream_OperatorShiftLeftWithArray(QTextStream* self, struct miqt_string array) { + QByteArray array_QByteArray(array.data, array.len); + QTextStream& _ret = self->operator<<(array_QByteArray); // Cast returned reference into pointer return &_ret; } @@ -392,11 +404,15 @@ QTextStream* QTextStream_OperatorShiftLeftWithPtr(QTextStream* self, const void* return &_ret; } -struct miqt_string* QTextStream_ReadLine1(QTextStream* self, long long maxlen) { +struct miqt_string QTextStream_ReadLine1(QTextStream* self, long long maxlen) { QString _ret = self->readLine(static_cast(maxlen)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QTextStream_Delete(QTextStream* self) { diff --git a/qt/gen_qtextstream.go b/qt/gen_qtextstream.go index 8b84206b..d2beda62 100644 --- a/qt/gen_qtextstream.go +++ b/qt/gen_qtextstream.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -92,26 +91,20 @@ func NewQTextStream2(device *QIODevice) *QTextStream { } // NewQTextStream3 constructs a new QTextStream object. -func NewQTextStream3(array *QByteArray) *QTextStream { - ret := C.QTextStream_new3(array.cPointer()) +func NewQTextStream3(array []byte) *QTextStream { + array_alias := C.struct_miqt_string{} + array_alias.data = (*C.char)(unsafe.Pointer(&array[0])) + array_alias.len = C.size_t(len(array)) + ret := C.QTextStream_new3(array_alias) return newQTextStream(ret) } // NewQTextStream4 constructs a new QTextStream object. -func NewQTextStream4(array *QByteArray) *QTextStream { - ret := C.QTextStream_new4(array.cPointer()) - return newQTextStream(ret) -} - -// NewQTextStream5 constructs a new QTextStream object. -func NewQTextStream5(array *QByteArray, openMode QIODevice__OpenModeFlag) *QTextStream { - ret := C.QTextStream_new5(array.cPointer(), (C.int)(openMode)) - return newQTextStream(ret) -} - -// NewQTextStream6 constructs a new QTextStream object. -func NewQTextStream6(array *QByteArray, openMode QIODevice__OpenModeFlag) *QTextStream { - ret := C.QTextStream_new6(array.cPointer(), (C.int)(openMode)) +func NewQTextStream4(array []byte, openMode QIODevice__OpenModeFlag) *QTextStream { + array_alias := C.struct_miqt_string{} + array_alias.data = (*C.char)(unsafe.Pointer(&array[0])) + array_alias.len = C.size_t(len(array)) + ret := C.QTextStream_new4(array_alias, (C.int)(openMode)) return newQTextStream(ret) } @@ -165,9 +158,9 @@ func (this *QTextStream) Device() *QIODevice { } func (this *QTextStream) String() string { - var _ms *C.struct_miqt_string = C.QTextStream_String(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextStream_String(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -208,23 +201,23 @@ func (this *QTextStream) SkipWhiteSpace() { } func (this *QTextStream) ReadLine() string { - var _ms *C.struct_miqt_string = C.QTextStream_ReadLine(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextStream_ReadLine(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QTextStream) ReadAll() string { - var _ms *C.struct_miqt_string = C.QTextStream_ReadAll(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextStream_ReadAll(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QTextStream) Read(maxlen int64) string { - var _ms *C.struct_miqt_string = C.QTextStream_Read(this.h, (C.longlong)(maxlen)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextStream_Read(this.h, (C.longlong)(maxlen)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -336,13 +329,18 @@ func (this *QTextStream) OperatorShiftRightWithDouble(f *float64) *QTextStream { } func (this *QTextStream) OperatorShiftRightWithQString(s string) *QTextStream { - s_ms := libmiqt.Strdupg(s) - defer C.free(s_ms) - return UnsafeNewQTextStream(unsafe.Pointer(C.QTextStream_OperatorShiftRightWithQString(this.h, (*C.struct_miqt_string)(s_ms)))) + s_ms := C.struct_miqt_string{} + s_ms.data = C.CString(s) + s_ms.len = C.size_t(len(s)) + defer C.free(unsafe.Pointer(s_ms.data)) + return UnsafeNewQTextStream(unsafe.Pointer(C.QTextStream_OperatorShiftRightWithQString(this.h, s_ms))) } -func (this *QTextStream) OperatorShiftRightWithArray(array *QByteArray) *QTextStream { - return UnsafeNewQTextStream(unsafe.Pointer(C.QTextStream_OperatorShiftRightWithArray(this.h, array.cPointer()))) +func (this *QTextStream) OperatorShiftRightWithArray(array []byte) *QTextStream { + array_alias := C.struct_miqt_string{} + array_alias.data = (*C.char)(unsafe.Pointer(&array[0])) + array_alias.len = C.size_t(len(array)) + return UnsafeNewQTextStream(unsafe.Pointer(C.QTextStream_OperatorShiftRightWithArray(this.h, array_alias))) } func (this *QTextStream) OperatorShiftRightWithChar(c string) *QTextStream { @@ -400,13 +398,18 @@ func (this *QTextStream) OperatorShiftLeftWithDouble(f float64) *QTextStream { } func (this *QTextStream) OperatorShiftLeftWithQString(s string) *QTextStream { - s_ms := libmiqt.Strdupg(s) - defer C.free(s_ms) - return UnsafeNewQTextStream(unsafe.Pointer(C.QTextStream_OperatorShiftLeftWithQString(this.h, (*C.struct_miqt_string)(s_ms)))) + s_ms := C.struct_miqt_string{} + s_ms.data = C.CString(s) + s_ms.len = C.size_t(len(s)) + defer C.free(unsafe.Pointer(s_ms.data)) + return UnsafeNewQTextStream(unsafe.Pointer(C.QTextStream_OperatorShiftLeftWithQString(this.h, s_ms))) } -func (this *QTextStream) OperatorShiftLeftWithArray(array *QByteArray) *QTextStream { - return UnsafeNewQTextStream(unsafe.Pointer(C.QTextStream_OperatorShiftLeftWithArray(this.h, array.cPointer()))) +func (this *QTextStream) OperatorShiftLeftWithArray(array []byte) *QTextStream { + array_alias := C.struct_miqt_string{} + array_alias.data = (*C.char)(unsafe.Pointer(&array[0])) + array_alias.len = C.size_t(len(array)) + return UnsafeNewQTextStream(unsafe.Pointer(C.QTextStream_OperatorShiftLeftWithArray(this.h, array_alias))) } func (this *QTextStream) OperatorShiftLeftWithChar(c string) *QTextStream { @@ -420,9 +423,9 @@ func (this *QTextStream) OperatorShiftLeftWithPtr(ptr unsafe.Pointer) *QTextStre } func (this *QTextStream) ReadLine1(maxlen int64) string { - var _ms *C.struct_miqt_string = C.QTextStream_ReadLine1(this.h, (C.longlong)(maxlen)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextStream_ReadLine1(this.h, (C.longlong)(maxlen)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qtextstream.h b/qt/gen_qtextstream.h index f8e2f5e6..ed0a8bc5 100644 --- a/qt/gen_qtextstream.h +++ b/qt/gen_qtextstream.h @@ -31,10 +31,8 @@ typedef struct QTextStream QTextStream; QTextStream* QTextStream_new(); QTextStream* QTextStream_new2(QIODevice* device); -QTextStream* QTextStream_new3(QByteArray* array); -QTextStream* QTextStream_new4(QByteArray* array); -QTextStream* QTextStream_new5(QByteArray* array, int openMode); -QTextStream* QTextStream_new6(QByteArray* array, int openMode); +QTextStream* QTextStream_new3(struct miqt_string array); +QTextStream* QTextStream_new4(struct miqt_string array, int openMode); void QTextStream_SetCodec(QTextStream* self, QTextCodec* codec); void QTextStream_SetCodecWithCodecName(QTextStream* self, const char* codecName); QTextCodec* QTextStream_Codec(const QTextStream* self); @@ -46,7 +44,7 @@ void QTextStream_SetLocale(QTextStream* self, QLocale* locale); QLocale* QTextStream_Locale(const QTextStream* self); void QTextStream_SetDevice(QTextStream* self, QIODevice* device); QIODevice* QTextStream_Device(const QTextStream* self); -struct miqt_string* QTextStream_String(const QTextStream* self); +struct miqt_string QTextStream_String(const QTextStream* self); int QTextStream_Status(const QTextStream* self); void QTextStream_SetStatus(QTextStream* self, int status); void QTextStream_ResetStatus(QTextStream* self); @@ -56,9 +54,9 @@ void QTextStream_Flush(QTextStream* self); bool QTextStream_Seek(QTextStream* self, long long pos); long long QTextStream_Pos(const QTextStream* self); void QTextStream_SkipWhiteSpace(QTextStream* self); -struct miqt_string* QTextStream_ReadLine(QTextStream* self); -struct miqt_string* QTextStream_ReadAll(QTextStream* self); -struct miqt_string* QTextStream_Read(QTextStream* self, long long maxlen); +struct miqt_string QTextStream_ReadLine(QTextStream* self); +struct miqt_string QTextStream_ReadAll(QTextStream* self); +struct miqt_string QTextStream_Read(QTextStream* self, long long maxlen); void QTextStream_SetFieldAlignment(QTextStream* self, int alignment); int QTextStream_FieldAlignment(const QTextStream* self); void QTextStream_SetPadChar(QTextStream* self, QChar* ch); @@ -85,8 +83,8 @@ QTextStream* QTextStream_OperatorShiftRightWithQlonglong(QTextStream* self, long QTextStream* QTextStream_OperatorShiftRightWithQulonglong(QTextStream* self, unsigned long long* i); QTextStream* QTextStream_OperatorShiftRightWithFloat(QTextStream* self, float* f); QTextStream* QTextStream_OperatorShiftRightWithDouble(QTextStream* self, double* f); -QTextStream* QTextStream_OperatorShiftRightWithQString(QTextStream* self, struct miqt_string* s); -QTextStream* QTextStream_OperatorShiftRightWithArray(QTextStream* self, QByteArray* array); +QTextStream* QTextStream_OperatorShiftRightWithQString(QTextStream* self, struct miqt_string s); +QTextStream* QTextStream_OperatorShiftRightWithArray(QTextStream* self, struct miqt_string array); QTextStream* QTextStream_OperatorShiftRightWithChar(QTextStream* self, char* c); QTextStream* QTextStream_OperatorShiftLeft(QTextStream* self, QChar* ch); QTextStream* QTextStream_OperatorShiftLeftWithCh(QTextStream* self, char ch); @@ -100,11 +98,11 @@ QTextStream* QTextStream_OperatorShiftLeftWithQlonglong(QTextStream* self, long QTextStream* QTextStream_OperatorShiftLeftWithQulonglong(QTextStream* self, unsigned long long i); QTextStream* QTextStream_OperatorShiftLeftWithFloat(QTextStream* self, float f); QTextStream* QTextStream_OperatorShiftLeftWithDouble(QTextStream* self, double f); -QTextStream* QTextStream_OperatorShiftLeftWithQString(QTextStream* self, struct miqt_string* s); -QTextStream* QTextStream_OperatorShiftLeftWithArray(QTextStream* self, QByteArray* array); +QTextStream* QTextStream_OperatorShiftLeftWithQString(QTextStream* self, struct miqt_string s); +QTextStream* QTextStream_OperatorShiftLeftWithArray(QTextStream* self, struct miqt_string array); QTextStream* QTextStream_OperatorShiftLeftWithChar(QTextStream* self, const char* c); QTextStream* QTextStream_OperatorShiftLeftWithPtr(QTextStream* self, const void* ptr); -struct miqt_string* QTextStream_ReadLine1(QTextStream* self, long long maxlen); +struct miqt_string QTextStream_ReadLine1(QTextStream* self, long long maxlen); void QTextStream_Delete(QTextStream* self); #ifdef __cplusplus diff --git a/qt/gen_qtexttable.cpp b/qt/gen_qtexttable.cpp index 96ed3655..10e6f678 100644 --- a/qt/gen_qtexttable.cpp +++ b/qt/gen_qtexttable.cpp @@ -105,18 +105,26 @@ void* QTextTable_Metacast(QTextTable* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QTextTable_Tr(const char* s) { +struct miqt_string QTextTable_Tr(const char* s) { QString _ret = QTextTable::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTextTable_TrUtf8(const char* s) { +struct miqt_string QTextTable_TrUtf8(const char* s) { QString _ret = QTextTable::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QTextTable_Resize(QTextTable* self, int rows, int cols) { @@ -195,32 +203,48 @@ QTextTableFormat* QTextTable_Format(const QTextTable* self) { return new QTextTableFormat(self->format()); } -struct miqt_string* QTextTable_Tr2(const char* s, const char* c) { +struct miqt_string QTextTable_Tr2(const char* s, const char* c) { QString _ret = QTextTable::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTextTable_Tr3(const char* s, const char* c, int n) { +struct miqt_string QTextTable_Tr3(const char* s, const char* c, int n) { QString _ret = QTextTable::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTextTable_TrUtf82(const char* s, const char* c) { +struct miqt_string QTextTable_TrUtf82(const char* s, const char* c) { QString _ret = QTextTable::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTextTable_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QTextTable_TrUtf83(const char* s, const char* c, int n) { QString _ret = QTextTable::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QTextTable_Delete(QTextTable* self) { diff --git a/qt/gen_qtexttable.go b/qt/gen_qtexttable.go index 7daa736e..0fdd9a0d 100644 --- a/qt/gen_qtexttable.go +++ b/qt/gen_qtexttable.go @@ -194,24 +194,24 @@ func (this *QTextTable) MetaObject() *QMetaObject { func (this *QTextTable) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QTextTable_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QTextTable_Metacast(this.h, param1_Cstring)) } func QTextTable_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTextTable_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextTable_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QTextTable_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTextTable_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextTable_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -314,9 +314,9 @@ func QTextTable_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTextTable_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextTable_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -325,9 +325,9 @@ func QTextTable_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTextTable_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextTable_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -336,9 +336,9 @@ func QTextTable_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTextTable_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextTable_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -347,9 +347,9 @@ func QTextTable_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTextTable_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTextTable_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qtexttable.h b/qt/gen_qtexttable.h index 525fb0d4..edd5ecff 100644 --- a/qt/gen_qtexttable.h +++ b/qt/gen_qtexttable.h @@ -61,8 +61,8 @@ void QTextTableCell_Delete(QTextTableCell* self); QTextTable* QTextTable_new(QTextDocument* doc); QMetaObject* QTextTable_MetaObject(const QTextTable* self); void* QTextTable_Metacast(QTextTable* self, const char* param1); -struct miqt_string* QTextTable_Tr(const char* s); -struct miqt_string* QTextTable_TrUtf8(const char* s); +struct miqt_string QTextTable_Tr(const char* s); +struct miqt_string QTextTable_TrUtf8(const char* s); void QTextTable_Resize(QTextTable* self, int rows, int cols); void QTextTable_InsertRows(QTextTable* self, int pos, int num); void QTextTable_InsertColumns(QTextTable* self, int pos, int num); @@ -82,10 +82,10 @@ QTextCursor* QTextTable_RowStart(const QTextTable* self, QTextCursor* c); QTextCursor* QTextTable_RowEnd(const QTextTable* self, QTextCursor* c); void QTextTable_SetFormat(QTextTable* self, QTextTableFormat* format); QTextTableFormat* QTextTable_Format(const QTextTable* self); -struct miqt_string* QTextTable_Tr2(const char* s, const char* c); -struct miqt_string* QTextTable_Tr3(const char* s, const char* c, int n); -struct miqt_string* QTextTable_TrUtf82(const char* s, const char* c); -struct miqt_string* QTextTable_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QTextTable_Tr2(const char* s, const char* c); +struct miqt_string QTextTable_Tr3(const char* s, const char* c, int n); +struct miqt_string QTextTable_TrUtf82(const char* s, const char* c); +struct miqt_string QTextTable_TrUtf83(const char* s, const char* c, int n); void QTextTable_Delete(QTextTable* self); #ifdef __cplusplus diff --git a/qt/gen_qthread.cpp b/qt/gen_qthread.cpp index 132253fa..65cfccde 100644 --- a/qt/gen_qthread.cpp +++ b/qt/gen_qthread.cpp @@ -27,18 +27,26 @@ void* QThread_Metacast(QThread* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QThread_Tr(const char* s) { +struct miqt_string QThread_Tr(const char* s) { QString _ret = QThread::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QThread_TrUtf8(const char* s) { +struct miqt_string QThread_TrUtf8(const char* s) { QString _ret = QThread::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void* QThread_CurrentThreadId() { @@ -144,32 +152,48 @@ void QThread_Usleep(unsigned long param1) { QThread::usleep(static_cast(param1)); } -struct miqt_string* QThread_Tr2(const char* s, const char* c) { +struct miqt_string QThread_Tr2(const char* s, const char* c) { QString _ret = QThread::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QThread_Tr3(const char* s, const char* c, int n) { +struct miqt_string QThread_Tr3(const char* s, const char* c, int n) { QString _ret = QThread::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QThread_TrUtf82(const char* s, const char* c) { +struct miqt_string QThread_TrUtf82(const char* s, const char* c) { QString _ret = QThread::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QThread_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QThread_TrUtf83(const char* s, const char* c, int n) { QString _ret = QThread::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QThread_Exit1(QThread* self, int retcode) { diff --git a/qt/gen_qthread.go b/qt/gen_qthread.go index b73849c9..6f051f28 100644 --- a/qt/gen_qthread.go +++ b/qt/gen_qthread.go @@ -75,29 +75,29 @@ func (this *QThread) MetaObject() *QMetaObject { func (this *QThread) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QThread_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QThread_Metacast(this.h, param1_Cstring)) } func QThread_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QThread_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QThread_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QThread_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QThread_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QThread_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QThread_CurrentThreadId() unsafe.Pointer { - return C.QThread_CurrentThreadId() + return (unsafe.Pointer)(C.QThread_CurrentThreadId()) } func QThread_CurrentThread() *QThread { @@ -201,9 +201,9 @@ func QThread_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QThread_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QThread_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -212,9 +212,9 @@ func QThread_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QThread_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QThread_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -223,9 +223,9 @@ func QThread_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QThread_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QThread_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -234,9 +234,9 @@ func QThread_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QThread_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QThread_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qthread.h b/qt/gen_qthread.h index 7141e4b0..23c8a1ad 100644 --- a/qt/gen_qthread.h +++ b/qt/gen_qthread.h @@ -33,8 +33,8 @@ QThread* QThread_new(); QThread* QThread_new2(QObject* parent); QMetaObject* QThread_MetaObject(const QThread* self); void* QThread_Metacast(QThread* self, const char* param1); -struct miqt_string* QThread_Tr(const char* s); -struct miqt_string* QThread_TrUtf8(const char* s); +struct miqt_string QThread_Tr(const char* s); +struct miqt_string QThread_TrUtf8(const char* s); void* QThread_CurrentThreadId(); QThread* QThread_CurrentThread(); int QThread_IdealThreadCount(); @@ -60,10 +60,10 @@ bool QThread_WaitWithTime(QThread* self, unsigned long time); void QThread_Sleep(unsigned long param1); void QThread_Msleep(unsigned long param1); void QThread_Usleep(unsigned long param1); -struct miqt_string* QThread_Tr2(const char* s, const char* c); -struct miqt_string* QThread_Tr3(const char* s, const char* c, int n); -struct miqt_string* QThread_TrUtf82(const char* s, const char* c); -struct miqt_string* QThread_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QThread_Tr2(const char* s, const char* c); +struct miqt_string QThread_Tr3(const char* s, const char* c, int n); +struct miqt_string QThread_TrUtf82(const char* s, const char* c); +struct miqt_string QThread_TrUtf83(const char* s, const char* c, int n); void QThread_Exit1(QThread* self, int retcode); void QThread_Start1(QThread* self, int param1); bool QThread_Wait1(QThread* self, QDeadlineTimer* deadline); diff --git a/qt/gen_qthreadpool.cpp b/qt/gen_qthreadpool.cpp index 7a00c7d0..0b370e92 100644 --- a/qt/gen_qthreadpool.cpp +++ b/qt/gen_qthreadpool.cpp @@ -26,18 +26,26 @@ void* QThreadPool_Metacast(QThreadPool* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QThreadPool_Tr(const char* s) { +struct miqt_string QThreadPool_Tr(const char* s) { QString _ret = QThreadPool::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QThreadPool_TrUtf8(const char* s) { +struct miqt_string QThreadPool_TrUtf8(const char* s) { QString _ret = QThreadPool::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QThreadPool* QThreadPool_GlobalInstance() { @@ -109,32 +117,48 @@ bool QThreadPool_TryTake(QThreadPool* self, QRunnable* runnable) { return self->tryTake(runnable); } -struct miqt_string* QThreadPool_Tr2(const char* s, const char* c) { +struct miqt_string QThreadPool_Tr2(const char* s, const char* c) { QString _ret = QThreadPool::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QThreadPool_Tr3(const char* s, const char* c, int n) { +struct miqt_string QThreadPool_Tr3(const char* s, const char* c, int n) { QString _ret = QThreadPool::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QThreadPool_TrUtf82(const char* s, const char* c) { +struct miqt_string QThreadPool_TrUtf82(const char* s, const char* c) { QString _ret = QThreadPool::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QThreadPool_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QThreadPool_TrUtf83(const char* s, const char* c, int n) { QString _ret = QThreadPool::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QThreadPool_Start2(QThreadPool* self, QRunnable* runnable, int priority) { diff --git a/qt/gen_qthreadpool.go b/qt/gen_qthreadpool.go index 2c8e69d2..2aec2121 100644 --- a/qt/gen_qthreadpool.go +++ b/qt/gen_qthreadpool.go @@ -62,24 +62,24 @@ func (this *QThreadPool) MetaObject() *QMetaObject { func (this *QThreadPool) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QThreadPool_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QThreadPool_Metacast(this.h, param1_Cstring)) } func QThreadPool_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QThreadPool_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QThreadPool_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QThreadPool_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QThreadPool_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QThreadPool_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -156,9 +156,9 @@ func QThreadPool_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QThreadPool_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QThreadPool_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -167,9 +167,9 @@ func QThreadPool_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QThreadPool_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QThreadPool_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -178,9 +178,9 @@ func QThreadPool_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QThreadPool_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QThreadPool_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -189,9 +189,9 @@ func QThreadPool_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QThreadPool_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QThreadPool_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qthreadpool.h b/qt/gen_qthreadpool.h index 889ab12e..910a9a08 100644 --- a/qt/gen_qthreadpool.h +++ b/qt/gen_qthreadpool.h @@ -31,8 +31,8 @@ QThreadPool* QThreadPool_new(); QThreadPool* QThreadPool_new2(QObject* parent); QMetaObject* QThreadPool_MetaObject(const QThreadPool* self); void* QThreadPool_Metacast(QThreadPool* self, const char* param1); -struct miqt_string* QThreadPool_Tr(const char* s); -struct miqt_string* QThreadPool_TrUtf8(const char* s); +struct miqt_string QThreadPool_Tr(const char* s); +struct miqt_string QThreadPool_TrUtf8(const char* s); QThreadPool* QThreadPool_GlobalInstance(); void QThreadPool_Start(QThreadPool* self, QRunnable* runnable); bool QThreadPool_TryStart(QThreadPool* self, QRunnable* runnable); @@ -50,10 +50,10 @@ void QThreadPool_Clear(QThreadPool* self); bool QThreadPool_Contains(const QThreadPool* self, QThread* thread); void QThreadPool_Cancel(QThreadPool* self, QRunnable* runnable); bool QThreadPool_TryTake(QThreadPool* self, QRunnable* runnable); -struct miqt_string* QThreadPool_Tr2(const char* s, const char* c); -struct miqt_string* QThreadPool_Tr3(const char* s, const char* c, int n); -struct miqt_string* QThreadPool_TrUtf82(const char* s, const char* c); -struct miqt_string* QThreadPool_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QThreadPool_Tr2(const char* s, const char* c); +struct miqt_string QThreadPool_Tr3(const char* s, const char* c, int n); +struct miqt_string QThreadPool_TrUtf82(const char* s, const char* c); +struct miqt_string QThreadPool_TrUtf83(const char* s, const char* c, int n); void QThreadPool_Start2(QThreadPool* self, QRunnable* runnable, int priority); bool QThreadPool_WaitForDone1(QThreadPool* self, int msecs); void QThreadPool_Delete(QThreadPool* self); diff --git a/qt/gen_qtimeline.cpp b/qt/gen_qtimeline.cpp index 82c604db..7e115c74 100644 --- a/qt/gen_qtimeline.cpp +++ b/qt/gen_qtimeline.cpp @@ -29,18 +29,26 @@ void* QTimeLine_Metacast(QTimeLine* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QTimeLine_Tr(const char* s) { +struct miqt_string QTimeLine_Tr(const char* s) { QString _ret = QTimeLine::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTimeLine_TrUtf8(const char* s) { +struct miqt_string QTimeLine_TrUtf8(const char* s) { QString _ret = QTimeLine::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QTimeLine_State(const QTimeLine* self) { @@ -164,32 +172,48 @@ void QTimeLine_ToggleDirection(QTimeLine* self) { self->toggleDirection(); } -struct miqt_string* QTimeLine_Tr2(const char* s, const char* c) { +struct miqt_string QTimeLine_Tr2(const char* s, const char* c) { QString _ret = QTimeLine::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTimeLine_Tr3(const char* s, const char* c, int n) { +struct miqt_string QTimeLine_Tr3(const char* s, const char* c, int n) { QString _ret = QTimeLine::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTimeLine_TrUtf82(const char* s, const char* c) { +struct miqt_string QTimeLine_TrUtf82(const char* s, const char* c) { QString _ret = QTimeLine::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTimeLine_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QTimeLine_TrUtf83(const char* s, const char* c, int n) { QString _ret = QTimeLine::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QTimeLine_Delete(QTimeLine* self) { diff --git a/qt/gen_qtimeline.go b/qt/gen_qtimeline.go index c9a4749b..36069068 100644 --- a/qt/gen_qtimeline.go +++ b/qt/gen_qtimeline.go @@ -94,24 +94,24 @@ func (this *QTimeLine) MetaObject() *QMetaObject { func (this *QTimeLine) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QTimeLine_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QTimeLine_Metacast(this.h, param1_Cstring)) } func QTimeLine_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTimeLine_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTimeLine_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QTimeLine_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTimeLine_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTimeLine_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -239,9 +239,9 @@ func QTimeLine_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTimeLine_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTimeLine_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -250,9 +250,9 @@ func QTimeLine_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTimeLine_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTimeLine_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -261,9 +261,9 @@ func QTimeLine_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTimeLine_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTimeLine_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -272,9 +272,9 @@ func QTimeLine_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTimeLine_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTimeLine_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qtimeline.h b/qt/gen_qtimeline.h index e27ad8f7..b89863bf 100644 --- a/qt/gen_qtimeline.h +++ b/qt/gen_qtimeline.h @@ -30,8 +30,8 @@ QTimeLine* QTimeLine_new2(int duration); QTimeLine* QTimeLine_new3(int duration, QObject* parent); QMetaObject* QTimeLine_MetaObject(const QTimeLine* self); void* QTimeLine_Metacast(QTimeLine* self, const char* param1); -struct miqt_string* QTimeLine_Tr(const char* s); -struct miqt_string* QTimeLine_TrUtf8(const char* s); +struct miqt_string QTimeLine_Tr(const char* s); +struct miqt_string QTimeLine_TrUtf8(const char* s); int QTimeLine_State(const QTimeLine* self); int QTimeLine_LoopCount(const QTimeLine* self); void QTimeLine_SetLoopCount(QTimeLine* self, int count); @@ -61,10 +61,10 @@ void QTimeLine_Stop(QTimeLine* self); void QTimeLine_SetPaused(QTimeLine* self, bool paused); void QTimeLine_SetCurrentTime(QTimeLine* self, int msec); void QTimeLine_ToggleDirection(QTimeLine* self); -struct miqt_string* QTimeLine_Tr2(const char* s, const char* c); -struct miqt_string* QTimeLine_Tr3(const char* s, const char* c, int n); -struct miqt_string* QTimeLine_TrUtf82(const char* s, const char* c); -struct miqt_string* QTimeLine_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QTimeLine_Tr2(const char* s, const char* c); +struct miqt_string QTimeLine_Tr3(const char* s, const char* c, int n); +struct miqt_string QTimeLine_TrUtf82(const char* s, const char* c); +struct miqt_string QTimeLine_TrUtf83(const char* s, const char* c, int n); void QTimeLine_Delete(QTimeLine* self); #ifdef __cplusplus diff --git a/qt/gen_qtimer.cpp b/qt/gen_qtimer.cpp index 0fba022b..a40231d2 100644 --- a/qt/gen_qtimer.cpp +++ b/qt/gen_qtimer.cpp @@ -24,18 +24,26 @@ void* QTimer_Metacast(QTimer* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QTimer_Tr(const char* s) { +struct miqt_string QTimer_Tr(const char* s) { QString _ret = QTimer::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTimer_TrUtf8(const char* s) { +struct miqt_string QTimer_TrUtf8(const char* s) { QString _ret = QTimer::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } bool QTimer_IsActive(const QTimer* self) { @@ -87,32 +95,48 @@ void QTimer_Stop(QTimer* self) { self->stop(); } -struct miqt_string* QTimer_Tr2(const char* s, const char* c) { +struct miqt_string QTimer_Tr2(const char* s, const char* c) { QString _ret = QTimer::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTimer_Tr3(const char* s, const char* c, int n) { +struct miqt_string QTimer_Tr3(const char* s, const char* c, int n) { QString _ret = QTimer::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTimer_TrUtf82(const char* s, const char* c) { +struct miqt_string QTimer_TrUtf82(const char* s, const char* c) { QString _ret = QTimer::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTimer_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QTimer_TrUtf83(const char* s, const char* c, int n) { QString _ret = QTimer::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QTimer_Delete(QTimer* self) { diff --git a/qt/gen_qtimer.go b/qt/gen_qtimer.go index d1dc29e9..c49546bd 100644 --- a/qt/gen_qtimer.go +++ b/qt/gen_qtimer.go @@ -62,24 +62,24 @@ func (this *QTimer) MetaObject() *QMetaObject { func (this *QTimer) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QTimer_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QTimer_Metacast(this.h, param1_Cstring)) } func QTimer_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTimer_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTimer_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QTimer_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTimer_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTimer_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -136,9 +136,9 @@ func QTimer_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTimer_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTimer_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -147,9 +147,9 @@ func QTimer_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTimer_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTimer_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -158,9 +158,9 @@ func QTimer_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTimer_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTimer_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -169,9 +169,9 @@ func QTimer_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTimer_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTimer_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qtimer.h b/qt/gen_qtimer.h index c803ad84..fd0feec7 100644 --- a/qt/gen_qtimer.h +++ b/qt/gen_qtimer.h @@ -27,8 +27,8 @@ QTimer* QTimer_new(); QTimer* QTimer_new2(QObject* parent); QMetaObject* QTimer_MetaObject(const QTimer* self); void* QTimer_Metacast(QTimer* self, const char* param1); -struct miqt_string* QTimer_Tr(const char* s); -struct miqt_string* QTimer_TrUtf8(const char* s); +struct miqt_string QTimer_Tr(const char* s); +struct miqt_string QTimer_TrUtf8(const char* s); bool QTimer_IsActive(const QTimer* self); int QTimer_TimerId(const QTimer* self); void QTimer_SetInterval(QTimer* self, int msec); @@ -41,10 +41,10 @@ bool QTimer_IsSingleShot(const QTimer* self); void QTimer_Start(QTimer* self, int msec); void QTimer_Start2(QTimer* self); void QTimer_Stop(QTimer* self); -struct miqt_string* QTimer_Tr2(const char* s, const char* c); -struct miqt_string* QTimer_Tr3(const char* s, const char* c, int n); -struct miqt_string* QTimer_TrUtf82(const char* s, const char* c); -struct miqt_string* QTimer_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QTimer_Tr2(const char* s, const char* c); +struct miqt_string QTimer_Tr3(const char* s, const char* c, int n); +struct miqt_string QTimer_TrUtf82(const char* s, const char* c); +struct miqt_string QTimer_TrUtf83(const char* s, const char* c, int n); void QTimer_Delete(QTimer* self); #ifdef __cplusplus diff --git a/qt/gen_qtimezone.cpp b/qt/gen_qtimezone.cpp index b95add98..9eae8cc0 100644 --- a/qt/gen_qtimezone.cpp +++ b/qt/gen_qtimezone.cpp @@ -15,35 +15,39 @@ QTimeZone* QTimeZone_new() { return new QTimeZone(); } -QTimeZone* QTimeZone_new2(QByteArray* ianaId) { - return new QTimeZone(*ianaId); +QTimeZone* QTimeZone_new2(struct miqt_string ianaId) { + QByteArray ianaId_QByteArray(ianaId.data, ianaId.len); + return new QTimeZone(ianaId_QByteArray); } QTimeZone* QTimeZone_new3(int offsetSeconds) { return new QTimeZone(static_cast(offsetSeconds)); } -QTimeZone* QTimeZone_new4(QByteArray* zoneId, int offsetSeconds, struct miqt_string* name, struct miqt_string* abbreviation) { - QString name_QString = QString::fromUtf8(&name->data, name->len); - QString abbreviation_QString = QString::fromUtf8(&abbreviation->data, abbreviation->len); - return new QTimeZone(*zoneId, static_cast(offsetSeconds), name_QString, abbreviation_QString); +QTimeZone* QTimeZone_new4(struct miqt_string zoneId, int offsetSeconds, struct miqt_string name, struct miqt_string abbreviation) { + QByteArray zoneId_QByteArray(zoneId.data, zoneId.len); + QString name_QString = QString::fromUtf8(name.data, name.len); + QString abbreviation_QString = QString::fromUtf8(abbreviation.data, abbreviation.len); + return new QTimeZone(zoneId_QByteArray, static_cast(offsetSeconds), name_QString, abbreviation_QString); } QTimeZone* QTimeZone_new5(QTimeZone* other) { return new QTimeZone(*other); } -QTimeZone* QTimeZone_new6(QByteArray* zoneId, int offsetSeconds, struct miqt_string* name, struct miqt_string* abbreviation, int country) { - QString name_QString = QString::fromUtf8(&name->data, name->len); - QString abbreviation_QString = QString::fromUtf8(&abbreviation->data, abbreviation->len); - return new QTimeZone(*zoneId, static_cast(offsetSeconds), name_QString, abbreviation_QString, static_cast(country)); +QTimeZone* QTimeZone_new6(struct miqt_string zoneId, int offsetSeconds, struct miqt_string name, struct miqt_string abbreviation, int country) { + QByteArray zoneId_QByteArray(zoneId.data, zoneId.len); + QString name_QString = QString::fromUtf8(name.data, name.len); + QString abbreviation_QString = QString::fromUtf8(abbreviation.data, abbreviation.len); + return new QTimeZone(zoneId_QByteArray, static_cast(offsetSeconds), name_QString, abbreviation_QString, static_cast(country)); } -QTimeZone* QTimeZone_new7(QByteArray* zoneId, int offsetSeconds, struct miqt_string* name, struct miqt_string* abbreviation, int country, struct miqt_string* comment) { - QString name_QString = QString::fromUtf8(&name->data, name->len); - QString abbreviation_QString = QString::fromUtf8(&abbreviation->data, abbreviation->len); - QString comment_QString = QString::fromUtf8(&comment->data, comment->len); - return new QTimeZone(*zoneId, static_cast(offsetSeconds), name_QString, abbreviation_QString, static_cast(country), comment_QString); +QTimeZone* QTimeZone_new7(struct miqt_string zoneId, int offsetSeconds, struct miqt_string name, struct miqt_string abbreviation, int country, struct miqt_string comment) { + QByteArray zoneId_QByteArray(zoneId.data, zoneId.len); + QString name_QString = QString::fromUtf8(name.data, name.len); + QString abbreviation_QString = QString::fromUtf8(abbreviation.data, abbreviation.len); + QString comment_QString = QString::fromUtf8(comment.data, comment.len); + return new QTimeZone(zoneId_QByteArray, static_cast(offsetSeconds), name_QString, abbreviation_QString, static_cast(country), comment_QString); } void QTimeZone_OperatorAssign(QTimeZone* self, QTimeZone* other) { @@ -66,8 +70,13 @@ bool QTimeZone_IsValid(const QTimeZone* self) { return self->isValid(); } -QByteArray* QTimeZone_Id(const QTimeZone* self) { - return new QByteArray(self->id()); +struct miqt_string QTimeZone_Id(const QTimeZone* self) { + QByteArray _qb = self->id(); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } int QTimeZone_Country(const QTimeZone* self) { @@ -75,32 +84,48 @@ int QTimeZone_Country(const QTimeZone* self) { return static_cast(_ret); } -struct miqt_string* QTimeZone_Comment(const QTimeZone* self) { +struct miqt_string QTimeZone_Comment(const QTimeZone* self) { QString _ret = self->comment(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTimeZone_DisplayName(const QTimeZone* self, QDateTime* atDateTime) { +struct miqt_string QTimeZone_DisplayName(const QTimeZone* self, QDateTime* atDateTime) { QString _ret = self->displayName(*atDateTime); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTimeZone_DisplayNameWithTimeType(const QTimeZone* self, int timeType) { +struct miqt_string QTimeZone_DisplayNameWithTimeType(const QTimeZone* self, int timeType) { QString _ret = self->displayName(static_cast(timeType)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTimeZone_Abbreviation(const QTimeZone* self, QDateTime* atDateTime) { +struct miqt_string QTimeZone_Abbreviation(const QTimeZone* self, QDateTime* atDateTime) { QString _ret = self->abbreviation(*atDateTime); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QTimeZone_OffsetFromUtc(const QTimeZone* self, QDateTime* atDateTime) { @@ -152,8 +177,13 @@ struct miqt_array* QTimeZone_Transitions(const QTimeZone* self, QDateTime* fromD return _out; } -QByteArray* QTimeZone_SystemTimeZoneId() { - return new QByteArray(QTimeZone::systemTimeZoneId()); +struct miqt_string QTimeZone_SystemTimeZoneId() { + QByteArray _qb = QTimeZone::systemTimeZoneId(); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } QTimeZone* QTimeZone_SystemTimeZone() { @@ -164,16 +194,22 @@ QTimeZone* QTimeZone_Utc() { return new QTimeZone(QTimeZone::utc()); } -bool QTimeZone_IsTimeZoneIdAvailable(QByteArray* ianaId) { - return QTimeZone::isTimeZoneIdAvailable(*ianaId); +bool QTimeZone_IsTimeZoneIdAvailable(struct miqt_string ianaId) { + QByteArray ianaId_QByteArray(ianaId.data, ianaId.len); + return QTimeZone::isTimeZoneIdAvailable(ianaId_QByteArray); } struct miqt_array* QTimeZone_AvailableTimeZoneIds() { QList _ret = QTimeZone::availableTimeZoneIds(); // Convert QList<> from C++ memory to manually-managed C memory - QByteArray** _arr = static_cast(malloc(sizeof(QByteArray*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { - _arr[i] = new QByteArray(_ret[i]); + QByteArray _lv_qb = _ret[i]; + struct miqt_string _lv_ms; + _lv_ms.len = _lv_qb.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_qb.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -184,9 +220,14 @@ struct miqt_array* QTimeZone_AvailableTimeZoneIds() { struct miqt_array* QTimeZone_AvailableTimeZoneIdsWithCountry(int country) { QList _ret = QTimeZone::availableTimeZoneIds(static_cast(country)); // Convert QList<> from C++ memory to manually-managed C memory - QByteArray** _arr = static_cast(malloc(sizeof(QByteArray*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { - _arr[i] = new QByteArray(_ret[i]); + QByteArray _lv_qb = _ret[i]; + struct miqt_string _lv_ms; + _lv_ms.len = _lv_qb.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_qb.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -197,9 +238,14 @@ struct miqt_array* QTimeZone_AvailableTimeZoneIdsWithCountry(int country) { struct miqt_array* QTimeZone_AvailableTimeZoneIdsWithOffsetSeconds(int offsetSeconds) { QList _ret = QTimeZone::availableTimeZoneIds(static_cast(offsetSeconds)); // Convert QList<> from C++ memory to manually-managed C memory - QByteArray** _arr = static_cast(malloc(sizeof(QByteArray*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { - _arr[i] = new QByteArray(_ret[i]); + QByteArray _lv_qb = _ret[i]; + struct miqt_string _lv_ms; + _lv_ms.len = _lv_qb.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_qb.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -207,24 +253,48 @@ struct miqt_array* QTimeZone_AvailableTimeZoneIdsWithOffsetSeconds(int offsetSec return _out; } -QByteArray* QTimeZone_IanaIdToWindowsId(QByteArray* ianaId) { - return new QByteArray(QTimeZone::ianaIdToWindowsId(*ianaId)); +struct miqt_string QTimeZone_IanaIdToWindowsId(struct miqt_string ianaId) { + QByteArray ianaId_QByteArray(ianaId.data, ianaId.len); + QByteArray _qb = QTimeZone::ianaIdToWindowsId(ianaId_QByteArray); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } -QByteArray* QTimeZone_WindowsIdToDefaultIanaId(QByteArray* windowsId) { - return new QByteArray(QTimeZone::windowsIdToDefaultIanaId(*windowsId)); +struct miqt_string QTimeZone_WindowsIdToDefaultIanaId(struct miqt_string windowsId) { + QByteArray windowsId_QByteArray(windowsId.data, windowsId.len); + QByteArray _qb = QTimeZone::windowsIdToDefaultIanaId(windowsId_QByteArray); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } -QByteArray* QTimeZone_WindowsIdToDefaultIanaId2(QByteArray* windowsId, int country) { - return new QByteArray(QTimeZone::windowsIdToDefaultIanaId(*windowsId, static_cast(country))); +struct miqt_string QTimeZone_WindowsIdToDefaultIanaId2(struct miqt_string windowsId, int country) { + QByteArray windowsId_QByteArray(windowsId.data, windowsId.len); + QByteArray _qb = QTimeZone::windowsIdToDefaultIanaId(windowsId_QByteArray, static_cast(country)); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } -struct miqt_array* QTimeZone_WindowsIdToIanaIds(QByteArray* windowsId) { - QList _ret = QTimeZone::windowsIdToIanaIds(*windowsId); +struct miqt_array* QTimeZone_WindowsIdToIanaIds(struct miqt_string windowsId) { + QByteArray windowsId_QByteArray(windowsId.data, windowsId.len); + QList _ret = QTimeZone::windowsIdToIanaIds(windowsId_QByteArray); // Convert QList<> from C++ memory to manually-managed C memory - QByteArray** _arr = static_cast(malloc(sizeof(QByteArray*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { - _arr[i] = new QByteArray(_ret[i]); + QByteArray _lv_qb = _ret[i]; + struct miqt_string _lv_ms; + _lv_ms.len = _lv_qb.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_qb.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -232,12 +302,18 @@ struct miqt_array* QTimeZone_WindowsIdToIanaIds(QByteArray* windowsId) { return _out; } -struct miqt_array* QTimeZone_WindowsIdToIanaIds2(QByteArray* windowsId, int country) { - QList _ret = QTimeZone::windowsIdToIanaIds(*windowsId, static_cast(country)); +struct miqt_array* QTimeZone_WindowsIdToIanaIds2(struct miqt_string windowsId, int country) { + QByteArray windowsId_QByteArray(windowsId.data, windowsId.len); + QList _ret = QTimeZone::windowsIdToIanaIds(windowsId_QByteArray, static_cast(country)); // Convert QList<> from C++ memory to manually-managed C memory - QByteArray** _arr = static_cast(malloc(sizeof(QByteArray*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { - _arr[i] = new QByteArray(_ret[i]); + QByteArray _lv_qb = _ret[i]; + struct miqt_string _lv_ms; + _lv_ms.len = _lv_qb.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_qb.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -245,32 +321,48 @@ struct miqt_array* QTimeZone_WindowsIdToIanaIds2(QByteArray* windowsId, int coun return _out; } -struct miqt_string* QTimeZone_DisplayName2(const QTimeZone* self, QDateTime* atDateTime, int nameType) { +struct miqt_string QTimeZone_DisplayName2(const QTimeZone* self, QDateTime* atDateTime, int nameType) { QString _ret = self->displayName(*atDateTime, static_cast(nameType)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTimeZone_DisplayName3(const QTimeZone* self, QDateTime* atDateTime, int nameType, QLocale* locale) { +struct miqt_string QTimeZone_DisplayName3(const QTimeZone* self, QDateTime* atDateTime, int nameType, QLocale* locale) { QString _ret = self->displayName(*atDateTime, static_cast(nameType), *locale); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTimeZone_DisplayName22(const QTimeZone* self, int timeType, int nameType) { +struct miqt_string QTimeZone_DisplayName22(const QTimeZone* self, int timeType, int nameType) { QString _ret = self->displayName(static_cast(timeType), static_cast(nameType)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTimeZone_DisplayName32(const QTimeZone* self, int timeType, int nameType, QLocale* locale) { +struct miqt_string QTimeZone_DisplayName32(const QTimeZone* self, int timeType, int nameType, QLocale* locale) { QString _ret = self->displayName(static_cast(timeType), static_cast(nameType), *locale); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QTimeZone_Delete(QTimeZone* self) { diff --git a/qt/gen_qtimezone.go b/qt/gen_qtimezone.go index 4f6ee7c7..7a7cbb14 100644 --- a/qt/gen_qtimezone.go +++ b/qt/gen_qtimezone.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -74,8 +73,11 @@ func NewQTimeZone() *QTimeZone { } // NewQTimeZone2 constructs a new QTimeZone object. -func NewQTimeZone2(ianaId *QByteArray) *QTimeZone { - ret := C.QTimeZone_new2(ianaId.cPointer()) +func NewQTimeZone2(ianaId []byte) *QTimeZone { + ianaId_alias := C.struct_miqt_string{} + ianaId_alias.data = (*C.char)(unsafe.Pointer(&ianaId[0])) + ianaId_alias.len = C.size_t(len(ianaId)) + ret := C.QTimeZone_new2(ianaId_alias) return newQTimeZone(ret) } @@ -86,12 +88,19 @@ func NewQTimeZone3(offsetSeconds int) *QTimeZone { } // NewQTimeZone4 constructs a new QTimeZone object. -func NewQTimeZone4(zoneId *QByteArray, offsetSeconds int, name string, abbreviation string) *QTimeZone { - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - abbreviation_ms := libmiqt.Strdupg(abbreviation) - defer C.free(abbreviation_ms) - ret := C.QTimeZone_new4(zoneId.cPointer(), (C.int)(offsetSeconds), (*C.struct_miqt_string)(name_ms), (*C.struct_miqt_string)(abbreviation_ms)) +func NewQTimeZone4(zoneId []byte, offsetSeconds int, name string, abbreviation string) *QTimeZone { + zoneId_alias := C.struct_miqt_string{} + zoneId_alias.data = (*C.char)(unsafe.Pointer(&zoneId[0])) + zoneId_alias.len = C.size_t(len(zoneId)) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + abbreviation_ms := C.struct_miqt_string{} + abbreviation_ms.data = C.CString(abbreviation) + abbreviation_ms.len = C.size_t(len(abbreviation)) + defer C.free(unsafe.Pointer(abbreviation_ms.data)) + ret := C.QTimeZone_new4(zoneId_alias, (C.int)(offsetSeconds), name_ms, abbreviation_ms) return newQTimeZone(ret) } @@ -102,24 +111,40 @@ func NewQTimeZone5(other *QTimeZone) *QTimeZone { } // NewQTimeZone6 constructs a new QTimeZone object. -func NewQTimeZone6(zoneId *QByteArray, offsetSeconds int, name string, abbreviation string, country QLocale__Country) *QTimeZone { - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - abbreviation_ms := libmiqt.Strdupg(abbreviation) - defer C.free(abbreviation_ms) - ret := C.QTimeZone_new6(zoneId.cPointer(), (C.int)(offsetSeconds), (*C.struct_miqt_string)(name_ms), (*C.struct_miqt_string)(abbreviation_ms), (C.int)(country)) +func NewQTimeZone6(zoneId []byte, offsetSeconds int, name string, abbreviation string, country QLocale__Country) *QTimeZone { + zoneId_alias := C.struct_miqt_string{} + zoneId_alias.data = (*C.char)(unsafe.Pointer(&zoneId[0])) + zoneId_alias.len = C.size_t(len(zoneId)) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + abbreviation_ms := C.struct_miqt_string{} + abbreviation_ms.data = C.CString(abbreviation) + abbreviation_ms.len = C.size_t(len(abbreviation)) + defer C.free(unsafe.Pointer(abbreviation_ms.data)) + ret := C.QTimeZone_new6(zoneId_alias, (C.int)(offsetSeconds), name_ms, abbreviation_ms, (C.int)(country)) return newQTimeZone(ret) } // NewQTimeZone7 constructs a new QTimeZone object. -func NewQTimeZone7(zoneId *QByteArray, offsetSeconds int, name string, abbreviation string, country QLocale__Country, comment string) *QTimeZone { - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - abbreviation_ms := libmiqt.Strdupg(abbreviation) - defer C.free(abbreviation_ms) - comment_ms := libmiqt.Strdupg(comment) - defer C.free(comment_ms) - ret := C.QTimeZone_new7(zoneId.cPointer(), (C.int)(offsetSeconds), (*C.struct_miqt_string)(name_ms), (*C.struct_miqt_string)(abbreviation_ms), (C.int)(country), (*C.struct_miqt_string)(comment_ms)) +func NewQTimeZone7(zoneId []byte, offsetSeconds int, name string, abbreviation string, country QLocale__Country, comment string) *QTimeZone { + zoneId_alias := C.struct_miqt_string{} + zoneId_alias.data = (*C.char)(unsafe.Pointer(&zoneId[0])) + zoneId_alias.len = C.size_t(len(zoneId)) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + abbreviation_ms := C.struct_miqt_string{} + abbreviation_ms.data = C.CString(abbreviation) + abbreviation_ms.len = C.size_t(len(abbreviation)) + defer C.free(unsafe.Pointer(abbreviation_ms.data)) + comment_ms := C.struct_miqt_string{} + comment_ms.data = C.CString(comment) + comment_ms.len = C.size_t(len(comment)) + defer C.free(unsafe.Pointer(comment_ms.data)) + ret := C.QTimeZone_new7(zoneId_alias, (C.int)(offsetSeconds), name_ms, abbreviation_ms, (C.int)(country), comment_ms) return newQTimeZone(ret) } @@ -143,11 +168,11 @@ func (this *QTimeZone) IsValid() bool { return (bool)(C.QTimeZone_IsValid(this.h)) } -func (this *QTimeZone) Id() *QByteArray { - _ret := C.QTimeZone_Id(this.h) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QTimeZone) Id() []byte { + var _bytearray C.struct_miqt_string = C.QTimeZone_Id(this.h) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } func (this *QTimeZone) Country() QLocale__Country { @@ -155,30 +180,30 @@ func (this *QTimeZone) Country() QLocale__Country { } func (this *QTimeZone) Comment() string { - var _ms *C.struct_miqt_string = C.QTimeZone_Comment(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTimeZone_Comment(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QTimeZone) DisplayName(atDateTime *QDateTime) string { - var _ms *C.struct_miqt_string = C.QTimeZone_DisplayName(this.h, atDateTime.cPointer()) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTimeZone_DisplayName(this.h, atDateTime.cPointer()) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QTimeZone) DisplayNameWithTimeType(timeType QTimeZone__TimeType) string { - var _ms *C.struct_miqt_string = C.QTimeZone_DisplayNameWithTimeType(this.h, (C.int)(timeType)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTimeZone_DisplayNameWithTimeType(this.h, (C.int)(timeType)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QTimeZone) Abbreviation(atDateTime *QDateTime) string { - var _ms *C.struct_miqt_string = C.QTimeZone_Abbreviation(this.h, atDateTime.cPointer()) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTimeZone_Abbreviation(this.h, atDateTime.cPointer()) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -241,11 +266,11 @@ func (this *QTimeZone) Transitions(fromDateTime *QDateTime, toDateTime *QDateTim return _ret } -func QTimeZone_SystemTimeZoneId() *QByteArray { - _ret := C.QTimeZone_SystemTimeZoneId() - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func QTimeZone_SystemTimeZoneId() []byte { + var _bytearray C.struct_miqt_string = C.QTimeZone_SystemTimeZoneId() + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } func QTimeZone_SystemTimeZone() *QTimeZone { @@ -262,126 +287,144 @@ func QTimeZone_Utc() *QTimeZone { return _goptr } -func QTimeZone_IsTimeZoneIdAvailable(ianaId *QByteArray) bool { - return (bool)(C.QTimeZone_IsTimeZoneIdAvailable(ianaId.cPointer())) +func QTimeZone_IsTimeZoneIdAvailable(ianaId []byte) bool { + ianaId_alias := C.struct_miqt_string{} + ianaId_alias.data = (*C.char)(unsafe.Pointer(&ianaId[0])) + ianaId_alias.len = C.size_t(len(ianaId)) + return (bool)(C.QTimeZone_IsTimeZoneIdAvailable(ianaId_alias)) } -func QTimeZone_AvailableTimeZoneIds() []QByteArray { +func QTimeZone_AvailableTimeZoneIds() [][]byte { var _ma *C.struct_miqt_array = C.QTimeZone_AvailableTimeZoneIds() - _ret := make([]QByteArray, int(_ma.len)) - _outCast := (*[0xffff]*C.QByteArray)(unsafe.Pointer(_ma.data)) // hey ya + _ret := make([][]byte, int(_ma.len)) + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - _lv_ret := _outCast[i] - _lv_goptr := newQByteArray(_lv_ret) - _lv_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - _ret[i] = *_lv_goptr + var _lv_bytearray C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoBytes(unsafe.Pointer(_lv_bytearray.data), C.int(int64(_lv_bytearray.len))) + C.free(unsafe.Pointer(_lv_bytearray.data)) + _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) return _ret } -func QTimeZone_AvailableTimeZoneIdsWithCountry(country QLocale__Country) []QByteArray { +func QTimeZone_AvailableTimeZoneIdsWithCountry(country QLocale__Country) [][]byte { var _ma *C.struct_miqt_array = C.QTimeZone_AvailableTimeZoneIdsWithCountry((C.int)(country)) - _ret := make([]QByteArray, int(_ma.len)) - _outCast := (*[0xffff]*C.QByteArray)(unsafe.Pointer(_ma.data)) // hey ya + _ret := make([][]byte, int(_ma.len)) + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - _lv_ret := _outCast[i] - _lv_goptr := newQByteArray(_lv_ret) - _lv_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - _ret[i] = *_lv_goptr + var _lv_bytearray C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoBytes(unsafe.Pointer(_lv_bytearray.data), C.int(int64(_lv_bytearray.len))) + C.free(unsafe.Pointer(_lv_bytearray.data)) + _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) return _ret } -func QTimeZone_AvailableTimeZoneIdsWithOffsetSeconds(offsetSeconds int) []QByteArray { +func QTimeZone_AvailableTimeZoneIdsWithOffsetSeconds(offsetSeconds int) [][]byte { var _ma *C.struct_miqt_array = C.QTimeZone_AvailableTimeZoneIdsWithOffsetSeconds((C.int)(offsetSeconds)) - _ret := make([]QByteArray, int(_ma.len)) - _outCast := (*[0xffff]*C.QByteArray)(unsafe.Pointer(_ma.data)) // hey ya + _ret := make([][]byte, int(_ma.len)) + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - _lv_ret := _outCast[i] - _lv_goptr := newQByteArray(_lv_ret) - _lv_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - _ret[i] = *_lv_goptr + var _lv_bytearray C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoBytes(unsafe.Pointer(_lv_bytearray.data), C.int(int64(_lv_bytearray.len))) + C.free(unsafe.Pointer(_lv_bytearray.data)) + _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) return _ret } -func QTimeZone_IanaIdToWindowsId(ianaId *QByteArray) *QByteArray { - _ret := C.QTimeZone_IanaIdToWindowsId(ianaId.cPointer()) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func QTimeZone_IanaIdToWindowsId(ianaId []byte) []byte { + ianaId_alias := C.struct_miqt_string{} + ianaId_alias.data = (*C.char)(unsafe.Pointer(&ianaId[0])) + ianaId_alias.len = C.size_t(len(ianaId)) + var _bytearray C.struct_miqt_string = C.QTimeZone_IanaIdToWindowsId(ianaId_alias) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } -func QTimeZone_WindowsIdToDefaultIanaId(windowsId *QByteArray) *QByteArray { - _ret := C.QTimeZone_WindowsIdToDefaultIanaId(windowsId.cPointer()) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func QTimeZone_WindowsIdToDefaultIanaId(windowsId []byte) []byte { + windowsId_alias := C.struct_miqt_string{} + windowsId_alias.data = (*C.char)(unsafe.Pointer(&windowsId[0])) + windowsId_alias.len = C.size_t(len(windowsId)) + var _bytearray C.struct_miqt_string = C.QTimeZone_WindowsIdToDefaultIanaId(windowsId_alias) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } -func QTimeZone_WindowsIdToDefaultIanaId2(windowsId *QByteArray, country QLocale__Country) *QByteArray { - _ret := C.QTimeZone_WindowsIdToDefaultIanaId2(windowsId.cPointer(), (C.int)(country)) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func QTimeZone_WindowsIdToDefaultIanaId2(windowsId []byte, country QLocale__Country) []byte { + windowsId_alias := C.struct_miqt_string{} + windowsId_alias.data = (*C.char)(unsafe.Pointer(&windowsId[0])) + windowsId_alias.len = C.size_t(len(windowsId)) + var _bytearray C.struct_miqt_string = C.QTimeZone_WindowsIdToDefaultIanaId2(windowsId_alias, (C.int)(country)) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } -func QTimeZone_WindowsIdToIanaIds(windowsId *QByteArray) []QByteArray { - var _ma *C.struct_miqt_array = C.QTimeZone_WindowsIdToIanaIds(windowsId.cPointer()) - _ret := make([]QByteArray, int(_ma.len)) - _outCast := (*[0xffff]*C.QByteArray)(unsafe.Pointer(_ma.data)) // hey ya +func QTimeZone_WindowsIdToIanaIds(windowsId []byte) [][]byte { + windowsId_alias := C.struct_miqt_string{} + windowsId_alias.data = (*C.char)(unsafe.Pointer(&windowsId[0])) + windowsId_alias.len = C.size_t(len(windowsId)) + var _ma *C.struct_miqt_array = C.QTimeZone_WindowsIdToIanaIds(windowsId_alias) + _ret := make([][]byte, int(_ma.len)) + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - _lv_ret := _outCast[i] - _lv_goptr := newQByteArray(_lv_ret) - _lv_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - _ret[i] = *_lv_goptr + var _lv_bytearray C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoBytes(unsafe.Pointer(_lv_bytearray.data), C.int(int64(_lv_bytearray.len))) + C.free(unsafe.Pointer(_lv_bytearray.data)) + _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) return _ret } -func QTimeZone_WindowsIdToIanaIds2(windowsId *QByteArray, country QLocale__Country) []QByteArray { - var _ma *C.struct_miqt_array = C.QTimeZone_WindowsIdToIanaIds2(windowsId.cPointer(), (C.int)(country)) - _ret := make([]QByteArray, int(_ma.len)) - _outCast := (*[0xffff]*C.QByteArray)(unsafe.Pointer(_ma.data)) // hey ya +func QTimeZone_WindowsIdToIanaIds2(windowsId []byte, country QLocale__Country) [][]byte { + windowsId_alias := C.struct_miqt_string{} + windowsId_alias.data = (*C.char)(unsafe.Pointer(&windowsId[0])) + windowsId_alias.len = C.size_t(len(windowsId)) + var _ma *C.struct_miqt_array = C.QTimeZone_WindowsIdToIanaIds2(windowsId_alias, (C.int)(country)) + _ret := make([][]byte, int(_ma.len)) + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - _lv_ret := _outCast[i] - _lv_goptr := newQByteArray(_lv_ret) - _lv_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - _ret[i] = *_lv_goptr + var _lv_bytearray C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoBytes(unsafe.Pointer(_lv_bytearray.data), C.int(int64(_lv_bytearray.len))) + C.free(unsafe.Pointer(_lv_bytearray.data)) + _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) return _ret } func (this *QTimeZone) DisplayName2(atDateTime *QDateTime, nameType QTimeZone__NameType) string { - var _ms *C.struct_miqt_string = C.QTimeZone_DisplayName2(this.h, atDateTime.cPointer(), (C.int)(nameType)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTimeZone_DisplayName2(this.h, atDateTime.cPointer(), (C.int)(nameType)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QTimeZone) DisplayName3(atDateTime *QDateTime, nameType QTimeZone__NameType, locale *QLocale) string { - var _ms *C.struct_miqt_string = C.QTimeZone_DisplayName3(this.h, atDateTime.cPointer(), (C.int)(nameType), locale.cPointer()) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTimeZone_DisplayName3(this.h, atDateTime.cPointer(), (C.int)(nameType), locale.cPointer()) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QTimeZone) DisplayName22(timeType QTimeZone__TimeType, nameType QTimeZone__NameType) string { - var _ms *C.struct_miqt_string = C.QTimeZone_DisplayName22(this.h, (C.int)(timeType), (C.int)(nameType)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTimeZone_DisplayName22(this.h, (C.int)(timeType), (C.int)(nameType)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QTimeZone) DisplayName32(timeType QTimeZone__TimeType, nameType QTimeZone__NameType, locale *QLocale) string { - var _ms *C.struct_miqt_string = C.QTimeZone_DisplayName32(this.h, (C.int)(timeType), (C.int)(nameType), locale.cPointer()) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTimeZone_DisplayName32(this.h, (C.int)(timeType), (C.int)(nameType), locale.cPointer()) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qtimezone.h b/qt/gen_qtimezone.h index 8a209d12..897a5334 100644 --- a/qt/gen_qtimezone.h +++ b/qt/gen_qtimezone.h @@ -32,23 +32,23 @@ typedef struct QTimeZone__OffsetData QTimeZone__OffsetData; #endif QTimeZone* QTimeZone_new(); -QTimeZone* QTimeZone_new2(QByteArray* ianaId); +QTimeZone* QTimeZone_new2(struct miqt_string ianaId); QTimeZone* QTimeZone_new3(int offsetSeconds); -QTimeZone* QTimeZone_new4(QByteArray* zoneId, int offsetSeconds, struct miqt_string* name, struct miqt_string* abbreviation); +QTimeZone* QTimeZone_new4(struct miqt_string zoneId, int offsetSeconds, struct miqt_string name, struct miqt_string abbreviation); QTimeZone* QTimeZone_new5(QTimeZone* other); -QTimeZone* QTimeZone_new6(QByteArray* zoneId, int offsetSeconds, struct miqt_string* name, struct miqt_string* abbreviation, int country); -QTimeZone* QTimeZone_new7(QByteArray* zoneId, int offsetSeconds, struct miqt_string* name, struct miqt_string* abbreviation, int country, struct miqt_string* comment); +QTimeZone* QTimeZone_new6(struct miqt_string zoneId, int offsetSeconds, struct miqt_string name, struct miqt_string abbreviation, int country); +QTimeZone* QTimeZone_new7(struct miqt_string zoneId, int offsetSeconds, struct miqt_string name, struct miqt_string abbreviation, int country, struct miqt_string comment); void QTimeZone_OperatorAssign(QTimeZone* self, QTimeZone* other); void QTimeZone_Swap(QTimeZone* self, QTimeZone* other); bool QTimeZone_OperatorEqual(const QTimeZone* self, QTimeZone* other); bool QTimeZone_OperatorNotEqual(const QTimeZone* self, QTimeZone* other); bool QTimeZone_IsValid(const QTimeZone* self); -QByteArray* QTimeZone_Id(const QTimeZone* self); +struct miqt_string QTimeZone_Id(const QTimeZone* self); int QTimeZone_Country(const QTimeZone* self); -struct miqt_string* QTimeZone_Comment(const QTimeZone* self); -struct miqt_string* QTimeZone_DisplayName(const QTimeZone* self, QDateTime* atDateTime); -struct miqt_string* QTimeZone_DisplayNameWithTimeType(const QTimeZone* self, int timeType); -struct miqt_string* QTimeZone_Abbreviation(const QTimeZone* self, QDateTime* atDateTime); +struct miqt_string QTimeZone_Comment(const QTimeZone* self); +struct miqt_string QTimeZone_DisplayName(const QTimeZone* self, QDateTime* atDateTime); +struct miqt_string QTimeZone_DisplayNameWithTimeType(const QTimeZone* self, int timeType); +struct miqt_string QTimeZone_Abbreviation(const QTimeZone* self, QDateTime* atDateTime); int QTimeZone_OffsetFromUtc(const QTimeZone* self, QDateTime* atDateTime); int QTimeZone_StandardTimeOffset(const QTimeZone* self, QDateTime* atDateTime); int QTimeZone_DaylightTimeOffset(const QTimeZone* self, QDateTime* atDateTime); @@ -59,22 +59,22 @@ bool QTimeZone_HasTransitions(const QTimeZone* self); QTimeZone__OffsetData* QTimeZone_NextTransition(const QTimeZone* self, QDateTime* afterDateTime); QTimeZone__OffsetData* QTimeZone_PreviousTransition(const QTimeZone* self, QDateTime* beforeDateTime); struct miqt_array* QTimeZone_Transitions(const QTimeZone* self, QDateTime* fromDateTime, QDateTime* toDateTime); -QByteArray* QTimeZone_SystemTimeZoneId(); +struct miqt_string QTimeZone_SystemTimeZoneId(); QTimeZone* QTimeZone_SystemTimeZone(); QTimeZone* QTimeZone_Utc(); -bool QTimeZone_IsTimeZoneIdAvailable(QByteArray* ianaId); +bool QTimeZone_IsTimeZoneIdAvailable(struct miqt_string ianaId); struct miqt_array* QTimeZone_AvailableTimeZoneIds(); struct miqt_array* QTimeZone_AvailableTimeZoneIdsWithCountry(int country); struct miqt_array* QTimeZone_AvailableTimeZoneIdsWithOffsetSeconds(int offsetSeconds); -QByteArray* QTimeZone_IanaIdToWindowsId(QByteArray* ianaId); -QByteArray* QTimeZone_WindowsIdToDefaultIanaId(QByteArray* windowsId); -QByteArray* QTimeZone_WindowsIdToDefaultIanaId2(QByteArray* windowsId, int country); -struct miqt_array* QTimeZone_WindowsIdToIanaIds(QByteArray* windowsId); -struct miqt_array* QTimeZone_WindowsIdToIanaIds2(QByteArray* windowsId, int country); -struct miqt_string* QTimeZone_DisplayName2(const QTimeZone* self, QDateTime* atDateTime, int nameType); -struct miqt_string* QTimeZone_DisplayName3(const QTimeZone* self, QDateTime* atDateTime, int nameType, QLocale* locale); -struct miqt_string* QTimeZone_DisplayName22(const QTimeZone* self, int timeType, int nameType); -struct miqt_string* QTimeZone_DisplayName32(const QTimeZone* self, int timeType, int nameType, QLocale* locale); +struct miqt_string QTimeZone_IanaIdToWindowsId(struct miqt_string ianaId); +struct miqt_string QTimeZone_WindowsIdToDefaultIanaId(struct miqt_string windowsId); +struct miqt_string QTimeZone_WindowsIdToDefaultIanaId2(struct miqt_string windowsId, int country); +struct miqt_array* QTimeZone_WindowsIdToIanaIds(struct miqt_string windowsId); +struct miqt_array* QTimeZone_WindowsIdToIanaIds2(struct miqt_string windowsId, int country); +struct miqt_string QTimeZone_DisplayName2(const QTimeZone* self, QDateTime* atDateTime, int nameType); +struct miqt_string QTimeZone_DisplayName3(const QTimeZone* self, QDateTime* atDateTime, int nameType, QLocale* locale); +struct miqt_string QTimeZone_DisplayName22(const QTimeZone* self, int timeType, int nameType); +struct miqt_string QTimeZone_DisplayName32(const QTimeZone* self, int timeType, int nameType, QLocale* locale); void QTimeZone_Delete(QTimeZone* self); QTimeZone__OffsetData* QTimeZone__OffsetData_new(QTimeZone__OffsetData* param1); diff --git a/qt/gen_qtoolbar.cpp b/qt/gen_qtoolbar.cpp index 2e26c2fd..ba1b1521 100644 --- a/qt/gen_qtoolbar.cpp +++ b/qt/gen_qtoolbar.cpp @@ -13,8 +13,8 @@ #include "gen_qtoolbar.h" #include "_cgo_export.h" -QToolBar* QToolBar_new(struct miqt_string* title) { - QString title_QString = QString::fromUtf8(&title->data, title->len); +QToolBar* QToolBar_new(struct miqt_string title) { + QString title_QString = QString::fromUtf8(title.data, title.len); return new QToolBar(title_QString); } @@ -22,8 +22,8 @@ QToolBar* QToolBar_new2() { return new QToolBar(); } -QToolBar* QToolBar_new3(struct miqt_string* title, QWidget* parent) { - QString title_QString = QString::fromUtf8(&title->data, title->len); +QToolBar* QToolBar_new3(struct miqt_string title, QWidget* parent) { + QString title_QString = QString::fromUtf8(title.data, title.len); return new QToolBar(title_QString, parent); } @@ -39,18 +39,26 @@ void* QToolBar_Metacast(QToolBar* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QToolBar_Tr(const char* s) { +struct miqt_string QToolBar_Tr(const char* s) { QString _ret = QToolBar::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QToolBar_TrUtf8(const char* s) { +struct miqt_string QToolBar_TrUtf8(const char* s) { QString _ret = QToolBar::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QToolBar_SetMovable(QToolBar* self, bool movable) { @@ -87,13 +95,13 @@ void QToolBar_Clear(QToolBar* self) { self->clear(); } -QAction* QToolBar_AddAction(QToolBar* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QAction* QToolBar_AddAction(QToolBar* self, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); return self->addAction(text_QString); } -QAction* QToolBar_AddAction2(QToolBar* self, QIcon* icon, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QAction* QToolBar_AddAction2(QToolBar* self, QIcon* icon, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); return self->addAction(*icon, text_QString); } @@ -255,32 +263,48 @@ void QToolBar_connect_VisibilityChanged(QToolBar* self, intptr_t slot) { }); } -struct miqt_string* QToolBar_Tr2(const char* s, const char* c) { +struct miqt_string QToolBar_Tr2(const char* s, const char* c) { QString _ret = QToolBar::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QToolBar_Tr3(const char* s, const char* c, int n) { +struct miqt_string QToolBar_Tr3(const char* s, const char* c, int n) { QString _ret = QToolBar::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QToolBar_TrUtf82(const char* s, const char* c) { +struct miqt_string QToolBar_TrUtf82(const char* s, const char* c) { QString _ret = QToolBar::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QToolBar_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QToolBar_TrUtf83(const char* s, const char* c, int n) { QString _ret = QToolBar::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QToolBar_Delete(QToolBar* self) { diff --git a/qt/gen_qtoolbar.go b/qt/gen_qtoolbar.go index d812fecd..d7f45377 100644 --- a/qt/gen_qtoolbar.go +++ b/qt/gen_qtoolbar.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "runtime/cgo" "unsafe" @@ -47,9 +46,11 @@ func UnsafeNewQToolBar(h unsafe.Pointer) *QToolBar { // NewQToolBar constructs a new QToolBar object. func NewQToolBar(title string) *QToolBar { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - ret := C.QToolBar_new((*C.struct_miqt_string)(title_ms)) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + ret := C.QToolBar_new(title_ms) return newQToolBar(ret) } @@ -61,9 +62,11 @@ func NewQToolBar2() *QToolBar { // NewQToolBar3 constructs a new QToolBar object. func NewQToolBar3(title string, parent *QWidget) *QToolBar { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - ret := C.QToolBar_new3((*C.struct_miqt_string)(title_ms), parent.cPointer()) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + ret := C.QToolBar_new3(title_ms, parent.cPointer()) return newQToolBar(ret) } @@ -80,24 +83,24 @@ func (this *QToolBar) MetaObject() *QMetaObject { func (this *QToolBar) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QToolBar_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QToolBar_Metacast(this.h, param1_Cstring)) } func QToolBar_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QToolBar_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QToolBar_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QToolBar_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QToolBar_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QToolBar_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -134,15 +137,19 @@ func (this *QToolBar) Clear() { } func (this *QToolBar) AddAction(text string) *QAction { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - return UnsafeNewQAction(unsafe.Pointer(C.QToolBar_AddAction(this.h, (*C.struct_miqt_string)(text_ms)))) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + return UnsafeNewQAction(unsafe.Pointer(C.QToolBar_AddAction(this.h, text_ms))) } func (this *QToolBar) AddAction2(icon *QIcon, text string) *QAction { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - return UnsafeNewQAction(unsafe.Pointer(C.QToolBar_AddAction2(this.h, icon.cPointer(), (*C.struct_miqt_string)(text_ms)))) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + return UnsafeNewQAction(unsafe.Pointer(C.QToolBar_AddAction2(this.h, icon.cPointer(), text_ms))) } func (this *QToolBar) AddSeparator() *QAction { @@ -380,9 +387,9 @@ func QToolBar_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QToolBar_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QToolBar_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -391,9 +398,9 @@ func QToolBar_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QToolBar_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QToolBar_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -402,9 +409,9 @@ func QToolBar_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QToolBar_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QToolBar_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -413,9 +420,9 @@ func QToolBar_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QToolBar_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QToolBar_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qtoolbar.h b/qt/gen_qtoolbar.h index c62510f4..73e0eed2 100644 --- a/qt/gen_qtoolbar.h +++ b/qt/gen_qtoolbar.h @@ -33,14 +33,14 @@ typedef struct QToolBar QToolBar; typedef struct QWidget QWidget; #endif -QToolBar* QToolBar_new(struct miqt_string* title); +QToolBar* QToolBar_new(struct miqt_string title); QToolBar* QToolBar_new2(); -QToolBar* QToolBar_new3(struct miqt_string* title, QWidget* parent); +QToolBar* QToolBar_new3(struct miqt_string title, QWidget* parent); QToolBar* QToolBar_new4(QWidget* parent); QMetaObject* QToolBar_MetaObject(const QToolBar* self); void* QToolBar_Metacast(QToolBar* self, const char* param1); -struct miqt_string* QToolBar_Tr(const char* s); -struct miqt_string* QToolBar_TrUtf8(const char* s); +struct miqt_string QToolBar_Tr(const char* s); +struct miqt_string QToolBar_TrUtf8(const char* s); void QToolBar_SetMovable(QToolBar* self, bool movable); bool QToolBar_IsMovable(const QToolBar* self); void QToolBar_SetAllowedAreas(QToolBar* self, int areas); @@ -49,8 +49,8 @@ bool QToolBar_IsAreaAllowed(const QToolBar* self, int area); void QToolBar_SetOrientation(QToolBar* self, int orientation); int QToolBar_Orientation(const QToolBar* self); void QToolBar_Clear(QToolBar* self); -QAction* QToolBar_AddAction(QToolBar* self, struct miqt_string* text); -QAction* QToolBar_AddAction2(QToolBar* self, QIcon* icon, struct miqt_string* text); +QAction* QToolBar_AddAction(QToolBar* self, struct miqt_string text); +QAction* QToolBar_AddAction2(QToolBar* self, QIcon* icon, struct miqt_string text); QAction* QToolBar_AddSeparator(QToolBar* self); QAction* QToolBar_InsertSeparator(QToolBar* self, QAction* before); QAction* QToolBar_AddWidget(QToolBar* self, QWidget* widget); @@ -83,10 +83,10 @@ void QToolBar_TopLevelChanged(QToolBar* self, bool topLevel); void QToolBar_connect_TopLevelChanged(QToolBar* self, intptr_t slot); void QToolBar_VisibilityChanged(QToolBar* self, bool visible); void QToolBar_connect_VisibilityChanged(QToolBar* self, intptr_t slot); -struct miqt_string* QToolBar_Tr2(const char* s, const char* c); -struct miqt_string* QToolBar_Tr3(const char* s, const char* c, int n); -struct miqt_string* QToolBar_TrUtf82(const char* s, const char* c); -struct miqt_string* QToolBar_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QToolBar_Tr2(const char* s, const char* c); +struct miqt_string QToolBar_Tr3(const char* s, const char* c, int n); +struct miqt_string QToolBar_TrUtf82(const char* s, const char* c); +struct miqt_string QToolBar_TrUtf83(const char* s, const char* c, int n); void QToolBar_Delete(QToolBar* self); #ifdef __cplusplus diff --git a/qt/gen_qtoolbox.cpp b/qt/gen_qtoolbox.cpp index 1da3fe0b..8b4ccfc7 100644 --- a/qt/gen_qtoolbox.cpp +++ b/qt/gen_qtoolbox.cpp @@ -29,37 +29,45 @@ void* QToolBox_Metacast(QToolBox* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QToolBox_Tr(const char* s) { +struct miqt_string QToolBox_Tr(const char* s) { QString _ret = QToolBox::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QToolBox_TrUtf8(const char* s) { +struct miqt_string QToolBox_TrUtf8(const char* s) { QString _ret = QToolBox::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -int QToolBox_AddItem(QToolBox* self, QWidget* widget, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +int QToolBox_AddItem(QToolBox* self, QWidget* widget, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); return self->addItem(widget, text_QString); } -int QToolBox_AddItem2(QToolBox* self, QWidget* widget, QIcon* icon, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +int QToolBox_AddItem2(QToolBox* self, QWidget* widget, QIcon* icon, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); return self->addItem(widget, *icon, text_QString); } -int QToolBox_InsertItem(QToolBox* self, int index, QWidget* widget, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +int QToolBox_InsertItem(QToolBox* self, int index, QWidget* widget, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); return self->insertItem(static_cast(index), widget, text_QString); } -int QToolBox_InsertItem2(QToolBox* self, int index, QWidget* widget, QIcon* icon, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +int QToolBox_InsertItem2(QToolBox* self, int index, QWidget* widget, QIcon* icon, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); return self->insertItem(static_cast(index), widget, *icon, text_QString); } @@ -75,16 +83,20 @@ bool QToolBox_IsItemEnabled(const QToolBox* self, int index) { return self->isItemEnabled(static_cast(index)); } -void QToolBox_SetItemText(QToolBox* self, int index, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QToolBox_SetItemText(QToolBox* self, int index, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->setItemText(static_cast(index), text_QString); } -struct miqt_string* QToolBox_ItemText(const QToolBox* self, int index) { +struct miqt_string QToolBox_ItemText(const QToolBox* self, int index) { QString _ret = self->itemText(static_cast(index)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QToolBox_SetItemIcon(QToolBox* self, int index, QIcon* icon) { @@ -95,16 +107,20 @@ QIcon* QToolBox_ItemIcon(const QToolBox* self, int index) { return new QIcon(self->itemIcon(static_cast(index))); } -void QToolBox_SetItemToolTip(QToolBox* self, int index, struct miqt_string* toolTip) { - QString toolTip_QString = QString::fromUtf8(&toolTip->data, toolTip->len); +void QToolBox_SetItemToolTip(QToolBox* self, int index, struct miqt_string toolTip) { + QString toolTip_QString = QString::fromUtf8(toolTip.data, toolTip.len); self->setItemToolTip(static_cast(index), toolTip_QString); } -struct miqt_string* QToolBox_ItemToolTip(const QToolBox* self, int index) { +struct miqt_string QToolBox_ItemToolTip(const QToolBox* self, int index) { QString _ret = self->itemToolTip(static_cast(index)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QToolBox_CurrentIndex(const QToolBox* self) { @@ -146,32 +162,48 @@ void QToolBox_connect_CurrentChanged(QToolBox* self, intptr_t slot) { }); } -struct miqt_string* QToolBox_Tr2(const char* s, const char* c) { +struct miqt_string QToolBox_Tr2(const char* s, const char* c) { QString _ret = QToolBox::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QToolBox_Tr3(const char* s, const char* c, int n) { +struct miqt_string QToolBox_Tr3(const char* s, const char* c, int n) { QString _ret = QToolBox::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QToolBox_TrUtf82(const char* s, const char* c) { +struct miqt_string QToolBox_TrUtf82(const char* s, const char* c) { QString _ret = QToolBox::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QToolBox_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QToolBox_TrUtf83(const char* s, const char* c, int n) { QString _ret = QToolBox::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QToolBox_Delete(QToolBox* self) { diff --git a/qt/gen_qtoolbox.go b/qt/gen_qtoolbox.go index 7050e30a..1dffc564 100644 --- a/qt/gen_qtoolbox.go +++ b/qt/gen_qtoolbox.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "runtime/cgo" "unsafe" @@ -70,49 +69,57 @@ func (this *QToolBox) MetaObject() *QMetaObject { func (this *QToolBox) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QToolBox_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QToolBox_Metacast(this.h, param1_Cstring)) } func QToolBox_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QToolBox_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QToolBox_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QToolBox_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QToolBox_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QToolBox_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QToolBox) AddItem(widget *QWidget, text string) int { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - return (int)(C.QToolBox_AddItem(this.h, widget.cPointer(), (*C.struct_miqt_string)(text_ms))) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + return (int)(C.QToolBox_AddItem(this.h, widget.cPointer(), text_ms)) } func (this *QToolBox) AddItem2(widget *QWidget, icon *QIcon, text string) int { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - return (int)(C.QToolBox_AddItem2(this.h, widget.cPointer(), icon.cPointer(), (*C.struct_miqt_string)(text_ms))) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + return (int)(C.QToolBox_AddItem2(this.h, widget.cPointer(), icon.cPointer(), text_ms)) } func (this *QToolBox) InsertItem(index int, widget *QWidget, text string) int { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - return (int)(C.QToolBox_InsertItem(this.h, (C.int)(index), widget.cPointer(), (*C.struct_miqt_string)(text_ms))) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + return (int)(C.QToolBox_InsertItem(this.h, (C.int)(index), widget.cPointer(), text_ms)) } func (this *QToolBox) InsertItem2(index int, widget *QWidget, icon *QIcon, text string) int { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - return (int)(C.QToolBox_InsertItem2(this.h, (C.int)(index), widget.cPointer(), icon.cPointer(), (*C.struct_miqt_string)(text_ms))) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + return (int)(C.QToolBox_InsertItem2(this.h, (C.int)(index), widget.cPointer(), icon.cPointer(), text_ms)) } func (this *QToolBox) RemoveItem(index int) { @@ -128,15 +135,17 @@ func (this *QToolBox) IsItemEnabled(index int) bool { } func (this *QToolBox) SetItemText(index int, text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QToolBox_SetItemText(this.h, (C.int)(index), (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QToolBox_SetItemText(this.h, (C.int)(index), text_ms) } func (this *QToolBox) ItemText(index int) string { - var _ms *C.struct_miqt_string = C.QToolBox_ItemText(this.h, (C.int)(index)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QToolBox_ItemText(this.h, (C.int)(index)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -152,15 +161,17 @@ func (this *QToolBox) ItemIcon(index int) *QIcon { } func (this *QToolBox) SetItemToolTip(index int, toolTip string) { - toolTip_ms := libmiqt.Strdupg(toolTip) - defer C.free(toolTip_ms) - C.QToolBox_SetItemToolTip(this.h, (C.int)(index), (*C.struct_miqt_string)(toolTip_ms)) + toolTip_ms := C.struct_miqt_string{} + toolTip_ms.data = C.CString(toolTip) + toolTip_ms.len = C.size_t(len(toolTip)) + defer C.free(unsafe.Pointer(toolTip_ms.data)) + C.QToolBox_SetItemToolTip(this.h, (C.int)(index), toolTip_ms) } func (this *QToolBox) ItemToolTip(index int) string { - var _ms *C.struct_miqt_string = C.QToolBox_ItemToolTip(this.h, (C.int)(index)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QToolBox_ItemToolTip(this.h, (C.int)(index)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -217,9 +228,9 @@ func QToolBox_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QToolBox_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QToolBox_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -228,9 +239,9 @@ func QToolBox_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QToolBox_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QToolBox_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -239,9 +250,9 @@ func QToolBox_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QToolBox_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QToolBox_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -250,9 +261,9 @@ func QToolBox_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QToolBox_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QToolBox_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qtoolbox.h b/qt/gen_qtoolbox.h index c5eec96f..53715235 100644 --- a/qt/gen_qtoolbox.h +++ b/qt/gen_qtoolbox.h @@ -30,21 +30,21 @@ QToolBox* QToolBox_new2(QWidget* parent); QToolBox* QToolBox_new3(QWidget* parent, int f); QMetaObject* QToolBox_MetaObject(const QToolBox* self); void* QToolBox_Metacast(QToolBox* self, const char* param1); -struct miqt_string* QToolBox_Tr(const char* s); -struct miqt_string* QToolBox_TrUtf8(const char* s); -int QToolBox_AddItem(QToolBox* self, QWidget* widget, struct miqt_string* text); -int QToolBox_AddItem2(QToolBox* self, QWidget* widget, QIcon* icon, struct miqt_string* text); -int QToolBox_InsertItem(QToolBox* self, int index, QWidget* widget, struct miqt_string* text); -int QToolBox_InsertItem2(QToolBox* self, int index, QWidget* widget, QIcon* icon, struct miqt_string* text); +struct miqt_string QToolBox_Tr(const char* s); +struct miqt_string QToolBox_TrUtf8(const char* s); +int QToolBox_AddItem(QToolBox* self, QWidget* widget, struct miqt_string text); +int QToolBox_AddItem2(QToolBox* self, QWidget* widget, QIcon* icon, struct miqt_string text); +int QToolBox_InsertItem(QToolBox* self, int index, QWidget* widget, struct miqt_string text); +int QToolBox_InsertItem2(QToolBox* self, int index, QWidget* widget, QIcon* icon, struct miqt_string text); void QToolBox_RemoveItem(QToolBox* self, int index); void QToolBox_SetItemEnabled(QToolBox* self, int index, bool enabled); bool QToolBox_IsItemEnabled(const QToolBox* self, int index); -void QToolBox_SetItemText(QToolBox* self, int index, struct miqt_string* text); -struct miqt_string* QToolBox_ItemText(const QToolBox* self, int index); +void QToolBox_SetItemText(QToolBox* self, int index, struct miqt_string text); +struct miqt_string QToolBox_ItemText(const QToolBox* self, int index); void QToolBox_SetItemIcon(QToolBox* self, int index, QIcon* icon); QIcon* QToolBox_ItemIcon(const QToolBox* self, int index); -void QToolBox_SetItemToolTip(QToolBox* self, int index, struct miqt_string* toolTip); -struct miqt_string* QToolBox_ItemToolTip(const QToolBox* self, int index); +void QToolBox_SetItemToolTip(QToolBox* self, int index, struct miqt_string toolTip); +struct miqt_string QToolBox_ItemToolTip(const QToolBox* self, int index); int QToolBox_CurrentIndex(const QToolBox* self); QWidget* QToolBox_CurrentWidget(const QToolBox* self); QWidget* QToolBox_Widget(const QToolBox* self, int index); @@ -54,10 +54,10 @@ void QToolBox_SetCurrentIndex(QToolBox* self, int index); void QToolBox_SetCurrentWidget(QToolBox* self, QWidget* widget); void QToolBox_CurrentChanged(QToolBox* self, int index); void QToolBox_connect_CurrentChanged(QToolBox* self, intptr_t slot); -struct miqt_string* QToolBox_Tr2(const char* s, const char* c); -struct miqt_string* QToolBox_Tr3(const char* s, const char* c, int n); -struct miqt_string* QToolBox_TrUtf82(const char* s, const char* c); -struct miqt_string* QToolBox_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QToolBox_Tr2(const char* s, const char* c); +struct miqt_string QToolBox_Tr3(const char* s, const char* c, int n); +struct miqt_string QToolBox_TrUtf82(const char* s, const char* c); +struct miqt_string QToolBox_TrUtf83(const char* s, const char* c, int n); void QToolBox_Delete(QToolBox* self); #ifdef __cplusplus diff --git a/qt/gen_qtoolbutton.cpp b/qt/gen_qtoolbutton.cpp index a341d58b..9fdd0749 100644 --- a/qt/gen_qtoolbutton.cpp +++ b/qt/gen_qtoolbutton.cpp @@ -27,18 +27,26 @@ void* QToolButton_Metacast(QToolButton* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QToolButton_Tr(const char* s) { +struct miqt_string QToolButton_Tr(const char* s) { QString _ret = QToolButton::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QToolButton_TrUtf8(const char* s) { +struct miqt_string QToolButton_TrUtf8(const char* s) { QString _ret = QToolButton::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QSize* QToolButton_SizeHint(const QToolButton* self) { @@ -115,32 +123,48 @@ void QToolButton_connect_Triggered(QToolButton* self, intptr_t slot) { }); } -struct miqt_string* QToolButton_Tr2(const char* s, const char* c) { +struct miqt_string QToolButton_Tr2(const char* s, const char* c) { QString _ret = QToolButton::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QToolButton_Tr3(const char* s, const char* c, int n) { +struct miqt_string QToolButton_Tr3(const char* s, const char* c, int n) { QString _ret = QToolButton::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QToolButton_TrUtf82(const char* s, const char* c) { +struct miqt_string QToolButton_TrUtf82(const char* s, const char* c) { QString _ret = QToolButton::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QToolButton_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QToolButton_TrUtf83(const char* s, const char* c, int n) { QString _ret = QToolButton::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QToolButton_Delete(QToolButton* self) { diff --git a/qt/gen_qtoolbutton.go b/qt/gen_qtoolbutton.go index 5fdd75f6..a812e804 100644 --- a/qt/gen_qtoolbutton.go +++ b/qt/gen_qtoolbutton.go @@ -71,24 +71,24 @@ func (this *QToolButton) MetaObject() *QMetaObject { func (this *QToolButton) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QToolButton_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QToolButton_Metacast(this.h, param1_Cstring)) } func QToolButton_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QToolButton_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QToolButton_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QToolButton_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QToolButton_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QToolButton_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -183,9 +183,9 @@ func QToolButton_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QToolButton_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QToolButton_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -194,9 +194,9 @@ func QToolButton_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QToolButton_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QToolButton_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -205,9 +205,9 @@ func QToolButton_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QToolButton_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QToolButton_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -216,9 +216,9 @@ func QToolButton_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QToolButton_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QToolButton_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qtoolbutton.h b/qt/gen_qtoolbutton.h index 70ba41ac..b6208c2c 100644 --- a/qt/gen_qtoolbutton.h +++ b/qt/gen_qtoolbutton.h @@ -33,8 +33,8 @@ QToolButton* QToolButton_new(); QToolButton* QToolButton_new2(QWidget* parent); QMetaObject* QToolButton_MetaObject(const QToolButton* self); void* QToolButton_Metacast(QToolButton* self, const char* param1); -struct miqt_string* QToolButton_Tr(const char* s); -struct miqt_string* QToolButton_TrUtf8(const char* s); +struct miqt_string QToolButton_Tr(const char* s); +struct miqt_string QToolButton_TrUtf8(const char* s); QSize* QToolButton_SizeHint(const QToolButton* self); QSize* QToolButton_MinimumSizeHint(const QToolButton* self); int QToolButton_ToolButtonStyle(const QToolButton* self); @@ -52,10 +52,10 @@ void QToolButton_SetToolButtonStyle(QToolButton* self, int style); void QToolButton_SetDefaultAction(QToolButton* self, QAction* defaultAction); void QToolButton_Triggered(QToolButton* self, QAction* param1); void QToolButton_connect_Triggered(QToolButton* self, intptr_t slot); -struct miqt_string* QToolButton_Tr2(const char* s, const char* c); -struct miqt_string* QToolButton_Tr3(const char* s, const char* c, int n); -struct miqt_string* QToolButton_TrUtf82(const char* s, const char* c); -struct miqt_string* QToolButton_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QToolButton_Tr2(const char* s, const char* c); +struct miqt_string QToolButton_Tr3(const char* s, const char* c, int n); +struct miqt_string QToolButton_TrUtf82(const char* s, const char* c); +struct miqt_string QToolButton_TrUtf83(const char* s, const char* c, int n); void QToolButton_Delete(QToolButton* self); #ifdef __cplusplus diff --git a/qt/gen_qtooltip.cpp b/qt/gen_qtooltip.cpp index 40f43b12..8efdcdd6 100644 --- a/qt/gen_qtooltip.cpp +++ b/qt/gen_qtooltip.cpp @@ -11,18 +11,18 @@ #include "gen_qtooltip.h" #include "_cgo_export.h" -void QToolTip_ShowText(QPoint* pos, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QToolTip_ShowText(QPoint* pos, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); QToolTip::showText(*pos, text_QString); } -void QToolTip_ShowText2(QPoint* pos, struct miqt_string* text, QWidget* w, QRect* rect) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QToolTip_ShowText2(QPoint* pos, struct miqt_string text, QWidget* w, QRect* rect) { + QString text_QString = QString::fromUtf8(text.data, text.len); QToolTip::showText(*pos, text_QString, w, *rect); } -void QToolTip_ShowText3(QPoint* pos, struct miqt_string* text, QWidget* w, QRect* rect, int msecShowTime) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QToolTip_ShowText3(QPoint* pos, struct miqt_string text, QWidget* w, QRect* rect, int msecShowTime) { + QString text_QString = QString::fromUtf8(text.data, text.len); QToolTip::showText(*pos, text_QString, w, *rect, static_cast(msecShowTime)); } @@ -34,11 +34,15 @@ bool QToolTip_IsVisible() { return QToolTip::isVisible(); } -struct miqt_string* QToolTip_Text() { +struct miqt_string QToolTip_Text() { QString _ret = QToolTip::text(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QPalette* QToolTip_Palette() { @@ -57,8 +61,8 @@ void QToolTip_SetFont(QFont* font) { QToolTip::setFont(*font); } -void QToolTip_ShowText32(QPoint* pos, struct miqt_string* text, QWidget* w) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QToolTip_ShowText32(QPoint* pos, struct miqt_string text, QWidget* w) { + QString text_QString = QString::fromUtf8(text.data, text.len); QToolTip::showText(*pos, text_QString, w); } diff --git a/qt/gen_qtooltip.go b/qt/gen_qtooltip.go index 7c19a395..d4e55598 100644 --- a/qt/gen_qtooltip.go +++ b/qt/gen_qtooltip.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -44,21 +43,27 @@ func UnsafeNewQToolTip(h unsafe.Pointer) *QToolTip { } func QToolTip_ShowText(pos *QPoint, text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QToolTip_ShowText(pos.cPointer(), (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QToolTip_ShowText(pos.cPointer(), text_ms) } func QToolTip_ShowText2(pos *QPoint, text string, w *QWidget, rect *QRect) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QToolTip_ShowText2(pos.cPointer(), (*C.struct_miqt_string)(text_ms), w.cPointer(), rect.cPointer()) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QToolTip_ShowText2(pos.cPointer(), text_ms, w.cPointer(), rect.cPointer()) } func QToolTip_ShowText3(pos *QPoint, text string, w *QWidget, rect *QRect, msecShowTime int) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QToolTip_ShowText3(pos.cPointer(), (*C.struct_miqt_string)(text_ms), w.cPointer(), rect.cPointer(), (C.int)(msecShowTime)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QToolTip_ShowText3(pos.cPointer(), text_ms, w.cPointer(), rect.cPointer(), (C.int)(msecShowTime)) } func QToolTip_HideText() { @@ -70,9 +75,9 @@ func QToolTip_IsVisible() bool { } func QToolTip_Text() string { - var _ms *C.struct_miqt_string = C.QToolTip_Text() - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QToolTip_Text() + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -99,9 +104,11 @@ func QToolTip_SetFont(font *QFont) { } func QToolTip_ShowText32(pos *QPoint, text string, w *QWidget) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QToolTip_ShowText32(pos.cPointer(), (*C.struct_miqt_string)(text_ms), w.cPointer()) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QToolTip_ShowText32(pos.cPointer(), text_ms, w.cPointer()) } // Delete this object from C++ memory. diff --git a/qt/gen_qtooltip.h b/qt/gen_qtooltip.h index 3ca73776..f7d19385 100644 --- a/qt/gen_qtooltip.h +++ b/qt/gen_qtooltip.h @@ -29,17 +29,17 @@ typedef struct QToolTip QToolTip; typedef struct QWidget QWidget; #endif -void QToolTip_ShowText(QPoint* pos, struct miqt_string* text); -void QToolTip_ShowText2(QPoint* pos, struct miqt_string* text, QWidget* w, QRect* rect); -void QToolTip_ShowText3(QPoint* pos, struct miqt_string* text, QWidget* w, QRect* rect, int msecShowTime); +void QToolTip_ShowText(QPoint* pos, struct miqt_string text); +void QToolTip_ShowText2(QPoint* pos, struct miqt_string text, QWidget* w, QRect* rect); +void QToolTip_ShowText3(QPoint* pos, struct miqt_string text, QWidget* w, QRect* rect, int msecShowTime); void QToolTip_HideText(); bool QToolTip_IsVisible(); -struct miqt_string* QToolTip_Text(); +struct miqt_string QToolTip_Text(); QPalette* QToolTip_Palette(); void QToolTip_SetPalette(QPalette* palette); QFont* QToolTip_Font(); void QToolTip_SetFont(QFont* font); -void QToolTip_ShowText32(QPoint* pos, struct miqt_string* text, QWidget* w); +void QToolTip_ShowText32(QPoint* pos, struct miqt_string text, QWidget* w); void QToolTip_Delete(QToolTip* self); #ifdef __cplusplus diff --git a/qt/gen_qtouchdevice.cpp b/qt/gen_qtouchdevice.cpp index 69fdb534..15c20d46 100644 --- a/qt/gen_qtouchdevice.cpp +++ b/qt/gen_qtouchdevice.cpp @@ -24,11 +24,15 @@ struct miqt_array* QTouchDevice_Devices() { return _out; } -struct miqt_string* QTouchDevice_Name(const QTouchDevice* self) { +struct miqt_string QTouchDevice_Name(const QTouchDevice* self) { QString _ret = self->name(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QTouchDevice_Type(const QTouchDevice* self) { @@ -45,8 +49,8 @@ int QTouchDevice_MaximumTouchPoints(const QTouchDevice* self) { return self->maximumTouchPoints(); } -void QTouchDevice_SetName(QTouchDevice* self, struct miqt_string* name) { - QString name_QString = QString::fromUtf8(&name->data, name->len); +void QTouchDevice_SetName(QTouchDevice* self, struct miqt_string name) { + QString name_QString = QString::fromUtf8(name.data, name.len); self->setName(name_QString); } diff --git a/qt/gen_qtouchdevice.go b/qt/gen_qtouchdevice.go index c3a57e46..692d5a35 100644 --- a/qt/gen_qtouchdevice.go +++ b/qt/gen_qtouchdevice.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -80,9 +79,9 @@ func QTouchDevice_Devices() []*QTouchDevice { } func (this *QTouchDevice) Name() string { - var _ms *C.struct_miqt_string = C.QTouchDevice_Name(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTouchDevice_Name(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -99,9 +98,11 @@ func (this *QTouchDevice) MaximumTouchPoints() int { } func (this *QTouchDevice) SetName(name string) { - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - C.QTouchDevice_SetName(this.h, (*C.struct_miqt_string)(name_ms)) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + C.QTouchDevice_SetName(this.h, name_ms) } func (this *QTouchDevice) SetType(devType QTouchDevice__DeviceType) { diff --git a/qt/gen_qtouchdevice.h b/qt/gen_qtouchdevice.h index bbb09fba..59b52ea1 100644 --- a/qt/gen_qtouchdevice.h +++ b/qt/gen_qtouchdevice.h @@ -21,11 +21,11 @@ typedef struct QTouchDevice QTouchDevice; QTouchDevice* QTouchDevice_new(); struct miqt_array* QTouchDevice_Devices(); -struct miqt_string* QTouchDevice_Name(const QTouchDevice* self); +struct miqt_string QTouchDevice_Name(const QTouchDevice* self); int QTouchDevice_Type(const QTouchDevice* self); int QTouchDevice_Capabilities(const QTouchDevice* self); int QTouchDevice_MaximumTouchPoints(const QTouchDevice* self); -void QTouchDevice_SetName(QTouchDevice* self, struct miqt_string* name); +void QTouchDevice_SetName(QTouchDevice* self, struct miqt_string name); void QTouchDevice_SetType(QTouchDevice* self, int devType); void QTouchDevice_SetCapabilities(QTouchDevice* self, int caps); void QTouchDevice_SetMaximumTouchPoints(QTouchDevice* self, int max); diff --git a/qt/gen_qtranslator.cpp b/qt/gen_qtranslator.cpp index 2abeb958..ffc65c07 100644 --- a/qt/gen_qtranslator.cpp +++ b/qt/gen_qtranslator.cpp @@ -25,52 +25,72 @@ void* QTranslator_Metacast(QTranslator* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QTranslator_Tr(const char* s) { +struct miqt_string QTranslator_Tr(const char* s) { QString _ret = QTranslator::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTranslator_TrUtf8(const char* s) { +struct miqt_string QTranslator_TrUtf8(const char* s) { QString _ret = QTranslator::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTranslator_Translate(const QTranslator* self, const char* context, const char* sourceText) { +struct miqt_string QTranslator_Translate(const QTranslator* self, const char* context, const char* sourceText) { QString _ret = self->translate(context, sourceText); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } bool QTranslator_IsEmpty(const QTranslator* self) { return self->isEmpty(); } -struct miqt_string* QTranslator_Language(const QTranslator* self) { +struct miqt_string QTranslator_Language(const QTranslator* self) { QString _ret = self->language(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTranslator_FilePath(const QTranslator* self) { +struct miqt_string QTranslator_FilePath(const QTranslator* self) { QString _ret = self->filePath(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -bool QTranslator_Load(QTranslator* self, struct miqt_string* filename) { - QString filename_QString = QString::fromUtf8(&filename->data, filename->len); +bool QTranslator_Load(QTranslator* self, struct miqt_string filename) { + QString filename_QString = QString::fromUtf8(filename.data, filename.len); return self->load(filename_QString); } -bool QTranslator_Load2(QTranslator* self, QLocale* locale, struct miqt_string* filename) { - QString filename_QString = QString::fromUtf8(&filename->data, filename->len); +bool QTranslator_Load2(QTranslator* self, QLocale* locale, struct miqt_string filename) { + QString filename_QString = QString::fromUtf8(filename.data, filename.len); return self->load(*locale, filename_QString); } @@ -78,92 +98,116 @@ bool QTranslator_Load3(QTranslator* self, const unsigned char* data, int lenVal) return self->load(static_cast(data), static_cast(lenVal)); } -struct miqt_string* QTranslator_Tr2(const char* s, const char* c) { +struct miqt_string QTranslator_Tr2(const char* s, const char* c) { QString _ret = QTranslator::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTranslator_Tr3(const char* s, const char* c, int n) { +struct miqt_string QTranslator_Tr3(const char* s, const char* c, int n) { QString _ret = QTranslator::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTranslator_TrUtf82(const char* s, const char* c) { +struct miqt_string QTranslator_TrUtf82(const char* s, const char* c) { QString _ret = QTranslator::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTranslator_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QTranslator_TrUtf83(const char* s, const char* c, int n) { QString _ret = QTranslator::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTranslator_Translate3(const QTranslator* self, const char* context, const char* sourceText, const char* disambiguation) { +struct miqt_string QTranslator_Translate3(const QTranslator* self, const char* context, const char* sourceText, const char* disambiguation) { QString _ret = self->translate(context, sourceText, disambiguation); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTranslator_Translate4(const QTranslator* self, const char* context, const char* sourceText, const char* disambiguation, int n) { +struct miqt_string QTranslator_Translate4(const QTranslator* self, const char* context, const char* sourceText, const char* disambiguation, int n) { QString _ret = self->translate(context, sourceText, disambiguation, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -bool QTranslator_Load22(QTranslator* self, struct miqt_string* filename, struct miqt_string* directory) { - QString filename_QString = QString::fromUtf8(&filename->data, filename->len); - QString directory_QString = QString::fromUtf8(&directory->data, directory->len); +bool QTranslator_Load22(QTranslator* self, struct miqt_string filename, struct miqt_string directory) { + QString filename_QString = QString::fromUtf8(filename.data, filename.len); + QString directory_QString = QString::fromUtf8(directory.data, directory.len); return self->load(filename_QString, directory_QString); } -bool QTranslator_Load32(QTranslator* self, struct miqt_string* filename, struct miqt_string* directory, struct miqt_string* search_delimiters) { - QString filename_QString = QString::fromUtf8(&filename->data, filename->len); - QString directory_QString = QString::fromUtf8(&directory->data, directory->len); - QString search_delimiters_QString = QString::fromUtf8(&search_delimiters->data, search_delimiters->len); +bool QTranslator_Load32(QTranslator* self, struct miqt_string filename, struct miqt_string directory, struct miqt_string search_delimiters) { + QString filename_QString = QString::fromUtf8(filename.data, filename.len); + QString directory_QString = QString::fromUtf8(directory.data, directory.len); + QString search_delimiters_QString = QString::fromUtf8(search_delimiters.data, search_delimiters.len); return self->load(filename_QString, directory_QString, search_delimiters_QString); } -bool QTranslator_Load4(QTranslator* self, struct miqt_string* filename, struct miqt_string* directory, struct miqt_string* search_delimiters, struct miqt_string* suffix) { - QString filename_QString = QString::fromUtf8(&filename->data, filename->len); - QString directory_QString = QString::fromUtf8(&directory->data, directory->len); - QString search_delimiters_QString = QString::fromUtf8(&search_delimiters->data, search_delimiters->len); - QString suffix_QString = QString::fromUtf8(&suffix->data, suffix->len); +bool QTranslator_Load4(QTranslator* self, struct miqt_string filename, struct miqt_string directory, struct miqt_string search_delimiters, struct miqt_string suffix) { + QString filename_QString = QString::fromUtf8(filename.data, filename.len); + QString directory_QString = QString::fromUtf8(directory.data, directory.len); + QString search_delimiters_QString = QString::fromUtf8(search_delimiters.data, search_delimiters.len); + QString suffix_QString = QString::fromUtf8(suffix.data, suffix.len); return self->load(filename_QString, directory_QString, search_delimiters_QString, suffix_QString); } -bool QTranslator_Load33(QTranslator* self, QLocale* locale, struct miqt_string* filename, struct miqt_string* prefix) { - QString filename_QString = QString::fromUtf8(&filename->data, filename->len); - QString prefix_QString = QString::fromUtf8(&prefix->data, prefix->len); +bool QTranslator_Load33(QTranslator* self, QLocale* locale, struct miqt_string filename, struct miqt_string prefix) { + QString filename_QString = QString::fromUtf8(filename.data, filename.len); + QString prefix_QString = QString::fromUtf8(prefix.data, prefix.len); return self->load(*locale, filename_QString, prefix_QString); } -bool QTranslator_Load42(QTranslator* self, QLocale* locale, struct miqt_string* filename, struct miqt_string* prefix, struct miqt_string* directory) { - QString filename_QString = QString::fromUtf8(&filename->data, filename->len); - QString prefix_QString = QString::fromUtf8(&prefix->data, prefix->len); - QString directory_QString = QString::fromUtf8(&directory->data, directory->len); +bool QTranslator_Load42(QTranslator* self, QLocale* locale, struct miqt_string filename, struct miqt_string prefix, struct miqt_string directory) { + QString filename_QString = QString::fromUtf8(filename.data, filename.len); + QString prefix_QString = QString::fromUtf8(prefix.data, prefix.len); + QString directory_QString = QString::fromUtf8(directory.data, directory.len); return self->load(*locale, filename_QString, prefix_QString, directory_QString); } -bool QTranslator_Load5(QTranslator* self, QLocale* locale, struct miqt_string* filename, struct miqt_string* prefix, struct miqt_string* directory, struct miqt_string* suffix) { - QString filename_QString = QString::fromUtf8(&filename->data, filename->len); - QString prefix_QString = QString::fromUtf8(&prefix->data, prefix->len); - QString directory_QString = QString::fromUtf8(&directory->data, directory->len); - QString suffix_QString = QString::fromUtf8(&suffix->data, suffix->len); +bool QTranslator_Load5(QTranslator* self, QLocale* locale, struct miqt_string filename, struct miqt_string prefix, struct miqt_string directory, struct miqt_string suffix) { + QString filename_QString = QString::fromUtf8(filename.data, filename.len); + QString prefix_QString = QString::fromUtf8(prefix.data, prefix.len); + QString directory_QString = QString::fromUtf8(directory.data, directory.len); + QString suffix_QString = QString::fromUtf8(suffix.data, suffix.len); return self->load(*locale, filename_QString, prefix_QString, directory_QString, suffix_QString); } -bool QTranslator_Load34(QTranslator* self, const unsigned char* data, int lenVal, struct miqt_string* directory) { - QString directory_QString = QString::fromUtf8(&directory->data, directory->len); +bool QTranslator_Load34(QTranslator* self, const unsigned char* data, int lenVal, struct miqt_string directory) { + QString directory_QString = QString::fromUtf8(directory.data, directory.len); return self->load(static_cast(data), static_cast(lenVal), directory_QString); } diff --git a/qt/gen_qtranslator.go b/qt/gen_qtranslator.go index 38aae842..004f8740 100644 --- a/qt/gen_qtranslator.go +++ b/qt/gen_qtranslator.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -63,24 +62,24 @@ func (this *QTranslator) MetaObject() *QMetaObject { func (this *QTranslator) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QTranslator_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QTranslator_Metacast(this.h, param1_Cstring)) } func QTranslator_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTranslator_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTranslator_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QTranslator_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTranslator_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTranslator_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -89,9 +88,9 @@ func (this *QTranslator) Translate(context string, sourceText string) string { defer C.free(unsafe.Pointer(context_Cstring)) sourceText_Cstring := C.CString(sourceText) defer C.free(unsafe.Pointer(sourceText_Cstring)) - var _ms *C.struct_miqt_string = C.QTranslator_Translate(this.h, context_Cstring, sourceText_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTranslator_Translate(this.h, context_Cstring, sourceText_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -100,29 +99,33 @@ func (this *QTranslator) IsEmpty() bool { } func (this *QTranslator) Language() string { - var _ms *C.struct_miqt_string = C.QTranslator_Language(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTranslator_Language(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QTranslator) FilePath() string { - var _ms *C.struct_miqt_string = C.QTranslator_FilePath(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTranslator_FilePath(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QTranslator) Load(filename string) bool { - filename_ms := libmiqt.Strdupg(filename) - defer C.free(filename_ms) - return (bool)(C.QTranslator_Load(this.h, (*C.struct_miqt_string)(filename_ms))) + filename_ms := C.struct_miqt_string{} + filename_ms.data = C.CString(filename) + filename_ms.len = C.size_t(len(filename)) + defer C.free(unsafe.Pointer(filename_ms.data)) + return (bool)(C.QTranslator_Load(this.h, filename_ms)) } func (this *QTranslator) Load2(locale *QLocale, filename string) bool { - filename_ms := libmiqt.Strdupg(filename) - defer C.free(filename_ms) - return (bool)(C.QTranslator_Load2(this.h, locale.cPointer(), (*C.struct_miqt_string)(filename_ms))) + filename_ms := C.struct_miqt_string{} + filename_ms.data = C.CString(filename) + filename_ms.len = C.size_t(len(filename)) + defer C.free(unsafe.Pointer(filename_ms.data)) + return (bool)(C.QTranslator_Load2(this.h, locale.cPointer(), filename_ms)) } func (this *QTranslator) Load3(data *byte, lenVal int) bool { @@ -134,9 +137,9 @@ func QTranslator_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTranslator_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTranslator_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -145,9 +148,9 @@ func QTranslator_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTranslator_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTranslator_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -156,9 +159,9 @@ func QTranslator_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTranslator_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTranslator_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -167,9 +170,9 @@ func QTranslator_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTranslator_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTranslator_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -180,9 +183,9 @@ func (this *QTranslator) Translate3(context string, sourceText string, disambigu defer C.free(unsafe.Pointer(sourceText_Cstring)) disambiguation_Cstring := C.CString(disambiguation) defer C.free(unsafe.Pointer(disambiguation_Cstring)) - var _ms *C.struct_miqt_string = C.QTranslator_Translate3(this.h, context_Cstring, sourceText_Cstring, disambiguation_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTranslator_Translate3(this.h, context_Cstring, sourceText_Cstring, disambiguation_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -193,76 +196,114 @@ func (this *QTranslator) Translate4(context string, sourceText string, disambigu defer C.free(unsafe.Pointer(sourceText_Cstring)) disambiguation_Cstring := C.CString(disambiguation) defer C.free(unsafe.Pointer(disambiguation_Cstring)) - var _ms *C.struct_miqt_string = C.QTranslator_Translate4(this.h, context_Cstring, sourceText_Cstring, disambiguation_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTranslator_Translate4(this.h, context_Cstring, sourceText_Cstring, disambiguation_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QTranslator) Load22(filename string, directory string) bool { - filename_ms := libmiqt.Strdupg(filename) - defer C.free(filename_ms) - directory_ms := libmiqt.Strdupg(directory) - defer C.free(directory_ms) - return (bool)(C.QTranslator_Load22(this.h, (*C.struct_miqt_string)(filename_ms), (*C.struct_miqt_string)(directory_ms))) + filename_ms := C.struct_miqt_string{} + filename_ms.data = C.CString(filename) + filename_ms.len = C.size_t(len(filename)) + defer C.free(unsafe.Pointer(filename_ms.data)) + directory_ms := C.struct_miqt_string{} + directory_ms.data = C.CString(directory) + directory_ms.len = C.size_t(len(directory)) + defer C.free(unsafe.Pointer(directory_ms.data)) + return (bool)(C.QTranslator_Load22(this.h, filename_ms, directory_ms)) } func (this *QTranslator) Load32(filename string, directory string, search_delimiters string) bool { - filename_ms := libmiqt.Strdupg(filename) - defer C.free(filename_ms) - directory_ms := libmiqt.Strdupg(directory) - defer C.free(directory_ms) - search_delimiters_ms := libmiqt.Strdupg(search_delimiters) - defer C.free(search_delimiters_ms) - return (bool)(C.QTranslator_Load32(this.h, (*C.struct_miqt_string)(filename_ms), (*C.struct_miqt_string)(directory_ms), (*C.struct_miqt_string)(search_delimiters_ms))) + filename_ms := C.struct_miqt_string{} + filename_ms.data = C.CString(filename) + filename_ms.len = C.size_t(len(filename)) + defer C.free(unsafe.Pointer(filename_ms.data)) + directory_ms := C.struct_miqt_string{} + directory_ms.data = C.CString(directory) + directory_ms.len = C.size_t(len(directory)) + defer C.free(unsafe.Pointer(directory_ms.data)) + search_delimiters_ms := C.struct_miqt_string{} + search_delimiters_ms.data = C.CString(search_delimiters) + search_delimiters_ms.len = C.size_t(len(search_delimiters)) + defer C.free(unsafe.Pointer(search_delimiters_ms.data)) + return (bool)(C.QTranslator_Load32(this.h, filename_ms, directory_ms, search_delimiters_ms)) } func (this *QTranslator) Load4(filename string, directory string, search_delimiters string, suffix string) bool { - filename_ms := libmiqt.Strdupg(filename) - defer C.free(filename_ms) - directory_ms := libmiqt.Strdupg(directory) - defer C.free(directory_ms) - search_delimiters_ms := libmiqt.Strdupg(search_delimiters) - defer C.free(search_delimiters_ms) - suffix_ms := libmiqt.Strdupg(suffix) - defer C.free(suffix_ms) - return (bool)(C.QTranslator_Load4(this.h, (*C.struct_miqt_string)(filename_ms), (*C.struct_miqt_string)(directory_ms), (*C.struct_miqt_string)(search_delimiters_ms), (*C.struct_miqt_string)(suffix_ms))) + filename_ms := C.struct_miqt_string{} + filename_ms.data = C.CString(filename) + filename_ms.len = C.size_t(len(filename)) + defer C.free(unsafe.Pointer(filename_ms.data)) + directory_ms := C.struct_miqt_string{} + directory_ms.data = C.CString(directory) + directory_ms.len = C.size_t(len(directory)) + defer C.free(unsafe.Pointer(directory_ms.data)) + search_delimiters_ms := C.struct_miqt_string{} + search_delimiters_ms.data = C.CString(search_delimiters) + search_delimiters_ms.len = C.size_t(len(search_delimiters)) + defer C.free(unsafe.Pointer(search_delimiters_ms.data)) + suffix_ms := C.struct_miqt_string{} + suffix_ms.data = C.CString(suffix) + suffix_ms.len = C.size_t(len(suffix)) + defer C.free(unsafe.Pointer(suffix_ms.data)) + return (bool)(C.QTranslator_Load4(this.h, filename_ms, directory_ms, search_delimiters_ms, suffix_ms)) } func (this *QTranslator) Load33(locale *QLocale, filename string, prefix string) bool { - filename_ms := libmiqt.Strdupg(filename) - defer C.free(filename_ms) - prefix_ms := libmiqt.Strdupg(prefix) - defer C.free(prefix_ms) - return (bool)(C.QTranslator_Load33(this.h, locale.cPointer(), (*C.struct_miqt_string)(filename_ms), (*C.struct_miqt_string)(prefix_ms))) + filename_ms := C.struct_miqt_string{} + filename_ms.data = C.CString(filename) + filename_ms.len = C.size_t(len(filename)) + defer C.free(unsafe.Pointer(filename_ms.data)) + prefix_ms := C.struct_miqt_string{} + prefix_ms.data = C.CString(prefix) + prefix_ms.len = C.size_t(len(prefix)) + defer C.free(unsafe.Pointer(prefix_ms.data)) + return (bool)(C.QTranslator_Load33(this.h, locale.cPointer(), filename_ms, prefix_ms)) } func (this *QTranslator) Load42(locale *QLocale, filename string, prefix string, directory string) bool { - filename_ms := libmiqt.Strdupg(filename) - defer C.free(filename_ms) - prefix_ms := libmiqt.Strdupg(prefix) - defer C.free(prefix_ms) - directory_ms := libmiqt.Strdupg(directory) - defer C.free(directory_ms) - return (bool)(C.QTranslator_Load42(this.h, locale.cPointer(), (*C.struct_miqt_string)(filename_ms), (*C.struct_miqt_string)(prefix_ms), (*C.struct_miqt_string)(directory_ms))) + filename_ms := C.struct_miqt_string{} + filename_ms.data = C.CString(filename) + filename_ms.len = C.size_t(len(filename)) + defer C.free(unsafe.Pointer(filename_ms.data)) + prefix_ms := C.struct_miqt_string{} + prefix_ms.data = C.CString(prefix) + prefix_ms.len = C.size_t(len(prefix)) + defer C.free(unsafe.Pointer(prefix_ms.data)) + directory_ms := C.struct_miqt_string{} + directory_ms.data = C.CString(directory) + directory_ms.len = C.size_t(len(directory)) + defer C.free(unsafe.Pointer(directory_ms.data)) + return (bool)(C.QTranslator_Load42(this.h, locale.cPointer(), filename_ms, prefix_ms, directory_ms)) } func (this *QTranslator) Load5(locale *QLocale, filename string, prefix string, directory string, suffix string) bool { - filename_ms := libmiqt.Strdupg(filename) - defer C.free(filename_ms) - prefix_ms := libmiqt.Strdupg(prefix) - defer C.free(prefix_ms) - directory_ms := libmiqt.Strdupg(directory) - defer C.free(directory_ms) - suffix_ms := libmiqt.Strdupg(suffix) - defer C.free(suffix_ms) - return (bool)(C.QTranslator_Load5(this.h, locale.cPointer(), (*C.struct_miqt_string)(filename_ms), (*C.struct_miqt_string)(prefix_ms), (*C.struct_miqt_string)(directory_ms), (*C.struct_miqt_string)(suffix_ms))) + filename_ms := C.struct_miqt_string{} + filename_ms.data = C.CString(filename) + filename_ms.len = C.size_t(len(filename)) + defer C.free(unsafe.Pointer(filename_ms.data)) + prefix_ms := C.struct_miqt_string{} + prefix_ms.data = C.CString(prefix) + prefix_ms.len = C.size_t(len(prefix)) + defer C.free(unsafe.Pointer(prefix_ms.data)) + directory_ms := C.struct_miqt_string{} + directory_ms.data = C.CString(directory) + directory_ms.len = C.size_t(len(directory)) + defer C.free(unsafe.Pointer(directory_ms.data)) + suffix_ms := C.struct_miqt_string{} + suffix_ms.data = C.CString(suffix) + suffix_ms.len = C.size_t(len(suffix)) + defer C.free(unsafe.Pointer(suffix_ms.data)) + return (bool)(C.QTranslator_Load5(this.h, locale.cPointer(), filename_ms, prefix_ms, directory_ms, suffix_ms)) } func (this *QTranslator) Load34(data *byte, lenVal int, directory string) bool { - directory_ms := libmiqt.Strdupg(directory) - defer C.free(directory_ms) - return (bool)(C.QTranslator_Load34(this.h, (*C.uchar)(unsafe.Pointer(data)), (C.int)(lenVal), (*C.struct_miqt_string)(directory_ms))) + directory_ms := C.struct_miqt_string{} + directory_ms.data = C.CString(directory) + directory_ms.len = C.size_t(len(directory)) + defer C.free(unsafe.Pointer(directory_ms.data)) + return (bool)(C.QTranslator_Load34(this.h, (*C.uchar)(unsafe.Pointer(data)), (C.int)(lenVal), directory_ms)) } // Delete this object from C++ memory. diff --git a/qt/gen_qtranslator.h b/qt/gen_qtranslator.h index 551a9793..d46f5642 100644 --- a/qt/gen_qtranslator.h +++ b/qt/gen_qtranslator.h @@ -29,28 +29,28 @@ QTranslator* QTranslator_new(); QTranslator* QTranslator_new2(QObject* parent); QMetaObject* QTranslator_MetaObject(const QTranslator* self); void* QTranslator_Metacast(QTranslator* self, const char* param1); -struct miqt_string* QTranslator_Tr(const char* s); -struct miqt_string* QTranslator_TrUtf8(const char* s); -struct miqt_string* QTranslator_Translate(const QTranslator* self, const char* context, const char* sourceText); +struct miqt_string QTranslator_Tr(const char* s); +struct miqt_string QTranslator_TrUtf8(const char* s); +struct miqt_string QTranslator_Translate(const QTranslator* self, const char* context, const char* sourceText); bool QTranslator_IsEmpty(const QTranslator* self); -struct miqt_string* QTranslator_Language(const QTranslator* self); -struct miqt_string* QTranslator_FilePath(const QTranslator* self); -bool QTranslator_Load(QTranslator* self, struct miqt_string* filename); -bool QTranslator_Load2(QTranslator* self, QLocale* locale, struct miqt_string* filename); +struct miqt_string QTranslator_Language(const QTranslator* self); +struct miqt_string QTranslator_FilePath(const QTranslator* self); +bool QTranslator_Load(QTranslator* self, struct miqt_string filename); +bool QTranslator_Load2(QTranslator* self, QLocale* locale, struct miqt_string filename); bool QTranslator_Load3(QTranslator* self, const unsigned char* data, int lenVal); -struct miqt_string* QTranslator_Tr2(const char* s, const char* c); -struct miqt_string* QTranslator_Tr3(const char* s, const char* c, int n); -struct miqt_string* QTranslator_TrUtf82(const char* s, const char* c); -struct miqt_string* QTranslator_TrUtf83(const char* s, const char* c, int n); -struct miqt_string* QTranslator_Translate3(const QTranslator* self, const char* context, const char* sourceText, const char* disambiguation); -struct miqt_string* QTranslator_Translate4(const QTranslator* self, const char* context, const char* sourceText, const char* disambiguation, int n); -bool QTranslator_Load22(QTranslator* self, struct miqt_string* filename, struct miqt_string* directory); -bool QTranslator_Load32(QTranslator* self, struct miqt_string* filename, struct miqt_string* directory, struct miqt_string* search_delimiters); -bool QTranslator_Load4(QTranslator* self, struct miqt_string* filename, struct miqt_string* directory, struct miqt_string* search_delimiters, struct miqt_string* suffix); -bool QTranslator_Load33(QTranslator* self, QLocale* locale, struct miqt_string* filename, struct miqt_string* prefix); -bool QTranslator_Load42(QTranslator* self, QLocale* locale, struct miqt_string* filename, struct miqt_string* prefix, struct miqt_string* directory); -bool QTranslator_Load5(QTranslator* self, QLocale* locale, struct miqt_string* filename, struct miqt_string* prefix, struct miqt_string* directory, struct miqt_string* suffix); -bool QTranslator_Load34(QTranslator* self, const unsigned char* data, int lenVal, struct miqt_string* directory); +struct miqt_string QTranslator_Tr2(const char* s, const char* c); +struct miqt_string QTranslator_Tr3(const char* s, const char* c, int n); +struct miqt_string QTranslator_TrUtf82(const char* s, const char* c); +struct miqt_string QTranslator_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QTranslator_Translate3(const QTranslator* self, const char* context, const char* sourceText, const char* disambiguation); +struct miqt_string QTranslator_Translate4(const QTranslator* self, const char* context, const char* sourceText, const char* disambiguation, int n); +bool QTranslator_Load22(QTranslator* self, struct miqt_string filename, struct miqt_string directory); +bool QTranslator_Load32(QTranslator* self, struct miqt_string filename, struct miqt_string directory, struct miqt_string search_delimiters); +bool QTranslator_Load4(QTranslator* self, struct miqt_string filename, struct miqt_string directory, struct miqt_string search_delimiters, struct miqt_string suffix); +bool QTranslator_Load33(QTranslator* self, QLocale* locale, struct miqt_string filename, struct miqt_string prefix); +bool QTranslator_Load42(QTranslator* self, QLocale* locale, struct miqt_string filename, struct miqt_string prefix, struct miqt_string directory); +bool QTranslator_Load5(QTranslator* self, QLocale* locale, struct miqt_string filename, struct miqt_string prefix, struct miqt_string directory, struct miqt_string suffix); +bool QTranslator_Load34(QTranslator* self, const unsigned char* data, int lenVal, struct miqt_string directory); void QTranslator_Delete(QTranslator* self); #ifdef __cplusplus diff --git a/qt/gen_qtransposeproxymodel.cpp b/qt/gen_qtransposeproxymodel.cpp index 9373cf37..5cd86353 100644 --- a/qt/gen_qtransposeproxymodel.cpp +++ b/qt/gen_qtransposeproxymodel.cpp @@ -28,18 +28,26 @@ void* QTransposeProxyModel_Metacast(QTransposeProxyModel* self, const char* para return self->qt_metacast(param1); } -struct miqt_string* QTransposeProxyModel_Tr(const char* s) { +struct miqt_string QTransposeProxyModel_Tr(const char* s) { QString _ret = QTransposeProxyModel::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTransposeProxyModel_TrUtf8(const char* s) { +struct miqt_string QTransposeProxyModel_TrUtf8(const char* s) { QString _ret = QTransposeProxyModel::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QTransposeProxyModel_SetSourceModel(QTransposeProxyModel* self, QAbstractItemModel* newSourceModel) { @@ -110,32 +118,48 @@ void QTransposeProxyModel_Sort(QTransposeProxyModel* self, int column) { self->sort(static_cast(column)); } -struct miqt_string* QTransposeProxyModel_Tr2(const char* s, const char* c) { +struct miqt_string QTransposeProxyModel_Tr2(const char* s, const char* c) { QString _ret = QTransposeProxyModel::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTransposeProxyModel_Tr3(const char* s, const char* c, int n) { +struct miqt_string QTransposeProxyModel_Tr3(const char* s, const char* c, int n) { QString _ret = QTransposeProxyModel::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTransposeProxyModel_TrUtf82(const char* s, const char* c) { +struct miqt_string QTransposeProxyModel_TrUtf82(const char* s, const char* c) { QString _ret = QTransposeProxyModel::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTransposeProxyModel_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QTransposeProxyModel_TrUtf83(const char* s, const char* c, int n) { QString _ret = QTransposeProxyModel::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QTransposeProxyModel_RowCount1(const QTransposeProxyModel* self, QModelIndex* parent) { diff --git a/qt/gen_qtransposeproxymodel.go b/qt/gen_qtransposeproxymodel.go index f6599365..d07c7335 100644 --- a/qt/gen_qtransposeproxymodel.go +++ b/qt/gen_qtransposeproxymodel.go @@ -62,24 +62,24 @@ func (this *QTransposeProxyModel) MetaObject() *QMetaObject { func (this *QTransposeProxyModel) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QTransposeProxyModel_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QTransposeProxyModel_Metacast(this.h, param1_Cstring)) } func QTransposeProxyModel_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTransposeProxyModel_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTransposeProxyModel_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QTransposeProxyModel_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTransposeProxyModel_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTransposeProxyModel_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -174,9 +174,9 @@ func QTransposeProxyModel_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTransposeProxyModel_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTransposeProxyModel_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -185,9 +185,9 @@ func QTransposeProxyModel_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTransposeProxyModel_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTransposeProxyModel_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -196,9 +196,9 @@ func QTransposeProxyModel_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTransposeProxyModel_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTransposeProxyModel_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -207,9 +207,9 @@ func QTransposeProxyModel_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTransposeProxyModel_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTransposeProxyModel_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qtransposeproxymodel.h b/qt/gen_qtransposeproxymodel.h index ad9deaea..cd96e004 100644 --- a/qt/gen_qtransposeproxymodel.h +++ b/qt/gen_qtransposeproxymodel.h @@ -35,8 +35,8 @@ QTransposeProxyModel* QTransposeProxyModel_new(); QTransposeProxyModel* QTransposeProxyModel_new2(QObject* parent); QMetaObject* QTransposeProxyModel_MetaObject(const QTransposeProxyModel* self); void* QTransposeProxyModel_Metacast(QTransposeProxyModel* self, const char* param1); -struct miqt_string* QTransposeProxyModel_Tr(const char* s); -struct miqt_string* QTransposeProxyModel_TrUtf8(const char* s); +struct miqt_string QTransposeProxyModel_Tr(const char* s); +struct miqt_string QTransposeProxyModel_TrUtf8(const char* s); void QTransposeProxyModel_SetSourceModel(QTransposeProxyModel* self, QAbstractItemModel* newSourceModel); int QTransposeProxyModel_RowCount(const QTransposeProxyModel* self); int QTransposeProxyModel_ColumnCount(const QTransposeProxyModel* self); @@ -54,10 +54,10 @@ bool QTransposeProxyModel_InsertColumns(QTransposeProxyModel* self, int column, bool QTransposeProxyModel_RemoveColumns(QTransposeProxyModel* self, int column, int count); bool QTransposeProxyModel_MoveColumns(QTransposeProxyModel* self, QModelIndex* sourceParent, int sourceColumn, int count, QModelIndex* destinationParent, int destinationChild); void QTransposeProxyModel_Sort(QTransposeProxyModel* self, int column); -struct miqt_string* QTransposeProxyModel_Tr2(const char* s, const char* c); -struct miqt_string* QTransposeProxyModel_Tr3(const char* s, const char* c, int n); -struct miqt_string* QTransposeProxyModel_TrUtf82(const char* s, const char* c); -struct miqt_string* QTransposeProxyModel_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QTransposeProxyModel_Tr2(const char* s, const char* c); +struct miqt_string QTransposeProxyModel_Tr3(const char* s, const char* c, int n); +struct miqt_string QTransposeProxyModel_TrUtf82(const char* s, const char* c); +struct miqt_string QTransposeProxyModel_TrUtf83(const char* s, const char* c, int n); int QTransposeProxyModel_RowCount1(const QTransposeProxyModel* self, QModelIndex* parent); int QTransposeProxyModel_ColumnCount1(const QTransposeProxyModel* self, QModelIndex* parent); QVariant* QTransposeProxyModel_HeaderData3(const QTransposeProxyModel* self, int section, int orientation, int role); diff --git a/qt/gen_qtreeview.cpp b/qt/gen_qtreeview.cpp index d228d2ed..faea1bfb 100644 --- a/qt/gen_qtreeview.cpp +++ b/qt/gen_qtreeview.cpp @@ -31,18 +31,26 @@ void* QTreeView_Metacast(QTreeView* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QTreeView_Tr(const char* s) { +struct miqt_string QTreeView_Tr(const char* s) { QString _ret = QTreeView::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTreeView_TrUtf8(const char* s) { +struct miqt_string QTreeView_TrUtf8(const char* s) { QString _ret = QTreeView::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QTreeView_SetModel(QTreeView* self, QAbstractItemModel* model) { @@ -213,8 +221,8 @@ int QTreeView_TreePosition(const QTreeView* self) { return self->treePosition(); } -void QTreeView_KeyboardSearch(QTreeView* self, struct miqt_string* search) { - QString search_QString = QString::fromUtf8(&search->data, search->len); +void QTreeView_KeyboardSearch(QTreeView* self, struct miqt_string search) { + QString search_QString = QString::fromUtf8(search.data, search.len); self->keyboardSearch(search_QString); } @@ -324,32 +332,48 @@ void QTreeView_ExpandToDepth(QTreeView* self, int depth) { self->expandToDepth(static_cast(depth)); } -struct miqt_string* QTreeView_Tr2(const char* s, const char* c) { +struct miqt_string QTreeView_Tr2(const char* s, const char* c) { QString _ret = QTreeView::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTreeView_Tr3(const char* s, const char* c, int n) { +struct miqt_string QTreeView_Tr3(const char* s, const char* c, int n) { QString _ret = QTreeView::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTreeView_TrUtf82(const char* s, const char* c) { +struct miqt_string QTreeView_TrUtf82(const char* s, const char* c) { QString _ret = QTreeView::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTreeView_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QTreeView_TrUtf83(const char* s, const char* c, int n) { QString _ret = QTreeView::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QTreeView_ScrollTo2(QTreeView* self, QModelIndex* index, int hint) { diff --git a/qt/gen_qtreeview.go b/qt/gen_qtreeview.go index b5ef984d..05adaf95 100644 --- a/qt/gen_qtreeview.go +++ b/qt/gen_qtreeview.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "runtime/cgo" "unsafe" @@ -64,24 +63,24 @@ func (this *QTreeView) MetaObject() *QMetaObject { func (this *QTreeView) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QTreeView_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QTreeView_Metacast(this.h, param1_Cstring)) } func QTreeView_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTreeView_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTreeView_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QTreeView_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTreeView_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTreeView_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -254,9 +253,11 @@ func (this *QTreeView) TreePosition() int { } func (this *QTreeView) KeyboardSearch(search string) { - search_ms := libmiqt.Strdupg(search) - defer C.free(search_ms) - C.QTreeView_KeyboardSearch(this.h, (*C.struct_miqt_string)(search_ms)) + search_ms := C.struct_miqt_string{} + search_ms.data = C.CString(search) + search_ms.len = C.size_t(len(search)) + defer C.free(unsafe.Pointer(search_ms.data)) + C.QTreeView_KeyboardSearch(this.h, search_ms) } func (this *QTreeView) VisualRect(index *QModelIndex) *QRect { @@ -396,9 +397,9 @@ func QTreeView_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTreeView_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTreeView_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -407,9 +408,9 @@ func QTreeView_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTreeView_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTreeView_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -418,9 +419,9 @@ func QTreeView_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTreeView_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTreeView_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -429,9 +430,9 @@ func QTreeView_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTreeView_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTreeView_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qtreeview.h b/qt/gen_qtreeview.h index 2bed43bd..94088964 100644 --- a/qt/gen_qtreeview.h +++ b/qt/gen_qtreeview.h @@ -39,8 +39,8 @@ QTreeView* QTreeView_new(); QTreeView* QTreeView_new2(QWidget* parent); QMetaObject* QTreeView_MetaObject(const QTreeView* self); void* QTreeView_Metacast(QTreeView* self, const char* param1); -struct miqt_string* QTreeView_Tr(const char* s); -struct miqt_string* QTreeView_TrUtf8(const char* s); +struct miqt_string QTreeView_Tr(const char* s); +struct miqt_string QTreeView_TrUtf8(const char* s); void QTreeView_SetModel(QTreeView* self, QAbstractItemModel* model); void QTreeView_SetRootIndex(QTreeView* self, QModelIndex* index); void QTreeView_SetSelectionModel(QTreeView* self, QItemSelectionModel* selectionModel); @@ -83,7 +83,7 @@ void QTreeView_SetWordWrap(QTreeView* self, bool on); bool QTreeView_WordWrap(const QTreeView* self); void QTreeView_SetTreePosition(QTreeView* self, int logicalIndex); int QTreeView_TreePosition(const QTreeView* self); -void QTreeView_KeyboardSearch(QTreeView* self, struct miqt_string* search); +void QTreeView_KeyboardSearch(QTreeView* self, struct miqt_string search); QRect* QTreeView_VisualRect(const QTreeView* self, QModelIndex* index); void QTreeView_ScrollTo(QTreeView* self, QModelIndex* index); QModelIndex* QTreeView_IndexAt(const QTreeView* self, QPoint* p); @@ -108,10 +108,10 @@ void QTreeView_ExpandAll(QTreeView* self); void QTreeView_ExpandRecursively(QTreeView* self, QModelIndex* index); void QTreeView_CollapseAll(QTreeView* self); void QTreeView_ExpandToDepth(QTreeView* self, int depth); -struct miqt_string* QTreeView_Tr2(const char* s, const char* c); -struct miqt_string* QTreeView_Tr3(const char* s, const char* c, int n); -struct miqt_string* QTreeView_TrUtf82(const char* s, const char* c); -struct miqt_string* QTreeView_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QTreeView_Tr2(const char* s, const char* c); +struct miqt_string QTreeView_Tr3(const char* s, const char* c, int n); +struct miqt_string QTreeView_TrUtf82(const char* s, const char* c); +struct miqt_string QTreeView_TrUtf83(const char* s, const char* c, int n); void QTreeView_ScrollTo2(QTreeView* self, QModelIndex* index, int hint); void QTreeView_DataChanged3(QTreeView* self, QModelIndex* topLeft, QModelIndex* bottomRight, struct miqt_array* /* of int */ roles); void QTreeView_ExpandRecursively2(QTreeView* self, QModelIndex* index, int depth); diff --git a/qt/gen_qtreewidget.cpp b/qt/gen_qtreewidget.cpp index e8fefdcb..abbe5a93 100644 --- a/qt/gen_qtreewidget.cpp +++ b/qt/gen_qtreewidget.cpp @@ -24,12 +24,12 @@ QTreeWidgetItem* QTreeWidgetItem_new() { return new QTreeWidgetItem(); } -QTreeWidgetItem* QTreeWidgetItem_new2(struct miqt_array* /* of struct miqt_string* */ strings) { +QTreeWidgetItem* QTreeWidgetItem_new2(struct miqt_array* /* of struct miqt_string */ strings) { QStringList strings_QList; strings_QList.reserve(strings->len); - struct miqt_string** strings_arr = static_cast(strings->data); + struct miqt_string* strings_arr = static_cast(strings->data); for(size_t i = 0; i < strings->len; ++i) { - QString strings_arr_i_QString = QString::fromUtf8(&strings_arr[i]->data, strings_arr[i]->len); + QString strings_arr_i_QString = QString::fromUtf8(strings_arr[i].data, strings_arr[i].len); strings_QList.push_back(strings_arr_i_QString); } return new QTreeWidgetItem(strings_QList); @@ -39,12 +39,12 @@ QTreeWidgetItem* QTreeWidgetItem_new3(QTreeWidget* treeview) { return new QTreeWidgetItem(treeview); } -QTreeWidgetItem* QTreeWidgetItem_new4(QTreeWidget* treeview, struct miqt_array* /* of struct miqt_string* */ strings) { +QTreeWidgetItem* QTreeWidgetItem_new4(QTreeWidget* treeview, struct miqt_array* /* of struct miqt_string */ strings) { QStringList strings_QList; strings_QList.reserve(strings->len); - struct miqt_string** strings_arr = static_cast(strings->data); + struct miqt_string* strings_arr = static_cast(strings->data); for(size_t i = 0; i < strings->len; ++i) { - QString strings_arr_i_QString = QString::fromUtf8(&strings_arr[i]->data, strings_arr[i]->len); + QString strings_arr_i_QString = QString::fromUtf8(strings_arr[i].data, strings_arr[i].len); strings_QList.push_back(strings_arr_i_QString); } return new QTreeWidgetItem(treeview, strings_QList); @@ -58,12 +58,12 @@ QTreeWidgetItem* QTreeWidgetItem_new6(QTreeWidgetItem* parent) { return new QTreeWidgetItem(parent); } -QTreeWidgetItem* QTreeWidgetItem_new7(QTreeWidgetItem* parent, struct miqt_array* /* of struct miqt_string* */ strings) { +QTreeWidgetItem* QTreeWidgetItem_new7(QTreeWidgetItem* parent, struct miqt_array* /* of struct miqt_string */ strings) { QStringList strings_QList; strings_QList.reserve(strings->len); - struct miqt_string** strings_arr = static_cast(strings->data); + struct miqt_string* strings_arr = static_cast(strings->data); for(size_t i = 0; i < strings->len; ++i) { - QString strings_arr_i_QString = QString::fromUtf8(&strings_arr[i]->data, strings_arr[i]->len); + QString strings_arr_i_QString = QString::fromUtf8(strings_arr[i].data, strings_arr[i].len); strings_QList.push_back(strings_arr_i_QString); } return new QTreeWidgetItem(parent, strings_QList); @@ -81,12 +81,12 @@ QTreeWidgetItem* QTreeWidgetItem_new10(int typeVal) { return new QTreeWidgetItem(static_cast(typeVal)); } -QTreeWidgetItem* QTreeWidgetItem_new11(struct miqt_array* /* of struct miqt_string* */ strings, int typeVal) { +QTreeWidgetItem* QTreeWidgetItem_new11(struct miqt_array* /* of struct miqt_string */ strings, int typeVal) { QStringList strings_QList; strings_QList.reserve(strings->len); - struct miqt_string** strings_arr = static_cast(strings->data); + struct miqt_string* strings_arr = static_cast(strings->data); for(size_t i = 0; i < strings->len; ++i) { - QString strings_arr_i_QString = QString::fromUtf8(&strings_arr[i]->data, strings_arr[i]->len); + QString strings_arr_i_QString = QString::fromUtf8(strings_arr[i].data, strings_arr[i].len); strings_QList.push_back(strings_arr_i_QString); } return new QTreeWidgetItem(strings_QList, static_cast(typeVal)); @@ -96,12 +96,12 @@ QTreeWidgetItem* QTreeWidgetItem_new12(QTreeWidget* treeview, int typeVal) { return new QTreeWidgetItem(treeview, static_cast(typeVal)); } -QTreeWidgetItem* QTreeWidgetItem_new13(QTreeWidget* treeview, struct miqt_array* /* of struct miqt_string* */ strings, int typeVal) { +QTreeWidgetItem* QTreeWidgetItem_new13(QTreeWidget* treeview, struct miqt_array* /* of struct miqt_string */ strings, int typeVal) { QStringList strings_QList; strings_QList.reserve(strings->len); - struct miqt_string** strings_arr = static_cast(strings->data); + struct miqt_string* strings_arr = static_cast(strings->data); for(size_t i = 0; i < strings->len; ++i) { - QString strings_arr_i_QString = QString::fromUtf8(&strings_arr[i]->data, strings_arr[i]->len); + QString strings_arr_i_QString = QString::fromUtf8(strings_arr[i].data, strings_arr[i].len); strings_QList.push_back(strings_arr_i_QString); } return new QTreeWidgetItem(treeview, strings_QList, static_cast(typeVal)); @@ -115,12 +115,12 @@ QTreeWidgetItem* QTreeWidgetItem_new15(QTreeWidgetItem* parent, int typeVal) { return new QTreeWidgetItem(parent, static_cast(typeVal)); } -QTreeWidgetItem* QTreeWidgetItem_new16(QTreeWidgetItem* parent, struct miqt_array* /* of struct miqt_string* */ strings, int typeVal) { +QTreeWidgetItem* QTreeWidgetItem_new16(QTreeWidgetItem* parent, struct miqt_array* /* of struct miqt_string */ strings, int typeVal) { QStringList strings_QList; strings_QList.reserve(strings->len); - struct miqt_string** strings_arr = static_cast(strings->data); + struct miqt_string* strings_arr = static_cast(strings->data); for(size_t i = 0; i < strings->len; ++i) { - QString strings_arr_i_QString = QString::fromUtf8(&strings_arr[i]->data, strings_arr[i]->len); + QString strings_arr_i_QString = QString::fromUtf8(strings_arr[i].data, strings_arr[i].len); strings_QList.push_back(strings_arr_i_QString); } return new QTreeWidgetItem(parent, strings_QList, static_cast(typeVal)); @@ -196,15 +196,19 @@ void QTreeWidgetItem_SetFlags(QTreeWidgetItem* self, int flags) { self->setFlags(static_cast(flags)); } -struct miqt_string* QTreeWidgetItem_Text(const QTreeWidgetItem* self, int column) { +struct miqt_string QTreeWidgetItem_Text(const QTreeWidgetItem* self, int column) { QString _ret = self->text(static_cast(column)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QTreeWidgetItem_SetText(QTreeWidgetItem* self, int column, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QTreeWidgetItem_SetText(QTreeWidgetItem* self, int column, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->setText(static_cast(column), text_QString); } @@ -216,39 +220,51 @@ void QTreeWidgetItem_SetIcon(QTreeWidgetItem* self, int column, QIcon* icon) { self->setIcon(static_cast(column), *icon); } -struct miqt_string* QTreeWidgetItem_StatusTip(const QTreeWidgetItem* self, int column) { +struct miqt_string QTreeWidgetItem_StatusTip(const QTreeWidgetItem* self, int column) { QString _ret = self->statusTip(static_cast(column)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QTreeWidgetItem_SetStatusTip(QTreeWidgetItem* self, int column, struct miqt_string* statusTip) { - QString statusTip_QString = QString::fromUtf8(&statusTip->data, statusTip->len); +void QTreeWidgetItem_SetStatusTip(QTreeWidgetItem* self, int column, struct miqt_string statusTip) { + QString statusTip_QString = QString::fromUtf8(statusTip.data, statusTip.len); self->setStatusTip(static_cast(column), statusTip_QString); } -struct miqt_string* QTreeWidgetItem_ToolTip(const QTreeWidgetItem* self, int column) { +struct miqt_string QTreeWidgetItem_ToolTip(const QTreeWidgetItem* self, int column) { QString _ret = self->toolTip(static_cast(column)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QTreeWidgetItem_SetToolTip(QTreeWidgetItem* self, int column, struct miqt_string* toolTip) { - QString toolTip_QString = QString::fromUtf8(&toolTip->data, toolTip->len); +void QTreeWidgetItem_SetToolTip(QTreeWidgetItem* self, int column, struct miqt_string toolTip) { + QString toolTip_QString = QString::fromUtf8(toolTip.data, toolTip.len); self->setToolTip(static_cast(column), toolTip_QString); } -struct miqt_string* QTreeWidgetItem_WhatsThis(const QTreeWidgetItem* self, int column) { +struct miqt_string QTreeWidgetItem_WhatsThis(const QTreeWidgetItem* self, int column) { QString _ret = self->whatsThis(static_cast(column)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QTreeWidgetItem_SetWhatsThis(QTreeWidgetItem* self, int column, struct miqt_string* whatsThis) { - QString whatsThis_QString = QString::fromUtf8(&whatsThis->data, whatsThis->len); +void QTreeWidgetItem_SetWhatsThis(QTreeWidgetItem* self, int column, struct miqt_string whatsThis) { + QString whatsThis_QString = QString::fromUtf8(whatsThis.data, whatsThis.len); self->setWhatsThis(static_cast(column), whatsThis_QString); } @@ -438,18 +454,26 @@ void* QTreeWidget_Metacast(QTreeWidget* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QTreeWidget_Tr(const char* s) { +struct miqt_string QTreeWidget_Tr(const char* s) { QString _ret = QTreeWidget::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTreeWidget_TrUtf8(const char* s) { +struct miqt_string QTreeWidget_TrUtf8(const char* s) { QString _ret = QTreeWidget::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QTreeWidget_ColumnCount(const QTreeWidget* self) { @@ -516,19 +540,19 @@ void QTreeWidget_SetHeaderItem(QTreeWidget* self, QTreeWidgetItem* item) { self->setHeaderItem(item); } -void QTreeWidget_SetHeaderLabels(QTreeWidget* self, struct miqt_array* /* of struct miqt_string* */ labels) { +void QTreeWidget_SetHeaderLabels(QTreeWidget* self, struct miqt_array* /* of struct miqt_string */ labels) { QStringList labels_QList; labels_QList.reserve(labels->len); - struct miqt_string** labels_arr = static_cast(labels->data); + struct miqt_string* labels_arr = static_cast(labels->data); for(size_t i = 0; i < labels->len; ++i) { - QString labels_arr_i_QString = QString::fromUtf8(&labels_arr[i]->data, labels_arr[i]->len); + QString labels_arr_i_QString = QString::fromUtf8(labels_arr[i].data, labels_arr[i].len); labels_QList.push_back(labels_arr_i_QString); } self->setHeaderLabels(labels_QList); } -void QTreeWidget_SetHeaderLabel(QTreeWidget* self, struct miqt_string* label) { - QString label_QString = QString::fromUtf8(&label->data, label->len); +void QTreeWidget_SetHeaderLabel(QTreeWidget* self, struct miqt_string label) { + QString label_QString = QString::fromUtf8(label.data, label.len); self->setHeaderLabel(label_QString); } @@ -621,8 +645,8 @@ struct miqt_array* QTreeWidget_SelectedItems(const QTreeWidget* self) { return _out; } -struct miqt_array* QTreeWidget_FindItems(const QTreeWidget* self, struct miqt_string* text, int flags) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +struct miqt_array* QTreeWidget_FindItems(const QTreeWidget* self, struct miqt_string text, int flags) { + QString text_QString = QString::fromUtf8(text.data, text.len); QList _ret = self->findItems(text_QString, static_cast(flags)); // Convert QList<> from C++ memory to manually-managed C memory QTreeWidgetItem** _arr = static_cast(malloc(sizeof(QTreeWidgetItem*) * _ret.length())); @@ -803,32 +827,48 @@ void QTreeWidget_connect_ItemSelectionChanged(QTreeWidget* self, intptr_t slot) }); } -struct miqt_string* QTreeWidget_Tr2(const char* s, const char* c) { +struct miqt_string QTreeWidget_Tr2(const char* s, const char* c) { QString _ret = QTreeWidget::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTreeWidget_Tr3(const char* s, const char* c, int n) { +struct miqt_string QTreeWidget_Tr3(const char* s, const char* c, int n) { QString _ret = QTreeWidget::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTreeWidget_TrUtf82(const char* s, const char* c) { +struct miqt_string QTreeWidget_TrUtf82(const char* s, const char* c) { QString _ret = QTreeWidget::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QTreeWidget_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QTreeWidget_TrUtf83(const char* s, const char* c, int n) { QString _ret = QTreeWidget::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QTreeWidget_EditItem2(QTreeWidget* self, QTreeWidgetItem* item, int column) { @@ -847,8 +887,8 @@ bool QTreeWidget_IsPersistentEditorOpen2(const QTreeWidget* self, QTreeWidgetIte return self->isPersistentEditorOpen(item, static_cast(column)); } -struct miqt_array* QTreeWidget_FindItems3(const QTreeWidget* self, struct miqt_string* text, int flags, int column) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +struct miqt_array* QTreeWidget_FindItems3(const QTreeWidget* self, struct miqt_string text, int flags, int column) { + QString text_QString = QString::fromUtf8(text.data, text.len); QList _ret = self->findItems(text_QString, static_cast(flags), static_cast(column)); // Convert QList<> from C++ memory to manually-managed C memory QTreeWidgetItem** _arr = static_cast(malloc(sizeof(QTreeWidgetItem*) * _ret.length())); diff --git a/qt/gen_qtreewidget.go b/qt/gen_qtreewidget.go index 9fed4211..fd39b6f1 100644 --- a/qt/gen_qtreewidget.go +++ b/qt/gen_qtreewidget.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "runtime/cgo" "unsafe" @@ -68,12 +67,14 @@ func NewQTreeWidgetItem() *QTreeWidgetItem { // NewQTreeWidgetItem2 constructs a new QTreeWidgetItem object. func NewQTreeWidgetItem2(strings []string) *QTreeWidgetItem { // For the C ABI, malloc a C array of raw pointers - strings_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(strings)))) + strings_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(strings)))) defer C.free(unsafe.Pointer(strings_CArray)) for i := range strings { - strings_i_ms := libmiqt.Strdupg(strings[i]) - defer C.free(strings_i_ms) - strings_CArray[i] = (*C.struct_miqt_string)(strings_i_ms) + strings_i_ms := C.struct_miqt_string{} + strings_i_ms.data = C.CString(strings[i]) + strings_i_ms.len = C.size_t(len(strings[i])) + defer C.free(unsafe.Pointer(strings_i_ms.data)) + strings_CArray[i] = strings_i_ms } strings_ma := &C.struct_miqt_array{len: C.size_t(len(strings)), data: unsafe.Pointer(strings_CArray)} defer runtime.KeepAlive(unsafe.Pointer(strings_ma)) @@ -90,12 +91,14 @@ func NewQTreeWidgetItem3(treeview *QTreeWidget) *QTreeWidgetItem { // NewQTreeWidgetItem4 constructs a new QTreeWidgetItem object. func NewQTreeWidgetItem4(treeview *QTreeWidget, strings []string) *QTreeWidgetItem { // For the C ABI, malloc a C array of raw pointers - strings_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(strings)))) + strings_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(strings)))) defer C.free(unsafe.Pointer(strings_CArray)) for i := range strings { - strings_i_ms := libmiqt.Strdupg(strings[i]) - defer C.free(strings_i_ms) - strings_CArray[i] = (*C.struct_miqt_string)(strings_i_ms) + strings_i_ms := C.struct_miqt_string{} + strings_i_ms.data = C.CString(strings[i]) + strings_i_ms.len = C.size_t(len(strings[i])) + defer C.free(unsafe.Pointer(strings_i_ms.data)) + strings_CArray[i] = strings_i_ms } strings_ma := &C.struct_miqt_array{len: C.size_t(len(strings)), data: unsafe.Pointer(strings_CArray)} defer runtime.KeepAlive(unsafe.Pointer(strings_ma)) @@ -118,12 +121,14 @@ func NewQTreeWidgetItem6(parent *QTreeWidgetItem) *QTreeWidgetItem { // NewQTreeWidgetItem7 constructs a new QTreeWidgetItem object. func NewQTreeWidgetItem7(parent *QTreeWidgetItem, strings []string) *QTreeWidgetItem { // For the C ABI, malloc a C array of raw pointers - strings_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(strings)))) + strings_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(strings)))) defer C.free(unsafe.Pointer(strings_CArray)) for i := range strings { - strings_i_ms := libmiqt.Strdupg(strings[i]) - defer C.free(strings_i_ms) - strings_CArray[i] = (*C.struct_miqt_string)(strings_i_ms) + strings_i_ms := C.struct_miqt_string{} + strings_i_ms.data = C.CString(strings[i]) + strings_i_ms.len = C.size_t(len(strings[i])) + defer C.free(unsafe.Pointer(strings_i_ms.data)) + strings_CArray[i] = strings_i_ms } strings_ma := &C.struct_miqt_array{len: C.size_t(len(strings)), data: unsafe.Pointer(strings_CArray)} defer runtime.KeepAlive(unsafe.Pointer(strings_ma)) @@ -152,12 +157,14 @@ func NewQTreeWidgetItem10(typeVal int) *QTreeWidgetItem { // NewQTreeWidgetItem11 constructs a new QTreeWidgetItem object. func NewQTreeWidgetItem11(strings []string, typeVal int) *QTreeWidgetItem { // For the C ABI, malloc a C array of raw pointers - strings_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(strings)))) + strings_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(strings)))) defer C.free(unsafe.Pointer(strings_CArray)) for i := range strings { - strings_i_ms := libmiqt.Strdupg(strings[i]) - defer C.free(strings_i_ms) - strings_CArray[i] = (*C.struct_miqt_string)(strings_i_ms) + strings_i_ms := C.struct_miqt_string{} + strings_i_ms.data = C.CString(strings[i]) + strings_i_ms.len = C.size_t(len(strings[i])) + defer C.free(unsafe.Pointer(strings_i_ms.data)) + strings_CArray[i] = strings_i_ms } strings_ma := &C.struct_miqt_array{len: C.size_t(len(strings)), data: unsafe.Pointer(strings_CArray)} defer runtime.KeepAlive(unsafe.Pointer(strings_ma)) @@ -174,12 +181,14 @@ func NewQTreeWidgetItem12(treeview *QTreeWidget, typeVal int) *QTreeWidgetItem { // NewQTreeWidgetItem13 constructs a new QTreeWidgetItem object. func NewQTreeWidgetItem13(treeview *QTreeWidget, strings []string, typeVal int) *QTreeWidgetItem { // For the C ABI, malloc a C array of raw pointers - strings_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(strings)))) + strings_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(strings)))) defer C.free(unsafe.Pointer(strings_CArray)) for i := range strings { - strings_i_ms := libmiqt.Strdupg(strings[i]) - defer C.free(strings_i_ms) - strings_CArray[i] = (*C.struct_miqt_string)(strings_i_ms) + strings_i_ms := C.struct_miqt_string{} + strings_i_ms.data = C.CString(strings[i]) + strings_i_ms.len = C.size_t(len(strings[i])) + defer C.free(unsafe.Pointer(strings_i_ms.data)) + strings_CArray[i] = strings_i_ms } strings_ma := &C.struct_miqt_array{len: C.size_t(len(strings)), data: unsafe.Pointer(strings_CArray)} defer runtime.KeepAlive(unsafe.Pointer(strings_ma)) @@ -202,12 +211,14 @@ func NewQTreeWidgetItem15(parent *QTreeWidgetItem, typeVal int) *QTreeWidgetItem // NewQTreeWidgetItem16 constructs a new QTreeWidgetItem object. func NewQTreeWidgetItem16(parent *QTreeWidgetItem, strings []string, typeVal int) *QTreeWidgetItem { // For the C ABI, malloc a C array of raw pointers - strings_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(strings)))) + strings_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(strings)))) defer C.free(unsafe.Pointer(strings_CArray)) for i := range strings { - strings_i_ms := libmiqt.Strdupg(strings[i]) - defer C.free(strings_i_ms) - strings_CArray[i] = (*C.struct_miqt_string)(strings_i_ms) + strings_i_ms := C.struct_miqt_string{} + strings_i_ms.data = C.CString(strings[i]) + strings_i_ms.len = C.size_t(len(strings[i])) + defer C.free(unsafe.Pointer(strings_i_ms.data)) + strings_CArray[i] = strings_i_ms } strings_ma := &C.struct_miqt_array{len: C.size_t(len(strings)), data: unsafe.Pointer(strings_CArray)} defer runtime.KeepAlive(unsafe.Pointer(strings_ma)) @@ -286,16 +297,18 @@ func (this *QTreeWidgetItem) SetFlags(flags ItemFlag) { } func (this *QTreeWidgetItem) Text(column int) string { - var _ms *C.struct_miqt_string = C.QTreeWidgetItem_Text(this.h, (C.int)(column)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTreeWidgetItem_Text(this.h, (C.int)(column)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QTreeWidgetItem) SetText(column int, text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QTreeWidgetItem_SetText(this.h, (C.int)(column), (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QTreeWidgetItem_SetText(this.h, (C.int)(column), text_ms) } func (this *QTreeWidgetItem) Icon(column int) *QIcon { @@ -310,42 +323,48 @@ func (this *QTreeWidgetItem) SetIcon(column int, icon *QIcon) { } func (this *QTreeWidgetItem) StatusTip(column int) string { - var _ms *C.struct_miqt_string = C.QTreeWidgetItem_StatusTip(this.h, (C.int)(column)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTreeWidgetItem_StatusTip(this.h, (C.int)(column)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QTreeWidgetItem) SetStatusTip(column int, statusTip string) { - statusTip_ms := libmiqt.Strdupg(statusTip) - defer C.free(statusTip_ms) - C.QTreeWidgetItem_SetStatusTip(this.h, (C.int)(column), (*C.struct_miqt_string)(statusTip_ms)) + statusTip_ms := C.struct_miqt_string{} + statusTip_ms.data = C.CString(statusTip) + statusTip_ms.len = C.size_t(len(statusTip)) + defer C.free(unsafe.Pointer(statusTip_ms.data)) + C.QTreeWidgetItem_SetStatusTip(this.h, (C.int)(column), statusTip_ms) } func (this *QTreeWidgetItem) ToolTip(column int) string { - var _ms *C.struct_miqt_string = C.QTreeWidgetItem_ToolTip(this.h, (C.int)(column)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTreeWidgetItem_ToolTip(this.h, (C.int)(column)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QTreeWidgetItem) SetToolTip(column int, toolTip string) { - toolTip_ms := libmiqt.Strdupg(toolTip) - defer C.free(toolTip_ms) - C.QTreeWidgetItem_SetToolTip(this.h, (C.int)(column), (*C.struct_miqt_string)(toolTip_ms)) + toolTip_ms := C.struct_miqt_string{} + toolTip_ms.data = C.CString(toolTip) + toolTip_ms.len = C.size_t(len(toolTip)) + defer C.free(unsafe.Pointer(toolTip_ms.data)) + C.QTreeWidgetItem_SetToolTip(this.h, (C.int)(column), toolTip_ms) } func (this *QTreeWidgetItem) WhatsThis(column int) string { - var _ms *C.struct_miqt_string = C.QTreeWidgetItem_WhatsThis(this.h, (C.int)(column)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTreeWidgetItem_WhatsThis(this.h, (C.int)(column)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QTreeWidgetItem) SetWhatsThis(column int, whatsThis string) { - whatsThis_ms := libmiqt.Strdupg(whatsThis) - defer C.free(whatsThis_ms) - C.QTreeWidgetItem_SetWhatsThis(this.h, (C.int)(column), (*C.struct_miqt_string)(whatsThis_ms)) + whatsThis_ms := C.struct_miqt_string{} + whatsThis_ms.data = C.CString(whatsThis) + whatsThis_ms.len = C.size_t(len(whatsThis)) + defer C.free(unsafe.Pointer(whatsThis_ms.data)) + C.QTreeWidgetItem_SetWhatsThis(this.h, (C.int)(column), whatsThis_ms) } func (this *QTreeWidgetItem) Font(column int) *QFont { @@ -599,24 +618,24 @@ func (this *QTreeWidget) MetaObject() *QMetaObject { func (this *QTreeWidget) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QTreeWidget_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QTreeWidget_Metacast(this.h, param1_Cstring)) } func QTreeWidget_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTreeWidget_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTreeWidget_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QTreeWidget_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTreeWidget_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTreeWidget_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -690,12 +709,14 @@ func (this *QTreeWidget) SetHeaderItem(item *QTreeWidgetItem) { func (this *QTreeWidget) SetHeaderLabels(labels []string) { // For the C ABI, malloc a C array of raw pointers - labels_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(labels)))) + labels_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(labels)))) defer C.free(unsafe.Pointer(labels_CArray)) for i := range labels { - labels_i_ms := libmiqt.Strdupg(labels[i]) - defer C.free(labels_i_ms) - labels_CArray[i] = (*C.struct_miqt_string)(labels_i_ms) + labels_i_ms := C.struct_miqt_string{} + labels_i_ms.data = C.CString(labels[i]) + labels_i_ms.len = C.size_t(len(labels[i])) + defer C.free(unsafe.Pointer(labels_i_ms.data)) + labels_CArray[i] = labels_i_ms } labels_ma := &C.struct_miqt_array{len: C.size_t(len(labels)), data: unsafe.Pointer(labels_CArray)} defer runtime.KeepAlive(unsafe.Pointer(labels_ma)) @@ -703,9 +724,11 @@ func (this *QTreeWidget) SetHeaderLabels(labels []string) { } func (this *QTreeWidget) SetHeaderLabel(label string) { - label_ms := libmiqt.Strdupg(label) - defer C.free(label_ms) - C.QTreeWidget_SetHeaderLabel(this.h, (*C.struct_miqt_string)(label_ms)) + label_ms := C.struct_miqt_string{} + label_ms.data = C.CString(label) + label_ms.len = C.size_t(len(label)) + defer C.free(unsafe.Pointer(label_ms.data)) + C.QTreeWidget_SetHeaderLabel(this.h, label_ms) } func (this *QTreeWidget) CurrentItem() *QTreeWidgetItem { @@ -799,9 +822,11 @@ func (this *QTreeWidget) SelectedItems() []*QTreeWidgetItem { } func (this *QTreeWidget) FindItems(text string, flags MatchFlag) []*QTreeWidgetItem { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - var _ma *C.struct_miqt_array = C.QTreeWidget_FindItems(this.h, (*C.struct_miqt_string)(text_ms), (C.int)(flags)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + var _ma *C.struct_miqt_array = C.QTreeWidget_FindItems(this.h, text_ms, (C.int)(flags)) _ret := make([]*QTreeWidgetItem, int(_ma.len)) _outCast := (*[0xffff]*C.QTreeWidgetItem)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -1072,9 +1097,9 @@ func QTreeWidget_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTreeWidget_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTreeWidget_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -1083,9 +1108,9 @@ func QTreeWidget_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTreeWidget_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTreeWidget_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -1094,9 +1119,9 @@ func QTreeWidget_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTreeWidget_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTreeWidget_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -1105,9 +1130,9 @@ func QTreeWidget_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTreeWidget_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QTreeWidget_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -1128,9 +1153,11 @@ func (this *QTreeWidget) IsPersistentEditorOpen2(item *QTreeWidgetItem, column i } func (this *QTreeWidget) FindItems3(text string, flags MatchFlag, column int) []*QTreeWidgetItem { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - var _ma *C.struct_miqt_array = C.QTreeWidget_FindItems3(this.h, (*C.struct_miqt_string)(text_ms), (C.int)(flags), (C.int)(column)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + var _ma *C.struct_miqt_array = C.QTreeWidget_FindItems3(this.h, text_ms, (C.int)(flags), (C.int)(column)) _ret := make([]*QTreeWidgetItem, int(_ma.len)) _outCast := (*[0xffff]*C.QTreeWidgetItem)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { diff --git a/qt/gen_qtreewidget.h b/qt/gen_qtreewidget.h index fcc6680b..849678e6 100644 --- a/qt/gen_qtreewidget.h +++ b/qt/gen_qtreewidget.h @@ -46,21 +46,21 @@ typedef struct QWidget QWidget; #endif QTreeWidgetItem* QTreeWidgetItem_new(); -QTreeWidgetItem* QTreeWidgetItem_new2(struct miqt_array* /* of struct miqt_string* */ strings); +QTreeWidgetItem* QTreeWidgetItem_new2(struct miqt_array* /* of struct miqt_string */ strings); QTreeWidgetItem* QTreeWidgetItem_new3(QTreeWidget* treeview); -QTreeWidgetItem* QTreeWidgetItem_new4(QTreeWidget* treeview, struct miqt_array* /* of struct miqt_string* */ strings); +QTreeWidgetItem* QTreeWidgetItem_new4(QTreeWidget* treeview, struct miqt_array* /* of struct miqt_string */ strings); QTreeWidgetItem* QTreeWidgetItem_new5(QTreeWidget* treeview, QTreeWidgetItem* after); QTreeWidgetItem* QTreeWidgetItem_new6(QTreeWidgetItem* parent); -QTreeWidgetItem* QTreeWidgetItem_new7(QTreeWidgetItem* parent, struct miqt_array* /* of struct miqt_string* */ strings); +QTreeWidgetItem* QTreeWidgetItem_new7(QTreeWidgetItem* parent, struct miqt_array* /* of struct miqt_string */ strings); QTreeWidgetItem* QTreeWidgetItem_new8(QTreeWidgetItem* parent, QTreeWidgetItem* after); QTreeWidgetItem* QTreeWidgetItem_new9(QTreeWidgetItem* other); QTreeWidgetItem* QTreeWidgetItem_new10(int typeVal); -QTreeWidgetItem* QTreeWidgetItem_new11(struct miqt_array* /* of struct miqt_string* */ strings, int typeVal); +QTreeWidgetItem* QTreeWidgetItem_new11(struct miqt_array* /* of struct miqt_string */ strings, int typeVal); QTreeWidgetItem* QTreeWidgetItem_new12(QTreeWidget* treeview, int typeVal); -QTreeWidgetItem* QTreeWidgetItem_new13(QTreeWidget* treeview, struct miqt_array* /* of struct miqt_string* */ strings, int typeVal); +QTreeWidgetItem* QTreeWidgetItem_new13(QTreeWidget* treeview, struct miqt_array* /* of struct miqt_string */ strings, int typeVal); QTreeWidgetItem* QTreeWidgetItem_new14(QTreeWidget* treeview, QTreeWidgetItem* after, int typeVal); QTreeWidgetItem* QTreeWidgetItem_new15(QTreeWidgetItem* parent, int typeVal); -QTreeWidgetItem* QTreeWidgetItem_new16(QTreeWidgetItem* parent, struct miqt_array* /* of struct miqt_string* */ strings, int typeVal); +QTreeWidgetItem* QTreeWidgetItem_new16(QTreeWidgetItem* parent, struct miqt_array* /* of struct miqt_string */ strings, int typeVal); QTreeWidgetItem* QTreeWidgetItem_new17(QTreeWidgetItem* parent, QTreeWidgetItem* after, int typeVal); QTreeWidgetItem* QTreeWidgetItem_Clone(const QTreeWidgetItem* self); QTreeWidget* QTreeWidgetItem_TreeWidget(const QTreeWidgetItem* self); @@ -78,16 +78,16 @@ void QTreeWidgetItem_SetChildIndicatorPolicy(QTreeWidgetItem* self, int policy); int QTreeWidgetItem_ChildIndicatorPolicy(const QTreeWidgetItem* self); int QTreeWidgetItem_Flags(const QTreeWidgetItem* self); void QTreeWidgetItem_SetFlags(QTreeWidgetItem* self, int flags); -struct miqt_string* QTreeWidgetItem_Text(const QTreeWidgetItem* self, int column); -void QTreeWidgetItem_SetText(QTreeWidgetItem* self, int column, struct miqt_string* text); +struct miqt_string QTreeWidgetItem_Text(const QTreeWidgetItem* self, int column); +void QTreeWidgetItem_SetText(QTreeWidgetItem* self, int column, struct miqt_string text); QIcon* QTreeWidgetItem_Icon(const QTreeWidgetItem* self, int column); void QTreeWidgetItem_SetIcon(QTreeWidgetItem* self, int column, QIcon* icon); -struct miqt_string* QTreeWidgetItem_StatusTip(const QTreeWidgetItem* self, int column); -void QTreeWidgetItem_SetStatusTip(QTreeWidgetItem* self, int column, struct miqt_string* statusTip); -struct miqt_string* QTreeWidgetItem_ToolTip(const QTreeWidgetItem* self, int column); -void QTreeWidgetItem_SetToolTip(QTreeWidgetItem* self, int column, struct miqt_string* toolTip); -struct miqt_string* QTreeWidgetItem_WhatsThis(const QTreeWidgetItem* self, int column); -void QTreeWidgetItem_SetWhatsThis(QTreeWidgetItem* self, int column, struct miqt_string* whatsThis); +struct miqt_string QTreeWidgetItem_StatusTip(const QTreeWidgetItem* self, int column); +void QTreeWidgetItem_SetStatusTip(QTreeWidgetItem* self, int column, struct miqt_string statusTip); +struct miqt_string QTreeWidgetItem_ToolTip(const QTreeWidgetItem* self, int column); +void QTreeWidgetItem_SetToolTip(QTreeWidgetItem* self, int column, struct miqt_string toolTip); +struct miqt_string QTreeWidgetItem_WhatsThis(const QTreeWidgetItem* self, int column); +void QTreeWidgetItem_SetWhatsThis(QTreeWidgetItem* self, int column, struct miqt_string whatsThis); QFont* QTreeWidgetItem_Font(const QTreeWidgetItem* self, int column); void QTreeWidgetItem_SetFont(QTreeWidgetItem* self, int column, QFont* font); int QTreeWidgetItem_TextAlignment(const QTreeWidgetItem* self, int column); @@ -130,8 +130,8 @@ QTreeWidget* QTreeWidget_new(); QTreeWidget* QTreeWidget_new2(QWidget* parent); QMetaObject* QTreeWidget_MetaObject(const QTreeWidget* self); void* QTreeWidget_Metacast(QTreeWidget* self, const char* param1); -struct miqt_string* QTreeWidget_Tr(const char* s); -struct miqt_string* QTreeWidget_TrUtf8(const char* s); +struct miqt_string QTreeWidget_Tr(const char* s); +struct miqt_string QTreeWidget_TrUtf8(const char* s); int QTreeWidget_ColumnCount(const QTreeWidget* self); void QTreeWidget_SetColumnCount(QTreeWidget* self, int columns); QTreeWidgetItem* QTreeWidget_InvisibleRootItem(const QTreeWidget* self); @@ -145,8 +145,8 @@ void QTreeWidget_InsertTopLevelItems(QTreeWidget* self, int index, struct miqt_a void QTreeWidget_AddTopLevelItems(QTreeWidget* self, struct miqt_array* /* of QTreeWidgetItem* */ items); QTreeWidgetItem* QTreeWidget_HeaderItem(const QTreeWidget* self); void QTreeWidget_SetHeaderItem(QTreeWidget* self, QTreeWidgetItem* item); -void QTreeWidget_SetHeaderLabels(QTreeWidget* self, struct miqt_array* /* of struct miqt_string* */ labels); -void QTreeWidget_SetHeaderLabel(QTreeWidget* self, struct miqt_string* label); +void QTreeWidget_SetHeaderLabels(QTreeWidget* self, struct miqt_array* /* of struct miqt_string */ labels); +void QTreeWidget_SetHeaderLabel(QTreeWidget* self, struct miqt_string label); QTreeWidgetItem* QTreeWidget_CurrentItem(const QTreeWidget* self); int QTreeWidget_CurrentColumn(const QTreeWidget* self); void QTreeWidget_SetCurrentItem(QTreeWidget* self, QTreeWidgetItem* item); @@ -167,7 +167,7 @@ void QTreeWidget_RemoveItemWidget(QTreeWidget* self, QTreeWidgetItem* item, int bool QTreeWidget_IsItemSelected(const QTreeWidget* self, QTreeWidgetItem* item); void QTreeWidget_SetItemSelected(QTreeWidget* self, QTreeWidgetItem* item, bool selectVal); struct miqt_array* QTreeWidget_SelectedItems(const QTreeWidget* self); -struct miqt_array* QTreeWidget_FindItems(const QTreeWidget* self, struct miqt_string* text, int flags); +struct miqt_array* QTreeWidget_FindItems(const QTreeWidget* self, struct miqt_string text, int flags); bool QTreeWidget_IsItemHidden(const QTreeWidget* self, QTreeWidgetItem* item); void QTreeWidget_SetItemHidden(QTreeWidget* self, QTreeWidgetItem* item, bool hide); bool QTreeWidget_IsItemExpanded(const QTreeWidget* self, QTreeWidgetItem* item); @@ -201,15 +201,15 @@ void QTreeWidget_CurrentItemChanged(QTreeWidget* self, QTreeWidgetItem* current, void QTreeWidget_connect_CurrentItemChanged(QTreeWidget* self, intptr_t slot); void QTreeWidget_ItemSelectionChanged(QTreeWidget* self); void QTreeWidget_connect_ItemSelectionChanged(QTreeWidget* self, intptr_t slot); -struct miqt_string* QTreeWidget_Tr2(const char* s, const char* c); -struct miqt_string* QTreeWidget_Tr3(const char* s, const char* c, int n); -struct miqt_string* QTreeWidget_TrUtf82(const char* s, const char* c); -struct miqt_string* QTreeWidget_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QTreeWidget_Tr2(const char* s, const char* c); +struct miqt_string QTreeWidget_Tr3(const char* s, const char* c, int n); +struct miqt_string QTreeWidget_TrUtf82(const char* s, const char* c); +struct miqt_string QTreeWidget_TrUtf83(const char* s, const char* c, int n); void QTreeWidget_EditItem2(QTreeWidget* self, QTreeWidgetItem* item, int column); void QTreeWidget_OpenPersistentEditor2(QTreeWidget* self, QTreeWidgetItem* item, int column); void QTreeWidget_ClosePersistentEditor2(QTreeWidget* self, QTreeWidgetItem* item, int column); bool QTreeWidget_IsPersistentEditorOpen2(const QTreeWidget* self, QTreeWidgetItem* item, int column); -struct miqt_array* QTreeWidget_FindItems3(const QTreeWidget* self, struct miqt_string* text, int flags, int column); +struct miqt_array* QTreeWidget_FindItems3(const QTreeWidget* self, struct miqt_string text, int flags, int column); void QTreeWidget_ScrollToItem2(QTreeWidget* self, QTreeWidgetItem* item, int hint); void QTreeWidget_Delete(QTreeWidget* self); diff --git a/qt/gen_qundogroup.cpp b/qt/gen_qundogroup.cpp index 14af56d4..baf8b106 100644 --- a/qt/gen_qundogroup.cpp +++ b/qt/gen_qundogroup.cpp @@ -27,18 +27,26 @@ void* QUndoGroup_Metacast(QUndoGroup* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QUndoGroup_Tr(const char* s) { +struct miqt_string QUndoGroup_Tr(const char* s) { QString _ret = QUndoGroup::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QUndoGroup_TrUtf8(const char* s) { +struct miqt_string QUndoGroup_TrUtf8(const char* s) { QString _ret = QUndoGroup::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QUndoGroup_AddStack(QUndoGroup* self, QUndoStack* stack) { @@ -82,18 +90,26 @@ bool QUndoGroup_CanRedo(const QUndoGroup* self) { return self->canRedo(); } -struct miqt_string* QUndoGroup_UndoText(const QUndoGroup* self) { +struct miqt_string QUndoGroup_UndoText(const QUndoGroup* self) { QString _ret = self->undoText(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QUndoGroup_RedoText(const QUndoGroup* self) { +struct miqt_string QUndoGroup_RedoText(const QUndoGroup* self) { QString _ret = self->redoText(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } bool QUndoGroup_IsClean(const QUndoGroup* self) { @@ -167,8 +183,8 @@ void QUndoGroup_connect_CanRedoChanged(QUndoGroup* self, intptr_t slot) { }); } -void QUndoGroup_UndoTextChanged(QUndoGroup* self, struct miqt_string* undoText) { - QString undoText_QString = QString::fromUtf8(&undoText->data, undoText->len); +void QUndoGroup_UndoTextChanged(QUndoGroup* self, struct miqt_string undoText) { + QString undoText_QString = QString::fromUtf8(undoText.data, undoText.len); self->undoTextChanged(undoText_QString); } @@ -177,13 +193,17 @@ void QUndoGroup_connect_UndoTextChanged(QUndoGroup* self, intptr_t slot) { const QString undoText_ret = undoText; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray undoText_b = undoText_ret.toUtf8(); - struct miqt_string* sigval1 = miqt_strdup(undoText_b.data(), undoText_b.length()); + struct miqt_string undoText_ms; + undoText_ms.len = undoText_b.length(); + undoText_ms.data = static_cast(malloc(undoText_ms.len)); + memcpy(undoText_ms.data, undoText_b.data(), undoText_ms.len); + struct miqt_string sigval1 = undoText_ms; miqt_exec_callback_QUndoGroup_UndoTextChanged(slot, sigval1); }); } -void QUndoGroup_RedoTextChanged(QUndoGroup* self, struct miqt_string* redoText) { - QString redoText_QString = QString::fromUtf8(&redoText->data, redoText->len); +void QUndoGroup_RedoTextChanged(QUndoGroup* self, struct miqt_string redoText) { + QString redoText_QString = QString::fromUtf8(redoText.data, redoText.len); self->redoTextChanged(redoText_QString); } @@ -192,46 +212,66 @@ void QUndoGroup_connect_RedoTextChanged(QUndoGroup* self, intptr_t slot) { const QString redoText_ret = redoText; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray redoText_b = redoText_ret.toUtf8(); - struct miqt_string* sigval1 = miqt_strdup(redoText_b.data(), redoText_b.length()); + struct miqt_string redoText_ms; + redoText_ms.len = redoText_b.length(); + redoText_ms.data = static_cast(malloc(redoText_ms.len)); + memcpy(redoText_ms.data, redoText_b.data(), redoText_ms.len); + struct miqt_string sigval1 = redoText_ms; miqt_exec_callback_QUndoGroup_RedoTextChanged(slot, sigval1); }); } -struct miqt_string* QUndoGroup_Tr2(const char* s, const char* c) { +struct miqt_string QUndoGroup_Tr2(const char* s, const char* c) { QString _ret = QUndoGroup::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QUndoGroup_Tr3(const char* s, const char* c, int n) { +struct miqt_string QUndoGroup_Tr3(const char* s, const char* c, int n) { QString _ret = QUndoGroup::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QUndoGroup_TrUtf82(const char* s, const char* c) { +struct miqt_string QUndoGroup_TrUtf82(const char* s, const char* c) { QString _ret = QUndoGroup::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QUndoGroup_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QUndoGroup_TrUtf83(const char* s, const char* c, int n) { QString _ret = QUndoGroup::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -QAction* QUndoGroup_CreateUndoAction2(const QUndoGroup* self, QObject* parent, struct miqt_string* prefix) { - QString prefix_QString = QString::fromUtf8(&prefix->data, prefix->len); +QAction* QUndoGroup_CreateUndoAction2(const QUndoGroup* self, QObject* parent, struct miqt_string prefix) { + QString prefix_QString = QString::fromUtf8(prefix.data, prefix.len); return self->createUndoAction(parent, prefix_QString); } -QAction* QUndoGroup_CreateRedoAction2(const QUndoGroup* self, QObject* parent, struct miqt_string* prefix) { - QString prefix_QString = QString::fromUtf8(&prefix->data, prefix->len); +QAction* QUndoGroup_CreateRedoAction2(const QUndoGroup* self, QObject* parent, struct miqt_string prefix) { + QString prefix_QString = QString::fromUtf8(prefix.data, prefix.len); return self->createRedoAction(parent, prefix_QString); } diff --git a/qt/gen_qundogroup.go b/qt/gen_qundogroup.go index ca2626a7..f2235257 100644 --- a/qt/gen_qundogroup.go +++ b/qt/gen_qundogroup.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "runtime/cgo" "unsafe" @@ -64,24 +63,24 @@ func (this *QUndoGroup) MetaObject() *QMetaObject { func (this *QUndoGroup) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QUndoGroup_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QUndoGroup_Metacast(this.h, param1_Cstring)) } func QUndoGroup_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QUndoGroup_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QUndoGroup_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QUndoGroup_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QUndoGroup_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QUndoGroup_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -125,16 +124,16 @@ func (this *QUndoGroup) CanRedo() bool { } func (this *QUndoGroup) UndoText() string { - var _ms *C.struct_miqt_string = C.QUndoGroup_UndoText(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QUndoGroup_UndoText(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QUndoGroup) RedoText() string { - var _ms *C.struct_miqt_string = C.QUndoGroup_RedoText(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QUndoGroup_RedoText(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -255,50 +254,54 @@ func miqt_exec_callback_QUndoGroup_CanRedoChanged(cb C.intptr_t, canRedo C.bool) } func (this *QUndoGroup) UndoTextChanged(undoText string) { - undoText_ms := libmiqt.Strdupg(undoText) - defer C.free(undoText_ms) - C.QUndoGroup_UndoTextChanged(this.h, (*C.struct_miqt_string)(undoText_ms)) + undoText_ms := C.struct_miqt_string{} + undoText_ms.data = C.CString(undoText) + undoText_ms.len = C.size_t(len(undoText)) + defer C.free(unsafe.Pointer(undoText_ms.data)) + C.QUndoGroup_UndoTextChanged(this.h, undoText_ms) } func (this *QUndoGroup) OnUndoTextChanged(slot func(undoText string)) { C.QUndoGroup_connect_UndoTextChanged(this.h, C.intptr_t(cgo.NewHandle(slot))) } //export miqt_exec_callback_QUndoGroup_UndoTextChanged -func miqt_exec_callback_QUndoGroup_UndoTextChanged(cb C.intptr_t, undoText *C.struct_miqt_string) { +func miqt_exec_callback_QUndoGroup_UndoTextChanged(cb C.intptr_t, undoText C.struct_miqt_string) { gofunc, ok := cgo.Handle(cb).Value().(func(undoText string)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") } // Convert all CABI parameters to Go parameters - var undoText_ms *C.struct_miqt_string = undoText - undoText_ret := C.GoStringN(&undoText_ms.data, C.int(int64(undoText_ms.len))) - C.free(unsafe.Pointer(undoText_ms)) + var undoText_ms C.struct_miqt_string = undoText + undoText_ret := C.GoStringN(undoText_ms.data, C.int(int64(undoText_ms.len))) + C.free(unsafe.Pointer(undoText_ms.data)) slotval1 := undoText_ret gofunc(slotval1) } func (this *QUndoGroup) RedoTextChanged(redoText string) { - redoText_ms := libmiqt.Strdupg(redoText) - defer C.free(redoText_ms) - C.QUndoGroup_RedoTextChanged(this.h, (*C.struct_miqt_string)(redoText_ms)) + redoText_ms := C.struct_miqt_string{} + redoText_ms.data = C.CString(redoText) + redoText_ms.len = C.size_t(len(redoText)) + defer C.free(unsafe.Pointer(redoText_ms.data)) + C.QUndoGroup_RedoTextChanged(this.h, redoText_ms) } func (this *QUndoGroup) OnRedoTextChanged(slot func(redoText string)) { C.QUndoGroup_connect_RedoTextChanged(this.h, C.intptr_t(cgo.NewHandle(slot))) } //export miqt_exec_callback_QUndoGroup_RedoTextChanged -func miqt_exec_callback_QUndoGroup_RedoTextChanged(cb C.intptr_t, redoText *C.struct_miqt_string) { +func miqt_exec_callback_QUndoGroup_RedoTextChanged(cb C.intptr_t, redoText C.struct_miqt_string) { gofunc, ok := cgo.Handle(cb).Value().(func(redoText string)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") } // Convert all CABI parameters to Go parameters - var redoText_ms *C.struct_miqt_string = redoText - redoText_ret := C.GoStringN(&redoText_ms.data, C.int(int64(redoText_ms.len))) - C.free(unsafe.Pointer(redoText_ms)) + var redoText_ms C.struct_miqt_string = redoText + redoText_ret := C.GoStringN(redoText_ms.data, C.int(int64(redoText_ms.len))) + C.free(unsafe.Pointer(redoText_ms.data)) slotval1 := redoText_ret gofunc(slotval1) @@ -309,9 +312,9 @@ func QUndoGroup_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QUndoGroup_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QUndoGroup_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -320,9 +323,9 @@ func QUndoGroup_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QUndoGroup_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QUndoGroup_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -331,9 +334,9 @@ func QUndoGroup_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QUndoGroup_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QUndoGroup_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -342,22 +345,26 @@ func QUndoGroup_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QUndoGroup_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QUndoGroup_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QUndoGroup) CreateUndoAction2(parent *QObject, prefix string) *QAction { - prefix_ms := libmiqt.Strdupg(prefix) - defer C.free(prefix_ms) - return UnsafeNewQAction(unsafe.Pointer(C.QUndoGroup_CreateUndoAction2(this.h, parent.cPointer(), (*C.struct_miqt_string)(prefix_ms)))) + prefix_ms := C.struct_miqt_string{} + prefix_ms.data = C.CString(prefix) + prefix_ms.len = C.size_t(len(prefix)) + defer C.free(unsafe.Pointer(prefix_ms.data)) + return UnsafeNewQAction(unsafe.Pointer(C.QUndoGroup_CreateUndoAction2(this.h, parent.cPointer(), prefix_ms))) } func (this *QUndoGroup) CreateRedoAction2(parent *QObject, prefix string) *QAction { - prefix_ms := libmiqt.Strdupg(prefix) - defer C.free(prefix_ms) - return UnsafeNewQAction(unsafe.Pointer(C.QUndoGroup_CreateRedoAction2(this.h, parent.cPointer(), (*C.struct_miqt_string)(prefix_ms)))) + prefix_ms := C.struct_miqt_string{} + prefix_ms.data = C.CString(prefix) + prefix_ms.len = C.size_t(len(prefix)) + defer C.free(unsafe.Pointer(prefix_ms.data)) + return UnsafeNewQAction(unsafe.Pointer(C.QUndoGroup_CreateRedoAction2(this.h, parent.cPointer(), prefix_ms))) } // Delete this object from C++ memory. diff --git a/qt/gen_qundogroup.h b/qt/gen_qundogroup.h index f2a123dc..4f4fef31 100644 --- a/qt/gen_qundogroup.h +++ b/qt/gen_qundogroup.h @@ -31,8 +31,8 @@ QUndoGroup* QUndoGroup_new(); QUndoGroup* QUndoGroup_new2(QObject* parent); QMetaObject* QUndoGroup_MetaObject(const QUndoGroup* self); void* QUndoGroup_Metacast(QUndoGroup* self, const char* param1); -struct miqt_string* QUndoGroup_Tr(const char* s); -struct miqt_string* QUndoGroup_TrUtf8(const char* s); +struct miqt_string QUndoGroup_Tr(const char* s); +struct miqt_string QUndoGroup_TrUtf8(const char* s); void QUndoGroup_AddStack(QUndoGroup* self, QUndoStack* stack); void QUndoGroup_RemoveStack(QUndoGroup* self, QUndoStack* stack); struct miqt_array* QUndoGroup_Stacks(const QUndoGroup* self); @@ -41,8 +41,8 @@ QAction* QUndoGroup_CreateUndoAction(const QUndoGroup* self, QObject* parent); QAction* QUndoGroup_CreateRedoAction(const QUndoGroup* self, QObject* parent); bool QUndoGroup_CanUndo(const QUndoGroup* self); bool QUndoGroup_CanRedo(const QUndoGroup* self); -struct miqt_string* QUndoGroup_UndoText(const QUndoGroup* self); -struct miqt_string* QUndoGroup_RedoText(const QUndoGroup* self); +struct miqt_string QUndoGroup_UndoText(const QUndoGroup* self); +struct miqt_string QUndoGroup_RedoText(const QUndoGroup* self); bool QUndoGroup_IsClean(const QUndoGroup* self); void QUndoGroup_Undo(QUndoGroup* self); void QUndoGroup_Redo(QUndoGroup* self); @@ -57,16 +57,16 @@ void QUndoGroup_CanUndoChanged(QUndoGroup* self, bool canUndo); void QUndoGroup_connect_CanUndoChanged(QUndoGroup* self, intptr_t slot); void QUndoGroup_CanRedoChanged(QUndoGroup* self, bool canRedo); void QUndoGroup_connect_CanRedoChanged(QUndoGroup* self, intptr_t slot); -void QUndoGroup_UndoTextChanged(QUndoGroup* self, struct miqt_string* undoText); +void QUndoGroup_UndoTextChanged(QUndoGroup* self, struct miqt_string undoText); void QUndoGroup_connect_UndoTextChanged(QUndoGroup* self, intptr_t slot); -void QUndoGroup_RedoTextChanged(QUndoGroup* self, struct miqt_string* redoText); +void QUndoGroup_RedoTextChanged(QUndoGroup* self, struct miqt_string redoText); void QUndoGroup_connect_RedoTextChanged(QUndoGroup* self, intptr_t slot); -struct miqt_string* QUndoGroup_Tr2(const char* s, const char* c); -struct miqt_string* QUndoGroup_Tr3(const char* s, const char* c, int n); -struct miqt_string* QUndoGroup_TrUtf82(const char* s, const char* c); -struct miqt_string* QUndoGroup_TrUtf83(const char* s, const char* c, int n); -QAction* QUndoGroup_CreateUndoAction2(const QUndoGroup* self, QObject* parent, struct miqt_string* prefix); -QAction* QUndoGroup_CreateRedoAction2(const QUndoGroup* self, QObject* parent, struct miqt_string* prefix); +struct miqt_string QUndoGroup_Tr2(const char* s, const char* c); +struct miqt_string QUndoGroup_Tr3(const char* s, const char* c, int n); +struct miqt_string QUndoGroup_TrUtf82(const char* s, const char* c); +struct miqt_string QUndoGroup_TrUtf83(const char* s, const char* c, int n); +QAction* QUndoGroup_CreateUndoAction2(const QUndoGroup* self, QObject* parent, struct miqt_string prefix); +QAction* QUndoGroup_CreateRedoAction2(const QUndoGroup* self, QObject* parent, struct miqt_string prefix); void QUndoGroup_Delete(QUndoGroup* self); #ifdef __cplusplus diff --git a/qt/gen_qundostack.cpp b/qt/gen_qundostack.cpp index 432507c3..98f17b81 100644 --- a/qt/gen_qundostack.cpp +++ b/qt/gen_qundostack.cpp @@ -14,8 +14,8 @@ QUndoCommand* QUndoCommand_new() { return new QUndoCommand(); } -QUndoCommand* QUndoCommand_new2(struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QUndoCommand* QUndoCommand_new2(struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QUndoCommand(text_QString); } @@ -23,8 +23,8 @@ QUndoCommand* QUndoCommand_new3(QUndoCommand* parent) { return new QUndoCommand(parent); } -QUndoCommand* QUndoCommand_new4(struct miqt_string* text, QUndoCommand* parent) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +QUndoCommand* QUndoCommand_new4(struct miqt_string text, QUndoCommand* parent) { + QString text_QString = QString::fromUtf8(text.data, text.len); return new QUndoCommand(text_QString, parent); } @@ -36,22 +36,30 @@ void QUndoCommand_Redo(QUndoCommand* self) { self->redo(); } -struct miqt_string* QUndoCommand_Text(const QUndoCommand* self) { +struct miqt_string QUndoCommand_Text(const QUndoCommand* self) { QString _ret = self->text(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QUndoCommand_ActionText(const QUndoCommand* self) { +struct miqt_string QUndoCommand_ActionText(const QUndoCommand* self) { QString _ret = self->actionText(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QUndoCommand_SetText(QUndoCommand* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QUndoCommand_SetText(QUndoCommand* self, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->setText(text_QString); } @@ -99,18 +107,26 @@ void* QUndoStack_Metacast(QUndoStack* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QUndoStack_Tr(const char* s) { +struct miqt_string QUndoStack_Tr(const char* s) { QString _ret = QUndoStack::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QUndoStack_TrUtf8(const char* s) { +struct miqt_string QUndoStack_TrUtf8(const char* s) { QString _ret = QUndoStack::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QUndoStack_Clear(QUndoStack* self) { @@ -129,18 +145,26 @@ bool QUndoStack_CanRedo(const QUndoStack* self) { return self->canRedo(); } -struct miqt_string* QUndoStack_UndoText(const QUndoStack* self) { +struct miqt_string QUndoStack_UndoText(const QUndoStack* self) { QString _ret = self->undoText(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QUndoStack_RedoText(const QUndoStack* self) { +struct miqt_string QUndoStack_RedoText(const QUndoStack* self) { QString _ret = self->redoText(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QUndoStack_Count(const QUndoStack* self) { @@ -151,11 +175,15 @@ int QUndoStack_Index(const QUndoStack* self) { return self->index(); } -struct miqt_string* QUndoStack_Text(const QUndoStack* self, int idx) { +struct miqt_string QUndoStack_Text(const QUndoStack* self, int idx) { QString _ret = self->text(static_cast(idx)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QAction* QUndoStack_CreateUndoAction(const QUndoStack* self, QObject* parent) { @@ -178,8 +206,8 @@ int QUndoStack_CleanIndex(const QUndoStack* self) { return self->cleanIndex(); } -void QUndoStack_BeginMacro(QUndoStack* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QUndoStack_BeginMacro(QUndoStack* self, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->beginMacro(text_QString); } @@ -267,8 +295,8 @@ void QUndoStack_connect_CanRedoChanged(QUndoStack* self, intptr_t slot) { }); } -void QUndoStack_UndoTextChanged(QUndoStack* self, struct miqt_string* undoText) { - QString undoText_QString = QString::fromUtf8(&undoText->data, undoText->len); +void QUndoStack_UndoTextChanged(QUndoStack* self, struct miqt_string undoText) { + QString undoText_QString = QString::fromUtf8(undoText.data, undoText.len); self->undoTextChanged(undoText_QString); } @@ -277,13 +305,17 @@ void QUndoStack_connect_UndoTextChanged(QUndoStack* self, intptr_t slot) { const QString undoText_ret = undoText; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray undoText_b = undoText_ret.toUtf8(); - struct miqt_string* sigval1 = miqt_strdup(undoText_b.data(), undoText_b.length()); + struct miqt_string undoText_ms; + undoText_ms.len = undoText_b.length(); + undoText_ms.data = static_cast(malloc(undoText_ms.len)); + memcpy(undoText_ms.data, undoText_b.data(), undoText_ms.len); + struct miqt_string sigval1 = undoText_ms; miqt_exec_callback_QUndoStack_UndoTextChanged(slot, sigval1); }); } -void QUndoStack_RedoTextChanged(QUndoStack* self, struct miqt_string* redoText) { - QString redoText_QString = QString::fromUtf8(&redoText->data, redoText->len); +void QUndoStack_RedoTextChanged(QUndoStack* self, struct miqt_string redoText) { + QString redoText_QString = QString::fromUtf8(redoText.data, redoText.len); self->redoTextChanged(redoText_QString); } @@ -292,46 +324,66 @@ void QUndoStack_connect_RedoTextChanged(QUndoStack* self, intptr_t slot) { const QString redoText_ret = redoText; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray redoText_b = redoText_ret.toUtf8(); - struct miqt_string* sigval1 = miqt_strdup(redoText_b.data(), redoText_b.length()); + struct miqt_string redoText_ms; + redoText_ms.len = redoText_b.length(); + redoText_ms.data = static_cast(malloc(redoText_ms.len)); + memcpy(redoText_ms.data, redoText_b.data(), redoText_ms.len); + struct miqt_string sigval1 = redoText_ms; miqt_exec_callback_QUndoStack_RedoTextChanged(slot, sigval1); }); } -struct miqt_string* QUndoStack_Tr2(const char* s, const char* c) { +struct miqt_string QUndoStack_Tr2(const char* s, const char* c) { QString _ret = QUndoStack::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QUndoStack_Tr3(const char* s, const char* c, int n) { +struct miqt_string QUndoStack_Tr3(const char* s, const char* c, int n) { QString _ret = QUndoStack::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QUndoStack_TrUtf82(const char* s, const char* c) { +struct miqt_string QUndoStack_TrUtf82(const char* s, const char* c) { QString _ret = QUndoStack::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QUndoStack_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QUndoStack_TrUtf83(const char* s, const char* c, int n) { QString _ret = QUndoStack::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -QAction* QUndoStack_CreateUndoAction2(const QUndoStack* self, QObject* parent, struct miqt_string* prefix) { - QString prefix_QString = QString::fromUtf8(&prefix->data, prefix->len); +QAction* QUndoStack_CreateUndoAction2(const QUndoStack* self, QObject* parent, struct miqt_string prefix) { + QString prefix_QString = QString::fromUtf8(prefix.data, prefix.len); return self->createUndoAction(parent, prefix_QString); } -QAction* QUndoStack_CreateRedoAction2(const QUndoStack* self, QObject* parent, struct miqt_string* prefix) { - QString prefix_QString = QString::fromUtf8(&prefix->data, prefix->len); +QAction* QUndoStack_CreateRedoAction2(const QUndoStack* self, QObject* parent, struct miqt_string prefix) { + QString prefix_QString = QString::fromUtf8(prefix.data, prefix.len); return self->createRedoAction(parent, prefix_QString); } diff --git a/qt/gen_qundostack.go b/qt/gen_qundostack.go index 1eaf79c5..0c74a35d 100644 --- a/qt/gen_qundostack.go +++ b/qt/gen_qundostack.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "runtime/cgo" "unsafe" @@ -52,9 +51,11 @@ func NewQUndoCommand() *QUndoCommand { // NewQUndoCommand2 constructs a new QUndoCommand object. func NewQUndoCommand2(text string) *QUndoCommand { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - ret := C.QUndoCommand_new2((*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + ret := C.QUndoCommand_new2(text_ms) return newQUndoCommand(ret) } @@ -66,9 +67,11 @@ func NewQUndoCommand3(parent *QUndoCommand) *QUndoCommand { // NewQUndoCommand4 constructs a new QUndoCommand object. func NewQUndoCommand4(text string, parent *QUndoCommand) *QUndoCommand { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - ret := C.QUndoCommand_new4((*C.struct_miqt_string)(text_ms), parent.cPointer()) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + ret := C.QUndoCommand_new4(text_ms, parent.cPointer()) return newQUndoCommand(ret) } @@ -81,23 +84,25 @@ func (this *QUndoCommand) Redo() { } func (this *QUndoCommand) Text() string { - var _ms *C.struct_miqt_string = C.QUndoCommand_Text(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QUndoCommand_Text(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QUndoCommand) ActionText() string { - var _ms *C.struct_miqt_string = C.QUndoCommand_ActionText(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QUndoCommand_ActionText(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QUndoCommand) SetText(text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QUndoCommand_SetText(this.h, (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QUndoCommand_SetText(this.h, text_ms) } func (this *QUndoCommand) IsObsolete() bool { @@ -187,24 +192,24 @@ func (this *QUndoStack) MetaObject() *QMetaObject { func (this *QUndoStack) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QUndoStack_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QUndoStack_Metacast(this.h, param1_Cstring)) } func QUndoStack_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QUndoStack_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QUndoStack_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QUndoStack_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QUndoStack_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QUndoStack_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -225,16 +230,16 @@ func (this *QUndoStack) CanRedo() bool { } func (this *QUndoStack) UndoText() string { - var _ms *C.struct_miqt_string = C.QUndoStack_UndoText(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QUndoStack_UndoText(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QUndoStack) RedoText() string { - var _ms *C.struct_miqt_string = C.QUndoStack_RedoText(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QUndoStack_RedoText(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -247,9 +252,9 @@ func (this *QUndoStack) Index() int { } func (this *QUndoStack) Text(idx int) string { - var _ms *C.struct_miqt_string = C.QUndoStack_Text(this.h, (C.int)(idx)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QUndoStack_Text(this.h, (C.int)(idx)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -274,9 +279,11 @@ func (this *QUndoStack) CleanIndex() int { } func (this *QUndoStack) BeginMacro(text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QUndoStack_BeginMacro(this.h, (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QUndoStack_BeginMacro(this.h, text_ms) } func (this *QUndoStack) EndMacro() { @@ -400,50 +407,54 @@ func miqt_exec_callback_QUndoStack_CanRedoChanged(cb C.intptr_t, canRedo C.bool) } func (this *QUndoStack) UndoTextChanged(undoText string) { - undoText_ms := libmiqt.Strdupg(undoText) - defer C.free(undoText_ms) - C.QUndoStack_UndoTextChanged(this.h, (*C.struct_miqt_string)(undoText_ms)) + undoText_ms := C.struct_miqt_string{} + undoText_ms.data = C.CString(undoText) + undoText_ms.len = C.size_t(len(undoText)) + defer C.free(unsafe.Pointer(undoText_ms.data)) + C.QUndoStack_UndoTextChanged(this.h, undoText_ms) } func (this *QUndoStack) OnUndoTextChanged(slot func(undoText string)) { C.QUndoStack_connect_UndoTextChanged(this.h, C.intptr_t(cgo.NewHandle(slot))) } //export miqt_exec_callback_QUndoStack_UndoTextChanged -func miqt_exec_callback_QUndoStack_UndoTextChanged(cb C.intptr_t, undoText *C.struct_miqt_string) { +func miqt_exec_callback_QUndoStack_UndoTextChanged(cb C.intptr_t, undoText C.struct_miqt_string) { gofunc, ok := cgo.Handle(cb).Value().(func(undoText string)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") } // Convert all CABI parameters to Go parameters - var undoText_ms *C.struct_miqt_string = undoText - undoText_ret := C.GoStringN(&undoText_ms.data, C.int(int64(undoText_ms.len))) - C.free(unsafe.Pointer(undoText_ms)) + var undoText_ms C.struct_miqt_string = undoText + undoText_ret := C.GoStringN(undoText_ms.data, C.int(int64(undoText_ms.len))) + C.free(unsafe.Pointer(undoText_ms.data)) slotval1 := undoText_ret gofunc(slotval1) } func (this *QUndoStack) RedoTextChanged(redoText string) { - redoText_ms := libmiqt.Strdupg(redoText) - defer C.free(redoText_ms) - C.QUndoStack_RedoTextChanged(this.h, (*C.struct_miqt_string)(redoText_ms)) + redoText_ms := C.struct_miqt_string{} + redoText_ms.data = C.CString(redoText) + redoText_ms.len = C.size_t(len(redoText)) + defer C.free(unsafe.Pointer(redoText_ms.data)) + C.QUndoStack_RedoTextChanged(this.h, redoText_ms) } func (this *QUndoStack) OnRedoTextChanged(slot func(redoText string)) { C.QUndoStack_connect_RedoTextChanged(this.h, C.intptr_t(cgo.NewHandle(slot))) } //export miqt_exec_callback_QUndoStack_RedoTextChanged -func miqt_exec_callback_QUndoStack_RedoTextChanged(cb C.intptr_t, redoText *C.struct_miqt_string) { +func miqt_exec_callback_QUndoStack_RedoTextChanged(cb C.intptr_t, redoText C.struct_miqt_string) { gofunc, ok := cgo.Handle(cb).Value().(func(redoText string)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") } // Convert all CABI parameters to Go parameters - var redoText_ms *C.struct_miqt_string = redoText - redoText_ret := C.GoStringN(&redoText_ms.data, C.int(int64(redoText_ms.len))) - C.free(unsafe.Pointer(redoText_ms)) + var redoText_ms C.struct_miqt_string = redoText + redoText_ret := C.GoStringN(redoText_ms.data, C.int(int64(redoText_ms.len))) + C.free(unsafe.Pointer(redoText_ms.data)) slotval1 := redoText_ret gofunc(slotval1) @@ -454,9 +465,9 @@ func QUndoStack_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QUndoStack_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QUndoStack_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -465,9 +476,9 @@ func QUndoStack_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QUndoStack_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QUndoStack_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -476,9 +487,9 @@ func QUndoStack_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QUndoStack_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QUndoStack_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -487,22 +498,26 @@ func QUndoStack_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QUndoStack_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QUndoStack_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QUndoStack) CreateUndoAction2(parent *QObject, prefix string) *QAction { - prefix_ms := libmiqt.Strdupg(prefix) - defer C.free(prefix_ms) - return UnsafeNewQAction(unsafe.Pointer(C.QUndoStack_CreateUndoAction2(this.h, parent.cPointer(), (*C.struct_miqt_string)(prefix_ms)))) + prefix_ms := C.struct_miqt_string{} + prefix_ms.data = C.CString(prefix) + prefix_ms.len = C.size_t(len(prefix)) + defer C.free(unsafe.Pointer(prefix_ms.data)) + return UnsafeNewQAction(unsafe.Pointer(C.QUndoStack_CreateUndoAction2(this.h, parent.cPointer(), prefix_ms))) } func (this *QUndoStack) CreateRedoAction2(parent *QObject, prefix string) *QAction { - prefix_ms := libmiqt.Strdupg(prefix) - defer C.free(prefix_ms) - return UnsafeNewQAction(unsafe.Pointer(C.QUndoStack_CreateRedoAction2(this.h, parent.cPointer(), (*C.struct_miqt_string)(prefix_ms)))) + prefix_ms := C.struct_miqt_string{} + prefix_ms.data = C.CString(prefix) + prefix_ms.len = C.size_t(len(prefix)) + defer C.free(unsafe.Pointer(prefix_ms.data)) + return UnsafeNewQAction(unsafe.Pointer(C.QUndoStack_CreateRedoAction2(this.h, parent.cPointer(), prefix_ms))) } func (this *QUndoStack) SetActive1(active bool) { diff --git a/qt/gen_qundostack.h b/qt/gen_qundostack.h index 1b90eb64..c6bac477 100644 --- a/qt/gen_qundostack.h +++ b/qt/gen_qundostack.h @@ -28,14 +28,14 @@ typedef struct QUndoStack QUndoStack; #endif QUndoCommand* QUndoCommand_new(); -QUndoCommand* QUndoCommand_new2(struct miqt_string* text); +QUndoCommand* QUndoCommand_new2(struct miqt_string text); QUndoCommand* QUndoCommand_new3(QUndoCommand* parent); -QUndoCommand* QUndoCommand_new4(struct miqt_string* text, QUndoCommand* parent); +QUndoCommand* QUndoCommand_new4(struct miqt_string text, QUndoCommand* parent); void QUndoCommand_Undo(QUndoCommand* self); void QUndoCommand_Redo(QUndoCommand* self); -struct miqt_string* QUndoCommand_Text(const QUndoCommand* self); -struct miqt_string* QUndoCommand_ActionText(const QUndoCommand* self); -void QUndoCommand_SetText(QUndoCommand* self, struct miqt_string* text); +struct miqt_string QUndoCommand_Text(const QUndoCommand* self); +struct miqt_string QUndoCommand_ActionText(const QUndoCommand* self); +void QUndoCommand_SetText(QUndoCommand* self, struct miqt_string text); bool QUndoCommand_IsObsolete(const QUndoCommand* self); void QUndoCommand_SetObsolete(QUndoCommand* self, bool obsolete); int QUndoCommand_Id(const QUndoCommand* self); @@ -48,23 +48,23 @@ QUndoStack* QUndoStack_new(); QUndoStack* QUndoStack_new2(QObject* parent); QMetaObject* QUndoStack_MetaObject(const QUndoStack* self); void* QUndoStack_Metacast(QUndoStack* self, const char* param1); -struct miqt_string* QUndoStack_Tr(const char* s); -struct miqt_string* QUndoStack_TrUtf8(const char* s); +struct miqt_string QUndoStack_Tr(const char* s); +struct miqt_string QUndoStack_TrUtf8(const char* s); void QUndoStack_Clear(QUndoStack* self); void QUndoStack_Push(QUndoStack* self, QUndoCommand* cmd); bool QUndoStack_CanUndo(const QUndoStack* self); bool QUndoStack_CanRedo(const QUndoStack* self); -struct miqt_string* QUndoStack_UndoText(const QUndoStack* self); -struct miqt_string* QUndoStack_RedoText(const QUndoStack* self); +struct miqt_string QUndoStack_UndoText(const QUndoStack* self); +struct miqt_string QUndoStack_RedoText(const QUndoStack* self); int QUndoStack_Count(const QUndoStack* self); int QUndoStack_Index(const QUndoStack* self); -struct miqt_string* QUndoStack_Text(const QUndoStack* self, int idx); +struct miqt_string QUndoStack_Text(const QUndoStack* self, int idx); QAction* QUndoStack_CreateUndoAction(const QUndoStack* self, QObject* parent); QAction* QUndoStack_CreateRedoAction(const QUndoStack* self, QObject* parent); bool QUndoStack_IsActive(const QUndoStack* self); bool QUndoStack_IsClean(const QUndoStack* self); int QUndoStack_CleanIndex(const QUndoStack* self); -void QUndoStack_BeginMacro(QUndoStack* self, struct miqt_string* text); +void QUndoStack_BeginMacro(QUndoStack* self, struct miqt_string text); void QUndoStack_EndMacro(QUndoStack* self); void QUndoStack_SetUndoLimit(QUndoStack* self, int limit); int QUndoStack_UndoLimit(const QUndoStack* self); @@ -83,16 +83,16 @@ void QUndoStack_CanUndoChanged(QUndoStack* self, bool canUndo); void QUndoStack_connect_CanUndoChanged(QUndoStack* self, intptr_t slot); void QUndoStack_CanRedoChanged(QUndoStack* self, bool canRedo); void QUndoStack_connect_CanRedoChanged(QUndoStack* self, intptr_t slot); -void QUndoStack_UndoTextChanged(QUndoStack* self, struct miqt_string* undoText); +void QUndoStack_UndoTextChanged(QUndoStack* self, struct miqt_string undoText); void QUndoStack_connect_UndoTextChanged(QUndoStack* self, intptr_t slot); -void QUndoStack_RedoTextChanged(QUndoStack* self, struct miqt_string* redoText); +void QUndoStack_RedoTextChanged(QUndoStack* self, struct miqt_string redoText); void QUndoStack_connect_RedoTextChanged(QUndoStack* self, intptr_t slot); -struct miqt_string* QUndoStack_Tr2(const char* s, const char* c); -struct miqt_string* QUndoStack_Tr3(const char* s, const char* c, int n); -struct miqt_string* QUndoStack_TrUtf82(const char* s, const char* c); -struct miqt_string* QUndoStack_TrUtf83(const char* s, const char* c, int n); -QAction* QUndoStack_CreateUndoAction2(const QUndoStack* self, QObject* parent, struct miqt_string* prefix); -QAction* QUndoStack_CreateRedoAction2(const QUndoStack* self, QObject* parent, struct miqt_string* prefix); +struct miqt_string QUndoStack_Tr2(const char* s, const char* c); +struct miqt_string QUndoStack_Tr3(const char* s, const char* c, int n); +struct miqt_string QUndoStack_TrUtf82(const char* s, const char* c); +struct miqt_string QUndoStack_TrUtf83(const char* s, const char* c, int n); +QAction* QUndoStack_CreateUndoAction2(const QUndoStack* self, QObject* parent, struct miqt_string prefix); +QAction* QUndoStack_CreateRedoAction2(const QUndoStack* self, QObject* parent, struct miqt_string prefix); void QUndoStack_SetActive1(QUndoStack* self, bool active); void QUndoStack_Delete(QUndoStack* self); diff --git a/qt/gen_qundoview.cpp b/qt/gen_qundoview.cpp index 20acf145..d8e9bae2 100644 --- a/qt/gen_qundoview.cpp +++ b/qt/gen_qundoview.cpp @@ -43,18 +43,26 @@ void* QUndoView_Metacast(QUndoView* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QUndoView_Tr(const char* s) { +struct miqt_string QUndoView_Tr(const char* s) { QString _ret = QUndoView::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QUndoView_TrUtf8(const char* s) { +struct miqt_string QUndoView_TrUtf8(const char* s) { QString _ret = QUndoView::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QUndoStack* QUndoView_Stack(const QUndoView* self) { @@ -65,16 +73,20 @@ QUndoGroup* QUndoView_Group(const QUndoView* self) { return self->group(); } -void QUndoView_SetEmptyLabel(QUndoView* self, struct miqt_string* label) { - QString label_QString = QString::fromUtf8(&label->data, label->len); +void QUndoView_SetEmptyLabel(QUndoView* self, struct miqt_string label) { + QString label_QString = QString::fromUtf8(label.data, label.len); self->setEmptyLabel(label_QString); } -struct miqt_string* QUndoView_EmptyLabel(const QUndoView* self) { +struct miqt_string QUndoView_EmptyLabel(const QUndoView* self) { QString _ret = self->emptyLabel(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QUndoView_SetCleanIcon(QUndoView* self, QIcon* icon) { @@ -93,32 +105,48 @@ void QUndoView_SetGroup(QUndoView* self, QUndoGroup* group) { self->setGroup(group); } -struct miqt_string* QUndoView_Tr2(const char* s, const char* c) { +struct miqt_string QUndoView_Tr2(const char* s, const char* c) { QString _ret = QUndoView::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QUndoView_Tr3(const char* s, const char* c, int n) { +struct miqt_string QUndoView_Tr3(const char* s, const char* c, int n) { QString _ret = QUndoView::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QUndoView_TrUtf82(const char* s, const char* c) { +struct miqt_string QUndoView_TrUtf82(const char* s, const char* c) { QString _ret = QUndoView::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QUndoView_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QUndoView_TrUtf83(const char* s, const char* c, int n) { QString _ret = QUndoView::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QUndoView_Delete(QUndoView* self) { diff --git a/qt/gen_qundoview.go b/qt/gen_qundoview.go index 6c666b82..d4858796 100644 --- a/qt/gen_qundoview.go +++ b/qt/gen_qundoview.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -87,24 +86,24 @@ func (this *QUndoView) MetaObject() *QMetaObject { func (this *QUndoView) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QUndoView_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QUndoView_Metacast(this.h, param1_Cstring)) } func QUndoView_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QUndoView_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QUndoView_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QUndoView_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QUndoView_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QUndoView_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -117,15 +116,17 @@ func (this *QUndoView) Group() *QUndoGroup { } func (this *QUndoView) SetEmptyLabel(label string) { - label_ms := libmiqt.Strdupg(label) - defer C.free(label_ms) - C.QUndoView_SetEmptyLabel(this.h, (*C.struct_miqt_string)(label_ms)) + label_ms := C.struct_miqt_string{} + label_ms.data = C.CString(label) + label_ms.len = C.size_t(len(label)) + defer C.free(unsafe.Pointer(label_ms.data)) + C.QUndoView_SetEmptyLabel(this.h, label_ms) } func (this *QUndoView) EmptyLabel() string { - var _ms *C.struct_miqt_string = C.QUndoView_EmptyLabel(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QUndoView_EmptyLabel(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -153,9 +154,9 @@ func QUndoView_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QUndoView_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QUndoView_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -164,9 +165,9 @@ func QUndoView_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QUndoView_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QUndoView_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -175,9 +176,9 @@ func QUndoView_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QUndoView_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QUndoView_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -186,9 +187,9 @@ func QUndoView_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QUndoView_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QUndoView_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qundoview.h b/qt/gen_qundoview.h index 189155b9..6e9b869c 100644 --- a/qt/gen_qundoview.h +++ b/qt/gen_qundoview.h @@ -37,20 +37,20 @@ QUndoView* QUndoView_new5(QUndoStack* stack, QWidget* parent); QUndoView* QUndoView_new6(QUndoGroup* group, QWidget* parent); QMetaObject* QUndoView_MetaObject(const QUndoView* self); void* QUndoView_Metacast(QUndoView* self, const char* param1); -struct miqt_string* QUndoView_Tr(const char* s); -struct miqt_string* QUndoView_TrUtf8(const char* s); +struct miqt_string QUndoView_Tr(const char* s); +struct miqt_string QUndoView_TrUtf8(const char* s); QUndoStack* QUndoView_Stack(const QUndoView* self); QUndoGroup* QUndoView_Group(const QUndoView* self); -void QUndoView_SetEmptyLabel(QUndoView* self, struct miqt_string* label); -struct miqt_string* QUndoView_EmptyLabel(const QUndoView* self); +void QUndoView_SetEmptyLabel(QUndoView* self, struct miqt_string label); +struct miqt_string QUndoView_EmptyLabel(const QUndoView* self); void QUndoView_SetCleanIcon(QUndoView* self, QIcon* icon); QIcon* QUndoView_CleanIcon(const QUndoView* self); void QUndoView_SetStack(QUndoView* self, QUndoStack* stack); void QUndoView_SetGroup(QUndoView* self, QUndoGroup* group); -struct miqt_string* QUndoView_Tr2(const char* s, const char* c); -struct miqt_string* QUndoView_Tr3(const char* s, const char* c, int n); -struct miqt_string* QUndoView_TrUtf82(const char* s, const char* c); -struct miqt_string* QUndoView_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QUndoView_Tr2(const char* s, const char* c); +struct miqt_string QUndoView_Tr3(const char* s, const char* c, int n); +struct miqt_string QUndoView_TrUtf82(const char* s, const char* c); +struct miqt_string QUndoView_TrUtf83(const char* s, const char* c, int n); void QUndoView_Delete(QUndoView* self); #ifdef __cplusplus diff --git a/qt/gen_qurl.cpp b/qt/gen_qurl.cpp index 032f62f0..74b230d0 100644 --- a/qt/gen_qurl.cpp +++ b/qt/gen_qurl.cpp @@ -17,13 +17,13 @@ QUrl* QUrl_new2(QUrl* copyVal) { return new QUrl(*copyVal); } -QUrl* QUrl_new3(struct miqt_string* url) { - QString url_QString = QString::fromUtf8(&url->data, url->len); +QUrl* QUrl_new3(struct miqt_string url) { + QString url_QString = QString::fromUtf8(url.data, url.len); return new QUrl(url_QString); } -QUrl* QUrl_new4(struct miqt_string* url, int mode) { - QString url_QString = QString::fromUtf8(&url->data, url->len); +QUrl* QUrl_new4(struct miqt_string url, int mode) { + QString url_QString = QString::fromUtf8(url.data, url.len); return new QUrl(url_QString, static_cast(mode)); } @@ -31,8 +31,8 @@ void QUrl_OperatorAssign(QUrl* self, QUrl* copyVal) { self->operator=(*copyVal); } -void QUrl_OperatorAssignWithUrl(QUrl* self, struct miqt_string* url) { - QString url_QString = QString::fromUtf8(&url->data, url->len); +void QUrl_OperatorAssignWithUrl(QUrl* self, struct miqt_string url) { + QString url_QString = QString::fromUtf8(url.data, url.len); self->operator=(url_QString); } @@ -40,48 +40,66 @@ void QUrl_Swap(QUrl* self, QUrl* other) { self->swap(*other); } -void QUrl_SetUrl(QUrl* self, struct miqt_string* url) { - QString url_QString = QString::fromUtf8(&url->data, url->len); +void QUrl_SetUrl(QUrl* self, struct miqt_string url) { + QString url_QString = QString::fromUtf8(url.data, url.len); self->setUrl(url_QString); } -struct miqt_string* QUrl_Url(const QUrl* self) { +struct miqt_string QUrl_Url(const QUrl* self) { QString _ret = self->url(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QUrl_ToString(const QUrl* self) { +struct miqt_string QUrl_ToString(const QUrl* self) { QString _ret = self->toString(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QUrl_ToDisplayString(const QUrl* self) { +struct miqt_string QUrl_ToDisplayString(const QUrl* self) { QString _ret = self->toDisplayString(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -QByteArray* QUrl_ToEncoded(const QUrl* self) { - return new QByteArray(self->toEncoded()); +struct miqt_string QUrl_ToEncoded(const QUrl* self) { + QByteArray _qb = self->toEncoded(); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } -QUrl* QUrl_FromEncoded(QByteArray* url) { - return new QUrl(QUrl::fromEncoded(*url)); +QUrl* QUrl_FromEncoded(struct miqt_string url) { + QByteArray url_QByteArray(url.data, url.len); + return new QUrl(QUrl::fromEncoded(url_QByteArray)); } -QUrl* QUrl_FromUserInput(struct miqt_string* userInput) { - QString userInput_QString = QString::fromUtf8(&userInput->data, userInput->len); +QUrl* QUrl_FromUserInput(struct miqt_string userInput) { + QString userInput_QString = QString::fromUtf8(userInput.data, userInput.len); return new QUrl(QUrl::fromUserInput(userInput_QString)); } -QUrl* QUrl_FromUserInput2(struct miqt_string* userInput, struct miqt_string* workingDirectory) { - QString userInput_QString = QString::fromUtf8(&userInput->data, userInput->len); - QString workingDirectory_QString = QString::fromUtf8(&workingDirectory->data, workingDirectory->len); +QUrl* QUrl_FromUserInput2(struct miqt_string userInput, struct miqt_string workingDirectory) { + QString userInput_QString = QString::fromUtf8(userInput.data, userInput.len); + QString workingDirectory_QString = QString::fromUtf8(workingDirectory.data, workingDirectory.len); return new QUrl(QUrl::fromUserInput(userInput_QString, workingDirectory_QString)); } @@ -89,11 +107,15 @@ bool QUrl_IsValid(const QUrl* self) { return self->isValid(); } -struct miqt_string* QUrl_ErrorString(const QUrl* self) { +struct miqt_string QUrl_ErrorString(const QUrl* self) { QString _ret = self->errorString(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } bool QUrl_IsEmpty(const QUrl* self) { @@ -104,83 +126,111 @@ void QUrl_Clear(QUrl* self) { self->clear(); } -void QUrl_SetScheme(QUrl* self, struct miqt_string* scheme) { - QString scheme_QString = QString::fromUtf8(&scheme->data, scheme->len); +void QUrl_SetScheme(QUrl* self, struct miqt_string scheme) { + QString scheme_QString = QString::fromUtf8(scheme.data, scheme.len); self->setScheme(scheme_QString); } -struct miqt_string* QUrl_Scheme(const QUrl* self) { +struct miqt_string QUrl_Scheme(const QUrl* self) { QString _ret = self->scheme(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QUrl_SetAuthority(QUrl* self, struct miqt_string* authority) { - QString authority_QString = QString::fromUtf8(&authority->data, authority->len); +void QUrl_SetAuthority(QUrl* self, struct miqt_string authority) { + QString authority_QString = QString::fromUtf8(authority.data, authority.len); self->setAuthority(authority_QString); } -struct miqt_string* QUrl_Authority(const QUrl* self) { +struct miqt_string QUrl_Authority(const QUrl* self) { QString _ret = self->authority(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QUrl_SetUserInfo(QUrl* self, struct miqt_string* userInfo) { - QString userInfo_QString = QString::fromUtf8(&userInfo->data, userInfo->len); +void QUrl_SetUserInfo(QUrl* self, struct miqt_string userInfo) { + QString userInfo_QString = QString::fromUtf8(userInfo.data, userInfo.len); self->setUserInfo(userInfo_QString); } -struct miqt_string* QUrl_UserInfo(const QUrl* self) { +struct miqt_string QUrl_UserInfo(const QUrl* self) { QString _ret = self->userInfo(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QUrl_SetUserName(QUrl* self, struct miqt_string* userName) { - QString userName_QString = QString::fromUtf8(&userName->data, userName->len); +void QUrl_SetUserName(QUrl* self, struct miqt_string userName) { + QString userName_QString = QString::fromUtf8(userName.data, userName.len); self->setUserName(userName_QString); } -struct miqt_string* QUrl_UserName(const QUrl* self) { +struct miqt_string QUrl_UserName(const QUrl* self) { QString _ret = self->userName(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QUrl_SetPassword(QUrl* self, struct miqt_string* password) { - QString password_QString = QString::fromUtf8(&password->data, password->len); +void QUrl_SetPassword(QUrl* self, struct miqt_string password) { + QString password_QString = QString::fromUtf8(password.data, password.len); self->setPassword(password_QString); } -struct miqt_string* QUrl_Password(const QUrl* self) { +struct miqt_string QUrl_Password(const QUrl* self) { QString _ret = self->password(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QUrl_SetHost(QUrl* self, struct miqt_string* host) { - QString host_QString = QString::fromUtf8(&host->data, host->len); +void QUrl_SetHost(QUrl* self, struct miqt_string host) { + QString host_QString = QString::fromUtf8(host.data, host.len); self->setHost(host_QString); } -struct miqt_string* QUrl_Host(const QUrl* self) { +struct miqt_string QUrl_Host(const QUrl* self) { QString _ret = self->host(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QUrl_TopLevelDomain(const QUrl* self) { +struct miqt_string QUrl_TopLevelDomain(const QUrl* self) { QString _ret = self->topLevelDomain(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QUrl_SetPort(QUrl* self, int port) { @@ -191,31 +241,39 @@ int QUrl_Port(const QUrl* self) { return self->port(); } -void QUrl_SetPath(QUrl* self, struct miqt_string* path) { - QString path_QString = QString::fromUtf8(&path->data, path->len); +void QUrl_SetPath(QUrl* self, struct miqt_string path) { + QString path_QString = QString::fromUtf8(path.data, path.len); self->setPath(path_QString); } -struct miqt_string* QUrl_Path(const QUrl* self) { +struct miqt_string QUrl_Path(const QUrl* self) { QString _ret = self->path(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QUrl_FileName(const QUrl* self) { +struct miqt_string QUrl_FileName(const QUrl* self) { QString _ret = self->fileName(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } bool QUrl_HasQuery(const QUrl* self) { return self->hasQuery(); } -void QUrl_SetQuery(QUrl* self, struct miqt_string* query) { - QString query_QString = QString::fromUtf8(&query->data, query->len); +void QUrl_SetQuery(QUrl* self, struct miqt_string query) { + QString query_QString = QString::fromUtf8(query.data, query.len); self->setQuery(query_QString); } @@ -223,26 +281,34 @@ void QUrl_SetQueryWithQuery(QUrl* self, QUrlQuery* query) { self->setQuery(*query); } -struct miqt_string* QUrl_Query(const QUrl* self) { +struct miqt_string QUrl_Query(const QUrl* self) { QString _ret = self->query(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } bool QUrl_HasFragment(const QUrl* self) { return self->hasFragment(); } -struct miqt_string* QUrl_Fragment(const QUrl* self) { +struct miqt_string QUrl_Fragment(const QUrl* self) { QString _ret = self->fragment(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QUrl_SetFragment(QUrl* self, struct miqt_string* fragment) { - QString fragment_QString = QString::fromUtf8(&fragment->data, fragment->len); +void QUrl_SetFragment(QUrl* self, struct miqt_string fragment) { + QString fragment_QString = QString::fromUtf8(fragment.data, fragment.len); self->setFragment(fragment_QString); } @@ -262,16 +328,20 @@ bool QUrl_IsLocalFile(const QUrl* self) { return self->isLocalFile(); } -QUrl* QUrl_FromLocalFile(struct miqt_string* localfile) { - QString localfile_QString = QString::fromUtf8(&localfile->data, localfile->len); +QUrl* QUrl_FromLocalFile(struct miqt_string localfile) { + QString localfile_QString = QString::fromUtf8(localfile.data, localfile.len); return new QUrl(QUrl::fromLocalFile(localfile_QString)); } -struct miqt_string* QUrl_ToLocalFile(const QUrl* self) { +struct miqt_string QUrl_ToLocalFile(const QUrl* self) { QString _ret = self->toLocalFile(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QUrl_Detach(QUrl* self) { @@ -294,39 +364,63 @@ bool QUrl_OperatorNotEqual(const QUrl* self, QUrl* url) { return self->operator!=(*url); } -struct miqt_string* QUrl_FromPercentEncoding(QByteArray* param1) { - QString _ret = QUrl::fromPercentEncoding(*param1); +struct miqt_string QUrl_FromPercentEncoding(struct miqt_string param1) { + QByteArray param1_QByteArray(param1.data, param1.len); + QString _ret = QUrl::fromPercentEncoding(param1_QByteArray); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -QByteArray* QUrl_ToPercentEncoding(struct miqt_string* param1) { - QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); - return new QByteArray(QUrl::toPercentEncoding(param1_QString)); +struct miqt_string QUrl_ToPercentEncoding(struct miqt_string param1) { + QString param1_QString = QString::fromUtf8(param1.data, param1.len); + QByteArray _qb = QUrl::toPercentEncoding(param1_QString); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } -struct miqt_string* QUrl_FromAce(QByteArray* param1) { - QString _ret = QUrl::fromAce(*param1); +struct miqt_string QUrl_FromAce(struct miqt_string param1) { + QByteArray param1_QByteArray(param1.data, param1.len); + QString _ret = QUrl::fromAce(param1_QByteArray); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -QByteArray* QUrl_ToAce(struct miqt_string* param1) { - QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); - return new QByteArray(QUrl::toAce(param1_QString)); +struct miqt_string QUrl_ToAce(struct miqt_string param1) { + QString param1_QString = QString::fromUtf8(param1.data, param1.len); + QByteArray _qb = QUrl::toAce(param1_QString); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } struct miqt_array* QUrl_IdnWhitelist() { QStringList _ret = QUrl::idnWhitelist(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -343,12 +437,16 @@ struct miqt_array* QUrl_ToStringList(struct miqt_array* /* of QUrl* */ uris) { } QStringList _ret = QUrl::toStringList(uris_QList); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -356,12 +454,12 @@ struct miqt_array* QUrl_ToStringList(struct miqt_array* /* of QUrl* */ uris) { return _out; } -struct miqt_array* QUrl_FromStringList(struct miqt_array* /* of struct miqt_string* */ uris) { +struct miqt_array* QUrl_FromStringList(struct miqt_array* /* of struct miqt_string */ uris) { QStringList uris_QList; uris_QList.reserve(uris->len); - struct miqt_string** uris_arr = static_cast(uris->data); + struct miqt_string* uris_arr = static_cast(uris->data); for(size_t i = 0; i < uris->len; ++i) { - QString uris_arr_i_QString = QString::fromUtf8(&uris_arr[i]->data, uris_arr[i]->len); + QString uris_arr_i_QString = QString::fromUtf8(uris_arr[i].data, uris_arr[i].len); uris_QList.push_back(uris_arr_i_QString); } QList _ret = QUrl::fromStringList(uris_QList); @@ -376,162 +474,216 @@ struct miqt_array* QUrl_FromStringList(struct miqt_array* /* of struct miqt_stri return _out; } -void QUrl_SetIdnWhitelist(struct miqt_array* /* of struct miqt_string* */ idnWhitelist) { +void QUrl_SetIdnWhitelist(struct miqt_array* /* of struct miqt_string */ idnWhitelist) { QStringList idnWhitelist_QList; idnWhitelist_QList.reserve(idnWhitelist->len); - struct miqt_string** idnWhitelist_arr = static_cast(idnWhitelist->data); + struct miqt_string* idnWhitelist_arr = static_cast(idnWhitelist->data); for(size_t i = 0; i < idnWhitelist->len; ++i) { - QString idnWhitelist_arr_i_QString = QString::fromUtf8(&idnWhitelist_arr[i]->data, idnWhitelist_arr[i]->len); + QString idnWhitelist_arr_i_QString = QString::fromUtf8(idnWhitelist_arr[i].data, idnWhitelist_arr[i].len); idnWhitelist_QList.push_back(idnWhitelist_arr_i_QString); } QUrl::setIdnWhitelist(idnWhitelist_QList); } -void QUrl_SetUrl2(QUrl* self, struct miqt_string* url, int mode) { - QString url_QString = QString::fromUtf8(&url->data, url->len); +void QUrl_SetUrl2(QUrl* self, struct miqt_string url, int mode) { + QString url_QString = QString::fromUtf8(url.data, url.len); self->setUrl(url_QString, static_cast(mode)); } -QUrl* QUrl_FromEncoded2(QByteArray* url, int mode) { - return new QUrl(QUrl::fromEncoded(*url, static_cast(mode))); +QUrl* QUrl_FromEncoded2(struct miqt_string url, int mode) { + QByteArray url_QByteArray(url.data, url.len); + return new QUrl(QUrl::fromEncoded(url_QByteArray, static_cast(mode))); } -QUrl* QUrl_FromUserInput3(struct miqt_string* userInput, struct miqt_string* workingDirectory, int options) { - QString userInput_QString = QString::fromUtf8(&userInput->data, userInput->len); - QString workingDirectory_QString = QString::fromUtf8(&workingDirectory->data, workingDirectory->len); +QUrl* QUrl_FromUserInput3(struct miqt_string userInput, struct miqt_string workingDirectory, int options) { + QString userInput_QString = QString::fromUtf8(userInput.data, userInput.len); + QString workingDirectory_QString = QString::fromUtf8(workingDirectory.data, workingDirectory.len); return new QUrl(QUrl::fromUserInput(userInput_QString, workingDirectory_QString, static_cast(options))); } -void QUrl_SetAuthority2(QUrl* self, struct miqt_string* authority, int mode) { - QString authority_QString = QString::fromUtf8(&authority->data, authority->len); +void QUrl_SetAuthority2(QUrl* self, struct miqt_string authority, int mode) { + QString authority_QString = QString::fromUtf8(authority.data, authority.len); self->setAuthority(authority_QString, static_cast(mode)); } -struct miqt_string* QUrl_Authority1(const QUrl* self, int options) { +struct miqt_string QUrl_Authority1(const QUrl* self, int options) { QString _ret = self->authority(static_cast(options)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QUrl_SetUserInfo2(QUrl* self, struct miqt_string* userInfo, int mode) { - QString userInfo_QString = QString::fromUtf8(&userInfo->data, userInfo->len); +void QUrl_SetUserInfo2(QUrl* self, struct miqt_string userInfo, int mode) { + QString userInfo_QString = QString::fromUtf8(userInfo.data, userInfo.len); self->setUserInfo(userInfo_QString, static_cast(mode)); } -struct miqt_string* QUrl_UserInfo1(const QUrl* self, int options) { +struct miqt_string QUrl_UserInfo1(const QUrl* self, int options) { QString _ret = self->userInfo(static_cast(options)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QUrl_SetUserName2(QUrl* self, struct miqt_string* userName, int mode) { - QString userName_QString = QString::fromUtf8(&userName->data, userName->len); +void QUrl_SetUserName2(QUrl* self, struct miqt_string userName, int mode) { + QString userName_QString = QString::fromUtf8(userName.data, userName.len); self->setUserName(userName_QString, static_cast(mode)); } -struct miqt_string* QUrl_UserName1(const QUrl* self, int options) { +struct miqt_string QUrl_UserName1(const QUrl* self, int options) { QString _ret = self->userName(static_cast(options)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QUrl_SetPassword2(QUrl* self, struct miqt_string* password, int mode) { - QString password_QString = QString::fromUtf8(&password->data, password->len); +void QUrl_SetPassword2(QUrl* self, struct miqt_string password, int mode) { + QString password_QString = QString::fromUtf8(password.data, password.len); self->setPassword(password_QString, static_cast(mode)); } -struct miqt_string* QUrl_Password1(const QUrl* self, int param1) { +struct miqt_string QUrl_Password1(const QUrl* self, int param1) { QString _ret = self->password(static_cast(param1)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QUrl_SetHost2(QUrl* self, struct miqt_string* host, int mode) { - QString host_QString = QString::fromUtf8(&host->data, host->len); +void QUrl_SetHost2(QUrl* self, struct miqt_string host, int mode) { + QString host_QString = QString::fromUtf8(host.data, host.len); self->setHost(host_QString, static_cast(mode)); } -struct miqt_string* QUrl_Host1(const QUrl* self, int param1) { +struct miqt_string QUrl_Host1(const QUrl* self, int param1) { QString _ret = self->host(static_cast(param1)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QUrl_TopLevelDomain1(const QUrl* self, int options) { +struct miqt_string QUrl_TopLevelDomain1(const QUrl* self, int options) { QString _ret = self->topLevelDomain(static_cast(options)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QUrl_Port1(const QUrl* self, int defaultPort) { return self->port(static_cast(defaultPort)); } -void QUrl_SetPath2(QUrl* self, struct miqt_string* path, int mode) { - QString path_QString = QString::fromUtf8(&path->data, path->len); +void QUrl_SetPath2(QUrl* self, struct miqt_string path, int mode) { + QString path_QString = QString::fromUtf8(path.data, path.len); self->setPath(path_QString, static_cast(mode)); } -struct miqt_string* QUrl_Path1(const QUrl* self, int options) { +struct miqt_string QUrl_Path1(const QUrl* self, int options) { QString _ret = self->path(static_cast(options)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QUrl_FileName1(const QUrl* self, int options) { +struct miqt_string QUrl_FileName1(const QUrl* self, int options) { QString _ret = self->fileName(static_cast(options)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QUrl_SetQuery2(QUrl* self, struct miqt_string* query, int mode) { - QString query_QString = QString::fromUtf8(&query->data, query->len); +void QUrl_SetQuery2(QUrl* self, struct miqt_string query, int mode) { + QString query_QString = QString::fromUtf8(query.data, query.len); self->setQuery(query_QString, static_cast(mode)); } -struct miqt_string* QUrl_Query1(const QUrl* self, int param1) { +struct miqt_string QUrl_Query1(const QUrl* self, int param1) { QString _ret = self->query(static_cast(param1)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QUrl_Fragment1(const QUrl* self, int options) { +struct miqt_string QUrl_Fragment1(const QUrl* self, int options) { QString _ret = self->fragment(static_cast(options)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QUrl_SetFragment2(QUrl* self, struct miqt_string* fragment, int mode) { - QString fragment_QString = QString::fromUtf8(&fragment->data, fragment->len); +void QUrl_SetFragment2(QUrl* self, struct miqt_string fragment, int mode) { + QString fragment_QString = QString::fromUtf8(fragment.data, fragment.len); self->setFragment(fragment_QString, static_cast(mode)); } -QByteArray* QUrl_ToPercentEncoding2(struct miqt_string* param1, QByteArray* exclude) { - QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); - return new QByteArray(QUrl::toPercentEncoding(param1_QString, *exclude)); +struct miqt_string QUrl_ToPercentEncoding2(struct miqt_string param1, struct miqt_string exclude) { + QString param1_QString = QString::fromUtf8(param1.data, param1.len); + QByteArray exclude_QByteArray(exclude.data, exclude.len); + QByteArray _qb = QUrl::toPercentEncoding(param1_QString, exclude_QByteArray); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } -QByteArray* QUrl_ToPercentEncoding3(struct miqt_string* param1, QByteArray* exclude, QByteArray* include) { - QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); - return new QByteArray(QUrl::toPercentEncoding(param1_QString, *exclude, *include)); +struct miqt_string QUrl_ToPercentEncoding3(struct miqt_string param1, struct miqt_string exclude, struct miqt_string include) { + QString param1_QString = QString::fromUtf8(param1.data, param1.len); + QByteArray exclude_QByteArray(exclude.data, exclude.len); + QByteArray include_QByteArray(include.data, include.len); + QByteArray _qb = QUrl::toPercentEncoding(param1_QString, exclude_QByteArray, include_QByteArray); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } -struct miqt_array* QUrl_FromStringList2(struct miqt_array* /* of struct miqt_string* */ uris, int mode) { +struct miqt_array* QUrl_FromStringList2(struct miqt_array* /* of struct miqt_string */ uris, int mode) { QStringList uris_QList; uris_QList.reserve(uris->len); - struct miqt_string** uris_arr = static_cast(uris->data); + struct miqt_string* uris_arr = static_cast(uris->data); for(size_t i = 0; i < uris->len; ++i) { - QString uris_arr_i_QString = QString::fromUtf8(&uris_arr[i]->data, uris_arr[i]->len); + QString uris_arr_i_QString = QString::fromUtf8(uris_arr[i].data, uris_arr[i].len); uris_QList.push_back(uris_arr_i_QString); } QList _ret = QUrl::fromStringList(uris_QList, static_cast(mode)); diff --git a/qt/gen_qurl.go b/qt/gen_qurl.go index 6bb1c653..b3a19ec7 100644 --- a/qt/gen_qurl.go +++ b/qt/gen_qurl.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -103,17 +102,21 @@ func NewQUrl2(copyVal *QUrl) *QUrl { // NewQUrl3 constructs a new QUrl object. func NewQUrl3(url string) *QUrl { - url_ms := libmiqt.Strdupg(url) - defer C.free(url_ms) - ret := C.QUrl_new3((*C.struct_miqt_string)(url_ms)) + url_ms := C.struct_miqt_string{} + url_ms.data = C.CString(url) + url_ms.len = C.size_t(len(url)) + defer C.free(unsafe.Pointer(url_ms.data)) + ret := C.QUrl_new3(url_ms) return newQUrl(ret) } // NewQUrl4 constructs a new QUrl object. func NewQUrl4(url string, mode QUrl__ParsingMode) *QUrl { - url_ms := libmiqt.Strdupg(url) - defer C.free(url_ms) - ret := C.QUrl_new4((*C.struct_miqt_string)(url_ms), (C.int)(mode)) + url_ms := C.struct_miqt_string{} + url_ms.data = C.CString(url) + url_ms.len = C.size_t(len(url)) + defer C.free(unsafe.Pointer(url_ms.data)) + ret := C.QUrl_new4(url_ms, (C.int)(mode)) return newQUrl(ret) } @@ -122,9 +125,11 @@ func (this *QUrl) OperatorAssign(copyVal *QUrl) { } func (this *QUrl) OperatorAssignWithUrl(url string) { - url_ms := libmiqt.Strdupg(url) - defer C.free(url_ms) - C.QUrl_OperatorAssignWithUrl(this.h, (*C.struct_miqt_string)(url_ms)) + url_ms := C.struct_miqt_string{} + url_ms.data = C.CString(url) + url_ms.len = C.size_t(len(url)) + defer C.free(unsafe.Pointer(url_ms.data)) + C.QUrl_OperatorAssignWithUrl(this.h, url_ms) } func (this *QUrl) Swap(other *QUrl) { @@ -132,61 +137,72 @@ func (this *QUrl) Swap(other *QUrl) { } func (this *QUrl) SetUrl(url string) { - url_ms := libmiqt.Strdupg(url) - defer C.free(url_ms) - C.QUrl_SetUrl(this.h, (*C.struct_miqt_string)(url_ms)) + url_ms := C.struct_miqt_string{} + url_ms.data = C.CString(url) + url_ms.len = C.size_t(len(url)) + defer C.free(unsafe.Pointer(url_ms.data)) + C.QUrl_SetUrl(this.h, url_ms) } func (this *QUrl) Url() string { - var _ms *C.struct_miqt_string = C.QUrl_Url(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QUrl_Url(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QUrl) ToString() string { - var _ms *C.struct_miqt_string = C.QUrl_ToString(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QUrl_ToString(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QUrl) ToDisplayString() string { - var _ms *C.struct_miqt_string = C.QUrl_ToDisplayString(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QUrl_ToDisplayString(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } -func (this *QUrl) ToEncoded() *QByteArray { - _ret := C.QUrl_ToEncoded(this.h) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QUrl) ToEncoded() []byte { + var _bytearray C.struct_miqt_string = C.QUrl_ToEncoded(this.h) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } -func QUrl_FromEncoded(url *QByteArray) *QUrl { - _ret := C.QUrl_FromEncoded(url.cPointer()) +func QUrl_FromEncoded(url []byte) *QUrl { + url_alias := C.struct_miqt_string{} + url_alias.data = (*C.char)(unsafe.Pointer(&url[0])) + url_alias.len = C.size_t(len(url)) + _ret := C.QUrl_FromEncoded(url_alias) _goptr := newQUrl(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func QUrl_FromUserInput(userInput string) *QUrl { - userInput_ms := libmiqt.Strdupg(userInput) - defer C.free(userInput_ms) - _ret := C.QUrl_FromUserInput((*C.struct_miqt_string)(userInput_ms)) + userInput_ms := C.struct_miqt_string{} + userInput_ms.data = C.CString(userInput) + userInput_ms.len = C.size_t(len(userInput)) + defer C.free(unsafe.Pointer(userInput_ms.data)) + _ret := C.QUrl_FromUserInput(userInput_ms) _goptr := newQUrl(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func QUrl_FromUserInput2(userInput string, workingDirectory string) *QUrl { - userInput_ms := libmiqt.Strdupg(userInput) - defer C.free(userInput_ms) - workingDirectory_ms := libmiqt.Strdupg(workingDirectory) - defer C.free(workingDirectory_ms) - _ret := C.QUrl_FromUserInput2((*C.struct_miqt_string)(userInput_ms), (*C.struct_miqt_string)(workingDirectory_ms)) + userInput_ms := C.struct_miqt_string{} + userInput_ms.data = C.CString(userInput) + userInput_ms.len = C.size_t(len(userInput)) + defer C.free(unsafe.Pointer(userInput_ms.data)) + workingDirectory_ms := C.struct_miqt_string{} + workingDirectory_ms.data = C.CString(workingDirectory) + workingDirectory_ms.len = C.size_t(len(workingDirectory)) + defer C.free(unsafe.Pointer(workingDirectory_ms.data)) + _ret := C.QUrl_FromUserInput2(userInput_ms, workingDirectory_ms) _goptr := newQUrl(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -197,9 +213,9 @@ func (this *QUrl) IsValid() bool { } func (this *QUrl) ErrorString() string { - var _ms *C.struct_miqt_string = C.QUrl_ErrorString(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QUrl_ErrorString(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -212,87 +228,99 @@ func (this *QUrl) Clear() { } func (this *QUrl) SetScheme(scheme string) { - scheme_ms := libmiqt.Strdupg(scheme) - defer C.free(scheme_ms) - C.QUrl_SetScheme(this.h, (*C.struct_miqt_string)(scheme_ms)) + scheme_ms := C.struct_miqt_string{} + scheme_ms.data = C.CString(scheme) + scheme_ms.len = C.size_t(len(scheme)) + defer C.free(unsafe.Pointer(scheme_ms.data)) + C.QUrl_SetScheme(this.h, scheme_ms) } func (this *QUrl) Scheme() string { - var _ms *C.struct_miqt_string = C.QUrl_Scheme(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QUrl_Scheme(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QUrl) SetAuthority(authority string) { - authority_ms := libmiqt.Strdupg(authority) - defer C.free(authority_ms) - C.QUrl_SetAuthority(this.h, (*C.struct_miqt_string)(authority_ms)) + authority_ms := C.struct_miqt_string{} + authority_ms.data = C.CString(authority) + authority_ms.len = C.size_t(len(authority)) + defer C.free(unsafe.Pointer(authority_ms.data)) + C.QUrl_SetAuthority(this.h, authority_ms) } func (this *QUrl) Authority() string { - var _ms *C.struct_miqt_string = C.QUrl_Authority(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QUrl_Authority(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QUrl) SetUserInfo(userInfo string) { - userInfo_ms := libmiqt.Strdupg(userInfo) - defer C.free(userInfo_ms) - C.QUrl_SetUserInfo(this.h, (*C.struct_miqt_string)(userInfo_ms)) + userInfo_ms := C.struct_miqt_string{} + userInfo_ms.data = C.CString(userInfo) + userInfo_ms.len = C.size_t(len(userInfo)) + defer C.free(unsafe.Pointer(userInfo_ms.data)) + C.QUrl_SetUserInfo(this.h, userInfo_ms) } func (this *QUrl) UserInfo() string { - var _ms *C.struct_miqt_string = C.QUrl_UserInfo(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QUrl_UserInfo(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QUrl) SetUserName(userName string) { - userName_ms := libmiqt.Strdupg(userName) - defer C.free(userName_ms) - C.QUrl_SetUserName(this.h, (*C.struct_miqt_string)(userName_ms)) + userName_ms := C.struct_miqt_string{} + userName_ms.data = C.CString(userName) + userName_ms.len = C.size_t(len(userName)) + defer C.free(unsafe.Pointer(userName_ms.data)) + C.QUrl_SetUserName(this.h, userName_ms) } func (this *QUrl) UserName() string { - var _ms *C.struct_miqt_string = C.QUrl_UserName(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QUrl_UserName(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QUrl) SetPassword(password string) { - password_ms := libmiqt.Strdupg(password) - defer C.free(password_ms) - C.QUrl_SetPassword(this.h, (*C.struct_miqt_string)(password_ms)) + password_ms := C.struct_miqt_string{} + password_ms.data = C.CString(password) + password_ms.len = C.size_t(len(password)) + defer C.free(unsafe.Pointer(password_ms.data)) + C.QUrl_SetPassword(this.h, password_ms) } func (this *QUrl) Password() string { - var _ms *C.struct_miqt_string = C.QUrl_Password(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QUrl_Password(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QUrl) SetHost(host string) { - host_ms := libmiqt.Strdupg(host) - defer C.free(host_ms) - C.QUrl_SetHost(this.h, (*C.struct_miqt_string)(host_ms)) + host_ms := C.struct_miqt_string{} + host_ms.data = C.CString(host) + host_ms.len = C.size_t(len(host)) + defer C.free(unsafe.Pointer(host_ms.data)) + C.QUrl_SetHost(this.h, host_ms) } func (this *QUrl) Host() string { - var _ms *C.struct_miqt_string = C.QUrl_Host(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QUrl_Host(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QUrl) TopLevelDomain() string { - var _ms *C.struct_miqt_string = C.QUrl_TopLevelDomain(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QUrl_TopLevelDomain(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -305,22 +333,24 @@ func (this *QUrl) Port() int { } func (this *QUrl) SetPath(path string) { - path_ms := libmiqt.Strdupg(path) - defer C.free(path_ms) - C.QUrl_SetPath(this.h, (*C.struct_miqt_string)(path_ms)) + path_ms := C.struct_miqt_string{} + path_ms.data = C.CString(path) + path_ms.len = C.size_t(len(path)) + defer C.free(unsafe.Pointer(path_ms.data)) + C.QUrl_SetPath(this.h, path_ms) } func (this *QUrl) Path() string { - var _ms *C.struct_miqt_string = C.QUrl_Path(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QUrl_Path(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QUrl) FileName() string { - var _ms *C.struct_miqt_string = C.QUrl_FileName(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QUrl_FileName(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -329,9 +359,11 @@ func (this *QUrl) HasQuery() bool { } func (this *QUrl) SetQuery(query string) { - query_ms := libmiqt.Strdupg(query) - defer C.free(query_ms) - C.QUrl_SetQuery(this.h, (*C.struct_miqt_string)(query_ms)) + query_ms := C.struct_miqt_string{} + query_ms.data = C.CString(query) + query_ms.len = C.size_t(len(query)) + defer C.free(unsafe.Pointer(query_ms.data)) + C.QUrl_SetQuery(this.h, query_ms) } func (this *QUrl) SetQueryWithQuery(query *QUrlQuery) { @@ -339,9 +371,9 @@ func (this *QUrl) SetQueryWithQuery(query *QUrlQuery) { } func (this *QUrl) Query() string { - var _ms *C.struct_miqt_string = C.QUrl_Query(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QUrl_Query(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -350,16 +382,18 @@ func (this *QUrl) HasFragment() bool { } func (this *QUrl) Fragment() string { - var _ms *C.struct_miqt_string = C.QUrl_Fragment(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QUrl_Fragment(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QUrl) SetFragment(fragment string) { - fragment_ms := libmiqt.Strdupg(fragment) - defer C.free(fragment_ms) - C.QUrl_SetFragment(this.h, (*C.struct_miqt_string)(fragment_ms)) + fragment_ms := C.struct_miqt_string{} + fragment_ms.data = C.CString(fragment) + fragment_ms.len = C.size_t(len(fragment)) + defer C.free(unsafe.Pointer(fragment_ms.data)) + C.QUrl_SetFragment(this.h, fragment_ms) } func (this *QUrl) Resolved(relative *QUrl) *QUrl { @@ -382,18 +416,20 @@ func (this *QUrl) IsLocalFile() bool { } func QUrl_FromLocalFile(localfile string) *QUrl { - localfile_ms := libmiqt.Strdupg(localfile) - defer C.free(localfile_ms) - _ret := C.QUrl_FromLocalFile((*C.struct_miqt_string)(localfile_ms)) + localfile_ms := C.struct_miqt_string{} + localfile_ms.data = C.CString(localfile) + localfile_ms.len = C.size_t(len(localfile)) + defer C.free(unsafe.Pointer(localfile_ms.data)) + _ret := C.QUrl_FromLocalFile(localfile_ms) _goptr := newQUrl(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QUrl) ToLocalFile() string { - var _ms *C.struct_miqt_string = C.QUrl_ToLocalFile(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QUrl_ToLocalFile(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -417,46 +453,56 @@ func (this *QUrl) OperatorNotEqual(url *QUrl) bool { return (bool)(C.QUrl_OperatorNotEqual(this.h, url.cPointer())) } -func QUrl_FromPercentEncoding(param1 *QByteArray) string { - var _ms *C.struct_miqt_string = C.QUrl_FromPercentEncoding(param1.cPointer()) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) +func QUrl_FromPercentEncoding(param1 []byte) string { + param1_alias := C.struct_miqt_string{} + param1_alias.data = (*C.char)(unsafe.Pointer(¶m1[0])) + param1_alias.len = C.size_t(len(param1)) + var _ms C.struct_miqt_string = C.QUrl_FromPercentEncoding(param1_alias) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } -func QUrl_ToPercentEncoding(param1 string) *QByteArray { - param1_ms := libmiqt.Strdupg(param1) - defer C.free(param1_ms) - _ret := C.QUrl_ToPercentEncoding((*C.struct_miqt_string)(param1_ms)) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func QUrl_FromAce(param1 *QByteArray) string { - var _ms *C.struct_miqt_string = C.QUrl_FromAce(param1.cPointer()) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) +func QUrl_ToPercentEncoding(param1 string) []byte { + param1_ms := C.struct_miqt_string{} + param1_ms.data = C.CString(param1) + param1_ms.len = C.size_t(len(param1)) + defer C.free(unsafe.Pointer(param1_ms.data)) + var _bytearray C.struct_miqt_string = C.QUrl_ToPercentEncoding(param1_ms) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) return _ret } -func QUrl_ToAce(param1 string) *QByteArray { - param1_ms := libmiqt.Strdupg(param1) - defer C.free(param1_ms) - _ret := C.QUrl_ToAce((*C.struct_miqt_string)(param1_ms)) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func QUrl_FromAce(param1 []byte) string { + param1_alias := C.struct_miqt_string{} + param1_alias.data = (*C.char)(unsafe.Pointer(¶m1[0])) + param1_alias.len = C.size_t(len(param1)) + var _ms C.struct_miqt_string = C.QUrl_FromAce(param1_alias) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) + return _ret +} + +func QUrl_ToAce(param1 string) []byte { + param1_ms := C.struct_miqt_string{} + param1_ms.data = C.CString(param1) + param1_ms.len = C.size_t(len(param1)) + defer C.free(unsafe.Pointer(param1_ms.data)) + var _bytearray C.struct_miqt_string = C.QUrl_ToAce(param1_ms) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } func QUrl_IdnWhitelist() []string { var _ma *C.struct_miqt_array = C.QUrl_IdnWhitelist() _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -474,11 +520,11 @@ func QUrl_ToStringList(uris []QUrl) []string { defer runtime.KeepAlive(unsafe.Pointer(uris_ma)) var _ma *C.struct_miqt_array = C.QUrl_ToStringList(uris_ma) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -487,12 +533,14 @@ func QUrl_ToStringList(uris []QUrl) []string { func QUrl_FromStringList(uris []string) []QUrl { // For the C ABI, malloc a C array of raw pointers - uris_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(uris)))) + uris_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(uris)))) defer C.free(unsafe.Pointer(uris_CArray)) for i := range uris { - uris_i_ms := libmiqt.Strdupg(uris[i]) - defer C.free(uris_i_ms) - uris_CArray[i] = (*C.struct_miqt_string)(uris_i_ms) + uris_i_ms := C.struct_miqt_string{} + uris_i_ms.data = C.CString(uris[i]) + uris_i_ms.len = C.size_t(len(uris[i])) + defer C.free(unsafe.Pointer(uris_i_ms.data)) + uris_CArray[i] = uris_i_ms } uris_ma := &C.struct_miqt_array{len: C.size_t(len(uris)), data: unsafe.Pointer(uris_CArray)} defer runtime.KeepAlive(unsafe.Pointer(uris_ma)) @@ -511,12 +559,14 @@ func QUrl_FromStringList(uris []string) []QUrl { func QUrl_SetIdnWhitelist(idnWhitelist []string) { // For the C ABI, malloc a C array of raw pointers - idnWhitelist_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(idnWhitelist)))) + idnWhitelist_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(idnWhitelist)))) defer C.free(unsafe.Pointer(idnWhitelist_CArray)) for i := range idnWhitelist { - idnWhitelist_i_ms := libmiqt.Strdupg(idnWhitelist[i]) - defer C.free(idnWhitelist_i_ms) - idnWhitelist_CArray[i] = (*C.struct_miqt_string)(idnWhitelist_i_ms) + idnWhitelist_i_ms := C.struct_miqt_string{} + idnWhitelist_i_ms.data = C.CString(idnWhitelist[i]) + idnWhitelist_i_ms.len = C.size_t(len(idnWhitelist[i])) + defer C.free(unsafe.Pointer(idnWhitelist_i_ms.data)) + idnWhitelist_CArray[i] = idnWhitelist_i_ms } idnWhitelist_ma := &C.struct_miqt_array{len: C.size_t(len(idnWhitelist)), data: unsafe.Pointer(idnWhitelist_CArray)} defer runtime.KeepAlive(unsafe.Pointer(idnWhitelist_ma)) @@ -524,98 +574,117 @@ func QUrl_SetIdnWhitelist(idnWhitelist []string) { } func (this *QUrl) SetUrl2(url string, mode QUrl__ParsingMode) { - url_ms := libmiqt.Strdupg(url) - defer C.free(url_ms) - C.QUrl_SetUrl2(this.h, (*C.struct_miqt_string)(url_ms), (C.int)(mode)) + url_ms := C.struct_miqt_string{} + url_ms.data = C.CString(url) + url_ms.len = C.size_t(len(url)) + defer C.free(unsafe.Pointer(url_ms.data)) + C.QUrl_SetUrl2(this.h, url_ms, (C.int)(mode)) } -func QUrl_FromEncoded2(url *QByteArray, mode QUrl__ParsingMode) *QUrl { - _ret := C.QUrl_FromEncoded2(url.cPointer(), (C.int)(mode)) +func QUrl_FromEncoded2(url []byte, mode QUrl__ParsingMode) *QUrl { + url_alias := C.struct_miqt_string{} + url_alias.data = (*C.char)(unsafe.Pointer(&url[0])) + url_alias.len = C.size_t(len(url)) + _ret := C.QUrl_FromEncoded2(url_alias, (C.int)(mode)) _goptr := newQUrl(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func QUrl_FromUserInput3(userInput string, workingDirectory string, options QUrl__UserInputResolutionOption) *QUrl { - userInput_ms := libmiqt.Strdupg(userInput) - defer C.free(userInput_ms) - workingDirectory_ms := libmiqt.Strdupg(workingDirectory) - defer C.free(workingDirectory_ms) - _ret := C.QUrl_FromUserInput3((*C.struct_miqt_string)(userInput_ms), (*C.struct_miqt_string)(workingDirectory_ms), (C.int)(options)) + userInput_ms := C.struct_miqt_string{} + userInput_ms.data = C.CString(userInput) + userInput_ms.len = C.size_t(len(userInput)) + defer C.free(unsafe.Pointer(userInput_ms.data)) + workingDirectory_ms := C.struct_miqt_string{} + workingDirectory_ms.data = C.CString(workingDirectory) + workingDirectory_ms.len = C.size_t(len(workingDirectory)) + defer C.free(unsafe.Pointer(workingDirectory_ms.data)) + _ret := C.QUrl_FromUserInput3(userInput_ms, workingDirectory_ms, (C.int)(options)) _goptr := newQUrl(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QUrl) SetAuthority2(authority string, mode QUrl__ParsingMode) { - authority_ms := libmiqt.Strdupg(authority) - defer C.free(authority_ms) - C.QUrl_SetAuthority2(this.h, (*C.struct_miqt_string)(authority_ms), (C.int)(mode)) + authority_ms := C.struct_miqt_string{} + authority_ms.data = C.CString(authority) + authority_ms.len = C.size_t(len(authority)) + defer C.free(unsafe.Pointer(authority_ms.data)) + C.QUrl_SetAuthority2(this.h, authority_ms, (C.int)(mode)) } func (this *QUrl) Authority1(options QUrl__ComponentFormattingOption) string { - var _ms *C.struct_miqt_string = C.QUrl_Authority1(this.h, (C.int)(options)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QUrl_Authority1(this.h, (C.int)(options)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QUrl) SetUserInfo2(userInfo string, mode QUrl__ParsingMode) { - userInfo_ms := libmiqt.Strdupg(userInfo) - defer C.free(userInfo_ms) - C.QUrl_SetUserInfo2(this.h, (*C.struct_miqt_string)(userInfo_ms), (C.int)(mode)) + userInfo_ms := C.struct_miqt_string{} + userInfo_ms.data = C.CString(userInfo) + userInfo_ms.len = C.size_t(len(userInfo)) + defer C.free(unsafe.Pointer(userInfo_ms.data)) + C.QUrl_SetUserInfo2(this.h, userInfo_ms, (C.int)(mode)) } func (this *QUrl) UserInfo1(options QUrl__ComponentFormattingOption) string { - var _ms *C.struct_miqt_string = C.QUrl_UserInfo1(this.h, (C.int)(options)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QUrl_UserInfo1(this.h, (C.int)(options)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QUrl) SetUserName2(userName string, mode QUrl__ParsingMode) { - userName_ms := libmiqt.Strdupg(userName) - defer C.free(userName_ms) - C.QUrl_SetUserName2(this.h, (*C.struct_miqt_string)(userName_ms), (C.int)(mode)) + userName_ms := C.struct_miqt_string{} + userName_ms.data = C.CString(userName) + userName_ms.len = C.size_t(len(userName)) + defer C.free(unsafe.Pointer(userName_ms.data)) + C.QUrl_SetUserName2(this.h, userName_ms, (C.int)(mode)) } func (this *QUrl) UserName1(options QUrl__ComponentFormattingOption) string { - var _ms *C.struct_miqt_string = C.QUrl_UserName1(this.h, (C.int)(options)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QUrl_UserName1(this.h, (C.int)(options)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QUrl) SetPassword2(password string, mode QUrl__ParsingMode) { - password_ms := libmiqt.Strdupg(password) - defer C.free(password_ms) - C.QUrl_SetPassword2(this.h, (*C.struct_miqt_string)(password_ms), (C.int)(mode)) + password_ms := C.struct_miqt_string{} + password_ms.data = C.CString(password) + password_ms.len = C.size_t(len(password)) + defer C.free(unsafe.Pointer(password_ms.data)) + C.QUrl_SetPassword2(this.h, password_ms, (C.int)(mode)) } func (this *QUrl) Password1(param1 QUrl__ComponentFormattingOption) string { - var _ms *C.struct_miqt_string = C.QUrl_Password1(this.h, (C.int)(param1)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QUrl_Password1(this.h, (C.int)(param1)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QUrl) SetHost2(host string, mode QUrl__ParsingMode) { - host_ms := libmiqt.Strdupg(host) - defer C.free(host_ms) - C.QUrl_SetHost2(this.h, (*C.struct_miqt_string)(host_ms), (C.int)(mode)) + host_ms := C.struct_miqt_string{} + host_ms.data = C.CString(host) + host_ms.len = C.size_t(len(host)) + defer C.free(unsafe.Pointer(host_ms.data)) + C.QUrl_SetHost2(this.h, host_ms, (C.int)(mode)) } func (this *QUrl) Host1(param1 QUrl__ComponentFormattingOption) string { - var _ms *C.struct_miqt_string = C.QUrl_Host1(this.h, (C.int)(param1)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QUrl_Host1(this.h, (C.int)(param1)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QUrl) TopLevelDomain1(options QUrl__ComponentFormattingOption) string { - var _ms *C.struct_miqt_string = C.QUrl_TopLevelDomain1(this.h, (C.int)(options)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QUrl_TopLevelDomain1(this.h, (C.int)(options)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -624,77 +693,98 @@ func (this *QUrl) Port1(defaultPort int) int { } func (this *QUrl) SetPath2(path string, mode QUrl__ParsingMode) { - path_ms := libmiqt.Strdupg(path) - defer C.free(path_ms) - C.QUrl_SetPath2(this.h, (*C.struct_miqt_string)(path_ms), (C.int)(mode)) + path_ms := C.struct_miqt_string{} + path_ms.data = C.CString(path) + path_ms.len = C.size_t(len(path)) + defer C.free(unsafe.Pointer(path_ms.data)) + C.QUrl_SetPath2(this.h, path_ms, (C.int)(mode)) } func (this *QUrl) Path1(options QUrl__ComponentFormattingOption) string { - var _ms *C.struct_miqt_string = C.QUrl_Path1(this.h, (C.int)(options)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QUrl_Path1(this.h, (C.int)(options)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QUrl) FileName1(options QUrl__ComponentFormattingOption) string { - var _ms *C.struct_miqt_string = C.QUrl_FileName1(this.h, (C.int)(options)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QUrl_FileName1(this.h, (C.int)(options)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QUrl) SetQuery2(query string, mode QUrl__ParsingMode) { - query_ms := libmiqt.Strdupg(query) - defer C.free(query_ms) - C.QUrl_SetQuery2(this.h, (*C.struct_miqt_string)(query_ms), (C.int)(mode)) + query_ms := C.struct_miqt_string{} + query_ms.data = C.CString(query) + query_ms.len = C.size_t(len(query)) + defer C.free(unsafe.Pointer(query_ms.data)) + C.QUrl_SetQuery2(this.h, query_ms, (C.int)(mode)) } func (this *QUrl) Query1(param1 QUrl__ComponentFormattingOption) string { - var _ms *C.struct_miqt_string = C.QUrl_Query1(this.h, (C.int)(param1)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QUrl_Query1(this.h, (C.int)(param1)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QUrl) Fragment1(options QUrl__ComponentFormattingOption) string { - var _ms *C.struct_miqt_string = C.QUrl_Fragment1(this.h, (C.int)(options)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QUrl_Fragment1(this.h, (C.int)(options)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QUrl) SetFragment2(fragment string, mode QUrl__ParsingMode) { - fragment_ms := libmiqt.Strdupg(fragment) - defer C.free(fragment_ms) - C.QUrl_SetFragment2(this.h, (*C.struct_miqt_string)(fragment_ms), (C.int)(mode)) + fragment_ms := C.struct_miqt_string{} + fragment_ms.data = C.CString(fragment) + fragment_ms.len = C.size_t(len(fragment)) + defer C.free(unsafe.Pointer(fragment_ms.data)) + C.QUrl_SetFragment2(this.h, fragment_ms, (C.int)(mode)) } -func QUrl_ToPercentEncoding2(param1 string, exclude *QByteArray) *QByteArray { - param1_ms := libmiqt.Strdupg(param1) - defer C.free(param1_ms) - _ret := C.QUrl_ToPercentEncoding2((*C.struct_miqt_string)(param1_ms), exclude.cPointer()) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func QUrl_ToPercentEncoding2(param1 string, exclude []byte) []byte { + param1_ms := C.struct_miqt_string{} + param1_ms.data = C.CString(param1) + param1_ms.len = C.size_t(len(param1)) + defer C.free(unsafe.Pointer(param1_ms.data)) + exclude_alias := C.struct_miqt_string{} + exclude_alias.data = (*C.char)(unsafe.Pointer(&exclude[0])) + exclude_alias.len = C.size_t(len(exclude)) + var _bytearray C.struct_miqt_string = C.QUrl_ToPercentEncoding2(param1_ms, exclude_alias) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } -func QUrl_ToPercentEncoding3(param1 string, exclude *QByteArray, include *QByteArray) *QByteArray { - param1_ms := libmiqt.Strdupg(param1) - defer C.free(param1_ms) - _ret := C.QUrl_ToPercentEncoding3((*C.struct_miqt_string)(param1_ms), exclude.cPointer(), include.cPointer()) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func QUrl_ToPercentEncoding3(param1 string, exclude []byte, include []byte) []byte { + param1_ms := C.struct_miqt_string{} + param1_ms.data = C.CString(param1) + param1_ms.len = C.size_t(len(param1)) + defer C.free(unsafe.Pointer(param1_ms.data)) + exclude_alias := C.struct_miqt_string{} + exclude_alias.data = (*C.char)(unsafe.Pointer(&exclude[0])) + exclude_alias.len = C.size_t(len(exclude)) + include_alias := C.struct_miqt_string{} + include_alias.data = (*C.char)(unsafe.Pointer(&include[0])) + include_alias.len = C.size_t(len(include)) + var _bytearray C.struct_miqt_string = C.QUrl_ToPercentEncoding3(param1_ms, exclude_alias, include_alias) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } func QUrl_FromStringList2(uris []string, mode QUrl__ParsingMode) []QUrl { // For the C ABI, malloc a C array of raw pointers - uris_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(uris)))) + uris_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(uris)))) defer C.free(unsafe.Pointer(uris_CArray)) for i := range uris { - uris_i_ms := libmiqt.Strdupg(uris[i]) - defer C.free(uris_i_ms) - uris_CArray[i] = (*C.struct_miqt_string)(uris_i_ms) + uris_i_ms := C.struct_miqt_string{} + uris_i_ms.data = C.CString(uris[i]) + uris_i_ms.len = C.size_t(len(uris[i])) + defer C.free(unsafe.Pointer(uris_i_ms.data)) + uris_CArray[i] = uris_i_ms } uris_ma := &C.struct_miqt_array{len: C.size_t(len(uris)), data: unsafe.Pointer(uris_CArray)} defer runtime.KeepAlive(unsafe.Pointer(uris_ma)) diff --git a/qt/gen_qurl.h b/qt/gen_qurl.h index ff05e9e3..aa5bc5e3 100644 --- a/qt/gen_qurl.h +++ b/qt/gen_qurl.h @@ -25,92 +25,92 @@ typedef struct QUrlQuery QUrlQuery; QUrl* QUrl_new(); QUrl* QUrl_new2(QUrl* copyVal); -QUrl* QUrl_new3(struct miqt_string* url); -QUrl* QUrl_new4(struct miqt_string* url, int mode); +QUrl* QUrl_new3(struct miqt_string url); +QUrl* QUrl_new4(struct miqt_string url, int mode); void QUrl_OperatorAssign(QUrl* self, QUrl* copyVal); -void QUrl_OperatorAssignWithUrl(QUrl* self, struct miqt_string* url); +void QUrl_OperatorAssignWithUrl(QUrl* self, struct miqt_string url); void QUrl_Swap(QUrl* self, QUrl* other); -void QUrl_SetUrl(QUrl* self, struct miqt_string* url); -struct miqt_string* QUrl_Url(const QUrl* self); -struct miqt_string* QUrl_ToString(const QUrl* self); -struct miqt_string* QUrl_ToDisplayString(const QUrl* self); -QByteArray* QUrl_ToEncoded(const QUrl* self); -QUrl* QUrl_FromEncoded(QByteArray* url); -QUrl* QUrl_FromUserInput(struct miqt_string* userInput); -QUrl* QUrl_FromUserInput2(struct miqt_string* userInput, struct miqt_string* workingDirectory); +void QUrl_SetUrl(QUrl* self, struct miqt_string url); +struct miqt_string QUrl_Url(const QUrl* self); +struct miqt_string QUrl_ToString(const QUrl* self); +struct miqt_string QUrl_ToDisplayString(const QUrl* self); +struct miqt_string QUrl_ToEncoded(const QUrl* self); +QUrl* QUrl_FromEncoded(struct miqt_string url); +QUrl* QUrl_FromUserInput(struct miqt_string userInput); +QUrl* QUrl_FromUserInput2(struct miqt_string userInput, struct miqt_string workingDirectory); bool QUrl_IsValid(const QUrl* self); -struct miqt_string* QUrl_ErrorString(const QUrl* self); +struct miqt_string QUrl_ErrorString(const QUrl* self); bool QUrl_IsEmpty(const QUrl* self); void QUrl_Clear(QUrl* self); -void QUrl_SetScheme(QUrl* self, struct miqt_string* scheme); -struct miqt_string* QUrl_Scheme(const QUrl* self); -void QUrl_SetAuthority(QUrl* self, struct miqt_string* authority); -struct miqt_string* QUrl_Authority(const QUrl* self); -void QUrl_SetUserInfo(QUrl* self, struct miqt_string* userInfo); -struct miqt_string* QUrl_UserInfo(const QUrl* self); -void QUrl_SetUserName(QUrl* self, struct miqt_string* userName); -struct miqt_string* QUrl_UserName(const QUrl* self); -void QUrl_SetPassword(QUrl* self, struct miqt_string* password); -struct miqt_string* QUrl_Password(const QUrl* self); -void QUrl_SetHost(QUrl* self, struct miqt_string* host); -struct miqt_string* QUrl_Host(const QUrl* self); -struct miqt_string* QUrl_TopLevelDomain(const QUrl* self); +void QUrl_SetScheme(QUrl* self, struct miqt_string scheme); +struct miqt_string QUrl_Scheme(const QUrl* self); +void QUrl_SetAuthority(QUrl* self, struct miqt_string authority); +struct miqt_string QUrl_Authority(const QUrl* self); +void QUrl_SetUserInfo(QUrl* self, struct miqt_string userInfo); +struct miqt_string QUrl_UserInfo(const QUrl* self); +void QUrl_SetUserName(QUrl* self, struct miqt_string userName); +struct miqt_string QUrl_UserName(const QUrl* self); +void QUrl_SetPassword(QUrl* self, struct miqt_string password); +struct miqt_string QUrl_Password(const QUrl* self); +void QUrl_SetHost(QUrl* self, struct miqt_string host); +struct miqt_string QUrl_Host(const QUrl* self); +struct miqt_string QUrl_TopLevelDomain(const QUrl* self); void QUrl_SetPort(QUrl* self, int port); int QUrl_Port(const QUrl* self); -void QUrl_SetPath(QUrl* self, struct miqt_string* path); -struct miqt_string* QUrl_Path(const QUrl* self); -struct miqt_string* QUrl_FileName(const QUrl* self); +void QUrl_SetPath(QUrl* self, struct miqt_string path); +struct miqt_string QUrl_Path(const QUrl* self); +struct miqt_string QUrl_FileName(const QUrl* self); bool QUrl_HasQuery(const QUrl* self); -void QUrl_SetQuery(QUrl* self, struct miqt_string* query); +void QUrl_SetQuery(QUrl* self, struct miqt_string query); void QUrl_SetQueryWithQuery(QUrl* self, QUrlQuery* query); -struct miqt_string* QUrl_Query(const QUrl* self); +struct miqt_string QUrl_Query(const QUrl* self); bool QUrl_HasFragment(const QUrl* self); -struct miqt_string* QUrl_Fragment(const QUrl* self); -void QUrl_SetFragment(QUrl* self, struct miqt_string* fragment); +struct miqt_string QUrl_Fragment(const QUrl* self); +void QUrl_SetFragment(QUrl* self, struct miqt_string fragment); QUrl* QUrl_Resolved(const QUrl* self, QUrl* relative); bool QUrl_IsRelative(const QUrl* self); bool QUrl_IsParentOf(const QUrl* self, QUrl* url); bool QUrl_IsLocalFile(const QUrl* self); -QUrl* QUrl_FromLocalFile(struct miqt_string* localfile); -struct miqt_string* QUrl_ToLocalFile(const QUrl* self); +QUrl* QUrl_FromLocalFile(struct miqt_string localfile); +struct miqt_string QUrl_ToLocalFile(const QUrl* self); void QUrl_Detach(QUrl* self); bool QUrl_IsDetached(const QUrl* self); bool QUrl_OperatorLesser(const QUrl* self, QUrl* url); bool QUrl_OperatorEqual(const QUrl* self, QUrl* url); bool QUrl_OperatorNotEqual(const QUrl* self, QUrl* url); -struct miqt_string* QUrl_FromPercentEncoding(QByteArray* param1); -QByteArray* QUrl_ToPercentEncoding(struct miqt_string* param1); -struct miqt_string* QUrl_FromAce(QByteArray* param1); -QByteArray* QUrl_ToAce(struct miqt_string* param1); +struct miqt_string QUrl_FromPercentEncoding(struct miqt_string param1); +struct miqt_string QUrl_ToPercentEncoding(struct miqt_string param1); +struct miqt_string QUrl_FromAce(struct miqt_string param1); +struct miqt_string QUrl_ToAce(struct miqt_string param1); struct miqt_array* QUrl_IdnWhitelist(); struct miqt_array* QUrl_ToStringList(struct miqt_array* /* of QUrl* */ uris); -struct miqt_array* QUrl_FromStringList(struct miqt_array* /* of struct miqt_string* */ uris); -void QUrl_SetIdnWhitelist(struct miqt_array* /* of struct miqt_string* */ idnWhitelist); -void QUrl_SetUrl2(QUrl* self, struct miqt_string* url, int mode); -QUrl* QUrl_FromEncoded2(QByteArray* url, int mode); -QUrl* QUrl_FromUserInput3(struct miqt_string* userInput, struct miqt_string* workingDirectory, int options); -void QUrl_SetAuthority2(QUrl* self, struct miqt_string* authority, int mode); -struct miqt_string* QUrl_Authority1(const QUrl* self, int options); -void QUrl_SetUserInfo2(QUrl* self, struct miqt_string* userInfo, int mode); -struct miqt_string* QUrl_UserInfo1(const QUrl* self, int options); -void QUrl_SetUserName2(QUrl* self, struct miqt_string* userName, int mode); -struct miqt_string* QUrl_UserName1(const QUrl* self, int options); -void QUrl_SetPassword2(QUrl* self, struct miqt_string* password, int mode); -struct miqt_string* QUrl_Password1(const QUrl* self, int param1); -void QUrl_SetHost2(QUrl* self, struct miqt_string* host, int mode); -struct miqt_string* QUrl_Host1(const QUrl* self, int param1); -struct miqt_string* QUrl_TopLevelDomain1(const QUrl* self, int options); +struct miqt_array* QUrl_FromStringList(struct miqt_array* /* of struct miqt_string */ uris); +void QUrl_SetIdnWhitelist(struct miqt_array* /* of struct miqt_string */ idnWhitelist); +void QUrl_SetUrl2(QUrl* self, struct miqt_string url, int mode); +QUrl* QUrl_FromEncoded2(struct miqt_string url, int mode); +QUrl* QUrl_FromUserInput3(struct miqt_string userInput, struct miqt_string workingDirectory, int options); +void QUrl_SetAuthority2(QUrl* self, struct miqt_string authority, int mode); +struct miqt_string QUrl_Authority1(const QUrl* self, int options); +void QUrl_SetUserInfo2(QUrl* self, struct miqt_string userInfo, int mode); +struct miqt_string QUrl_UserInfo1(const QUrl* self, int options); +void QUrl_SetUserName2(QUrl* self, struct miqt_string userName, int mode); +struct miqt_string QUrl_UserName1(const QUrl* self, int options); +void QUrl_SetPassword2(QUrl* self, struct miqt_string password, int mode); +struct miqt_string QUrl_Password1(const QUrl* self, int param1); +void QUrl_SetHost2(QUrl* self, struct miqt_string host, int mode); +struct miqt_string QUrl_Host1(const QUrl* self, int param1); +struct miqt_string QUrl_TopLevelDomain1(const QUrl* self, int options); int QUrl_Port1(const QUrl* self, int defaultPort); -void QUrl_SetPath2(QUrl* self, struct miqt_string* path, int mode); -struct miqt_string* QUrl_Path1(const QUrl* self, int options); -struct miqt_string* QUrl_FileName1(const QUrl* self, int options); -void QUrl_SetQuery2(QUrl* self, struct miqt_string* query, int mode); -struct miqt_string* QUrl_Query1(const QUrl* self, int param1); -struct miqt_string* QUrl_Fragment1(const QUrl* self, int options); -void QUrl_SetFragment2(QUrl* self, struct miqt_string* fragment, int mode); -QByteArray* QUrl_ToPercentEncoding2(struct miqt_string* param1, QByteArray* exclude); -QByteArray* QUrl_ToPercentEncoding3(struct miqt_string* param1, QByteArray* exclude, QByteArray* include); -struct miqt_array* QUrl_FromStringList2(struct miqt_array* /* of struct miqt_string* */ uris, int mode); +void QUrl_SetPath2(QUrl* self, struct miqt_string path, int mode); +struct miqt_string QUrl_Path1(const QUrl* self, int options); +struct miqt_string QUrl_FileName1(const QUrl* self, int options); +void QUrl_SetQuery2(QUrl* self, struct miqt_string query, int mode); +struct miqt_string QUrl_Query1(const QUrl* self, int param1); +struct miqt_string QUrl_Fragment1(const QUrl* self, int options); +void QUrl_SetFragment2(QUrl* self, struct miqt_string fragment, int mode); +struct miqt_string QUrl_ToPercentEncoding2(struct miqt_string param1, struct miqt_string exclude); +struct miqt_string QUrl_ToPercentEncoding3(struct miqt_string param1, struct miqt_string exclude, struct miqt_string include); +struct miqt_array* QUrl_FromStringList2(struct miqt_array* /* of struct miqt_string */ uris, int mode); void QUrl_Delete(QUrl* self); #ifdef __cplusplus diff --git a/qt/gen_qurlquery.cpp b/qt/gen_qurlquery.cpp index d75281c5..da3d0c9f 100644 --- a/qt/gen_qurlquery.cpp +++ b/qt/gen_qurlquery.cpp @@ -17,8 +17,8 @@ QUrlQuery* QUrlQuery_new2(QUrl* url) { return new QUrlQuery(*url); } -QUrlQuery* QUrlQuery_new3(struct miqt_string* queryString) { - QString queryString_QString = QString::fromUtf8(&queryString->data, queryString->len); +QUrlQuery* QUrlQuery_new3(struct miqt_string queryString) { + QString queryString_QString = QString::fromUtf8(queryString.data, queryString.len); return new QUrlQuery(queryString_QString); } @@ -54,23 +54,31 @@ void QUrlQuery_Clear(QUrlQuery* self) { self->clear(); } -struct miqt_string* QUrlQuery_Query(const QUrlQuery* self) { +struct miqt_string QUrlQuery_Query(const QUrlQuery* self) { QString _ret = self->query(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QUrlQuery_SetQuery(QUrlQuery* self, struct miqt_string* queryString) { - QString queryString_QString = QString::fromUtf8(&queryString->data, queryString->len); +void QUrlQuery_SetQuery(QUrlQuery* self, struct miqt_string queryString) { + QString queryString_QString = QString::fromUtf8(queryString.data, queryString.len); self->setQuery(queryString_QString); } -struct miqt_string* QUrlQuery_ToString(const QUrlQuery* self) { +struct miqt_string QUrlQuery_ToString(const QUrlQuery* self) { QString _ret = self->toString(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QUrlQuery_SetQueryDelimiters(QUrlQuery* self, QChar* valueDelimiter, QChar* pairDelimiter) { @@ -85,40 +93,48 @@ QChar* QUrlQuery_QueryPairDelimiter(const QUrlQuery* self) { return new QChar(self->queryPairDelimiter()); } -bool QUrlQuery_HasQueryItem(const QUrlQuery* self, struct miqt_string* key) { - QString key_QString = QString::fromUtf8(&key->data, key->len); +bool QUrlQuery_HasQueryItem(const QUrlQuery* self, struct miqt_string key) { + QString key_QString = QString::fromUtf8(key.data, key.len); return self->hasQueryItem(key_QString); } -void QUrlQuery_AddQueryItem(QUrlQuery* self, struct miqt_string* key, struct miqt_string* value) { - QString key_QString = QString::fromUtf8(&key->data, key->len); - QString value_QString = QString::fromUtf8(&value->data, value->len); +void QUrlQuery_AddQueryItem(QUrlQuery* self, struct miqt_string key, struct miqt_string value) { + QString key_QString = QString::fromUtf8(key.data, key.len); + QString value_QString = QString::fromUtf8(value.data, value.len); self->addQueryItem(key_QString, value_QString); } -void QUrlQuery_RemoveQueryItem(QUrlQuery* self, struct miqt_string* key) { - QString key_QString = QString::fromUtf8(&key->data, key->len); +void QUrlQuery_RemoveQueryItem(QUrlQuery* self, struct miqt_string key) { + QString key_QString = QString::fromUtf8(key.data, key.len); self->removeQueryItem(key_QString); } -struct miqt_string* QUrlQuery_QueryItemValue(const QUrlQuery* self, struct miqt_string* key) { - QString key_QString = QString::fromUtf8(&key->data, key->len); +struct miqt_string QUrlQuery_QueryItemValue(const QUrlQuery* self, struct miqt_string key) { + QString key_QString = QString::fromUtf8(key.data, key.len); QString _ret = self->queryItemValue(key_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_array* QUrlQuery_AllQueryItemValues(const QUrlQuery* self, struct miqt_string* key) { - QString key_QString = QString::fromUtf8(&key->data, key->len); +struct miqt_array* QUrlQuery_AllQueryItemValues(const QUrlQuery* self, struct miqt_string key) { + QString key_QString = QString::fromUtf8(key.data, key.len); QStringList _ret = self->allQueryItemValues(key_QString); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -126,8 +142,8 @@ struct miqt_array* QUrlQuery_AllQueryItemValues(const QUrlQuery* self, struct mi return _out; } -void QUrlQuery_RemoveAllQueryItems(QUrlQuery* self, struct miqt_string* key) { - QString key_QString = QString::fromUtf8(&key->data, key->len); +void QUrlQuery_RemoveAllQueryItems(QUrlQuery* self, struct miqt_string key) { + QString key_QString = QString::fromUtf8(key.data, key.len); self->removeAllQueryItems(key_QString); } @@ -139,38 +155,54 @@ QChar* QUrlQuery_DefaultQueryPairDelimiter() { return new QChar(QUrlQuery::defaultQueryPairDelimiter()); } -struct miqt_string* QUrlQuery_Query1(const QUrlQuery* self, int encoding) { +struct miqt_string QUrlQuery_Query1(const QUrlQuery* self, int encoding) { QString _ret = self->query(static_cast(encoding)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QUrlQuery_ToString1(const QUrlQuery* self, int encoding) { +struct miqt_string QUrlQuery_ToString1(const QUrlQuery* self, int encoding) { QString _ret = self->toString(static_cast(encoding)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QUrlQuery_QueryItemValue2(const QUrlQuery* self, struct miqt_string* key, int encoding) { - QString key_QString = QString::fromUtf8(&key->data, key->len); +struct miqt_string QUrlQuery_QueryItemValue2(const QUrlQuery* self, struct miqt_string key, int encoding) { + QString key_QString = QString::fromUtf8(key.data, key.len); QString _ret = self->queryItemValue(key_QString, static_cast(encoding)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_array* QUrlQuery_AllQueryItemValues2(const QUrlQuery* self, struct miqt_string* key, int encoding) { - QString key_QString = QString::fromUtf8(&key->data, key->len); +struct miqt_array* QUrlQuery_AllQueryItemValues2(const QUrlQuery* self, struct miqt_string key, int encoding) { + QString key_QString = QString::fromUtf8(key.data, key.len); QStringList _ret = self->allQueryItemValues(key_QString, static_cast(encoding)); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); diff --git a/qt/gen_qurlquery.go b/qt/gen_qurlquery.go index 287febbd..a85af5f6 100644 --- a/qt/gen_qurlquery.go +++ b/qt/gen_qurlquery.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -57,9 +56,11 @@ func NewQUrlQuery2(url *QUrl) *QUrlQuery { // NewQUrlQuery3 constructs a new QUrlQuery object. func NewQUrlQuery3(queryString string) *QUrlQuery { - queryString_ms := libmiqt.Strdupg(queryString) - defer C.free(queryString_ms) - ret := C.QUrlQuery_new3((*C.struct_miqt_string)(queryString_ms)) + queryString_ms := C.struct_miqt_string{} + queryString_ms.data = C.CString(queryString) + queryString_ms.len = C.size_t(len(queryString)) + defer C.free(unsafe.Pointer(queryString_ms.data)) + ret := C.QUrlQuery_new3(queryString_ms) return newQUrlQuery(ret) } @@ -98,22 +99,24 @@ func (this *QUrlQuery) Clear() { } func (this *QUrlQuery) Query() string { - var _ms *C.struct_miqt_string = C.QUrlQuery_Query(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QUrlQuery_Query(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QUrlQuery) SetQuery(queryString string) { - queryString_ms := libmiqt.Strdupg(queryString) - defer C.free(queryString_ms) - C.QUrlQuery_SetQuery(this.h, (*C.struct_miqt_string)(queryString_ms)) + queryString_ms := C.struct_miqt_string{} + queryString_ms.data = C.CString(queryString) + queryString_ms.len = C.size_t(len(queryString)) + defer C.free(unsafe.Pointer(queryString_ms.data)) + C.QUrlQuery_SetQuery(this.h, queryString_ms) } func (this *QUrlQuery) ToString() string { - var _ms *C.struct_miqt_string = C.QUrlQuery_ToString(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QUrlQuery_ToString(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -136,44 +139,56 @@ func (this *QUrlQuery) QueryPairDelimiter() *QChar { } func (this *QUrlQuery) HasQueryItem(key string) bool { - key_ms := libmiqt.Strdupg(key) - defer C.free(key_ms) - return (bool)(C.QUrlQuery_HasQueryItem(this.h, (*C.struct_miqt_string)(key_ms))) + key_ms := C.struct_miqt_string{} + key_ms.data = C.CString(key) + key_ms.len = C.size_t(len(key)) + defer C.free(unsafe.Pointer(key_ms.data)) + return (bool)(C.QUrlQuery_HasQueryItem(this.h, key_ms)) } func (this *QUrlQuery) AddQueryItem(key string, value string) { - key_ms := libmiqt.Strdupg(key) - defer C.free(key_ms) - value_ms := libmiqt.Strdupg(value) - defer C.free(value_ms) - C.QUrlQuery_AddQueryItem(this.h, (*C.struct_miqt_string)(key_ms), (*C.struct_miqt_string)(value_ms)) + key_ms := C.struct_miqt_string{} + key_ms.data = C.CString(key) + key_ms.len = C.size_t(len(key)) + defer C.free(unsafe.Pointer(key_ms.data)) + value_ms := C.struct_miqt_string{} + value_ms.data = C.CString(value) + value_ms.len = C.size_t(len(value)) + defer C.free(unsafe.Pointer(value_ms.data)) + C.QUrlQuery_AddQueryItem(this.h, key_ms, value_ms) } func (this *QUrlQuery) RemoveQueryItem(key string) { - key_ms := libmiqt.Strdupg(key) - defer C.free(key_ms) - C.QUrlQuery_RemoveQueryItem(this.h, (*C.struct_miqt_string)(key_ms)) + key_ms := C.struct_miqt_string{} + key_ms.data = C.CString(key) + key_ms.len = C.size_t(len(key)) + defer C.free(unsafe.Pointer(key_ms.data)) + C.QUrlQuery_RemoveQueryItem(this.h, key_ms) } func (this *QUrlQuery) QueryItemValue(key string) string { - key_ms := libmiqt.Strdupg(key) - defer C.free(key_ms) - var _ms *C.struct_miqt_string = C.QUrlQuery_QueryItemValue(this.h, (*C.struct_miqt_string)(key_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + key_ms := C.struct_miqt_string{} + key_ms.data = C.CString(key) + key_ms.len = C.size_t(len(key)) + defer C.free(unsafe.Pointer(key_ms.data)) + var _ms C.struct_miqt_string = C.QUrlQuery_QueryItemValue(this.h, key_ms) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QUrlQuery) AllQueryItemValues(key string) []string { - key_ms := libmiqt.Strdupg(key) - defer C.free(key_ms) - var _ma *C.struct_miqt_array = C.QUrlQuery_AllQueryItemValues(this.h, (*C.struct_miqt_string)(key_ms)) + key_ms := C.struct_miqt_string{} + key_ms.data = C.CString(key) + key_ms.len = C.size_t(len(key)) + defer C.free(unsafe.Pointer(key_ms.data)) + var _ma *C.struct_miqt_array = C.QUrlQuery_AllQueryItemValues(this.h, key_ms) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -181,9 +196,11 @@ func (this *QUrlQuery) AllQueryItemValues(key string) []string { } func (this *QUrlQuery) RemoveAllQueryItems(key string) { - key_ms := libmiqt.Strdupg(key) - defer C.free(key_ms) - C.QUrlQuery_RemoveAllQueryItems(this.h, (*C.struct_miqt_string)(key_ms)) + key_ms := C.struct_miqt_string{} + key_ms.data = C.CString(key) + key_ms.len = C.size_t(len(key)) + defer C.free(unsafe.Pointer(key_ms.data)) + C.QUrlQuery_RemoveAllQueryItems(this.h, key_ms) } func QUrlQuery_DefaultQueryValueDelimiter() *QChar { @@ -201,38 +218,42 @@ func QUrlQuery_DefaultQueryPairDelimiter() *QChar { } func (this *QUrlQuery) Query1(encoding QUrl__ComponentFormattingOption) string { - var _ms *C.struct_miqt_string = C.QUrlQuery_Query1(this.h, (C.int)(encoding)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QUrlQuery_Query1(this.h, (C.int)(encoding)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QUrlQuery) ToString1(encoding QUrl__ComponentFormattingOption) string { - var _ms *C.struct_miqt_string = C.QUrlQuery_ToString1(this.h, (C.int)(encoding)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QUrlQuery_ToString1(this.h, (C.int)(encoding)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QUrlQuery) QueryItemValue2(key string, encoding QUrl__ComponentFormattingOption) string { - key_ms := libmiqt.Strdupg(key) - defer C.free(key_ms) - var _ms *C.struct_miqt_string = C.QUrlQuery_QueryItemValue2(this.h, (*C.struct_miqt_string)(key_ms), (C.int)(encoding)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + key_ms := C.struct_miqt_string{} + key_ms.data = C.CString(key) + key_ms.len = C.size_t(len(key)) + defer C.free(unsafe.Pointer(key_ms.data)) + var _ms C.struct_miqt_string = C.QUrlQuery_QueryItemValue2(this.h, key_ms, (C.int)(encoding)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QUrlQuery) AllQueryItemValues2(key string, encoding QUrl__ComponentFormattingOption) []string { - key_ms := libmiqt.Strdupg(key) - defer C.free(key_ms) - var _ma *C.struct_miqt_array = C.QUrlQuery_AllQueryItemValues2(this.h, (*C.struct_miqt_string)(key_ms), (C.int)(encoding)) + key_ms := C.struct_miqt_string{} + key_ms.data = C.CString(key) + key_ms.len = C.size_t(len(key)) + defer C.free(unsafe.Pointer(key_ms.data)) + var _ma *C.struct_miqt_array = C.QUrlQuery_AllQueryItemValues2(this.h, key_ms, (C.int)(encoding)) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) diff --git a/qt/gen_qurlquery.h b/qt/gen_qurlquery.h index 73637edb..5d287fee 100644 --- a/qt/gen_qurlquery.h +++ b/qt/gen_qurlquery.h @@ -25,7 +25,7 @@ typedef struct QUrlQuery QUrlQuery; QUrlQuery* QUrlQuery_new(); QUrlQuery* QUrlQuery_new2(QUrl* url); -QUrlQuery* QUrlQuery_new3(struct miqt_string* queryString); +QUrlQuery* QUrlQuery_new3(struct miqt_string queryString); QUrlQuery* QUrlQuery_new4(QUrlQuery* other); void QUrlQuery_OperatorAssign(QUrlQuery* self, QUrlQuery* other); bool QUrlQuery_OperatorEqual(const QUrlQuery* self, QUrlQuery* other); @@ -34,24 +34,24 @@ void QUrlQuery_Swap(QUrlQuery* self, QUrlQuery* other); bool QUrlQuery_IsEmpty(const QUrlQuery* self); bool QUrlQuery_IsDetached(const QUrlQuery* self); void QUrlQuery_Clear(QUrlQuery* self); -struct miqt_string* QUrlQuery_Query(const QUrlQuery* self); -void QUrlQuery_SetQuery(QUrlQuery* self, struct miqt_string* queryString); -struct miqt_string* QUrlQuery_ToString(const QUrlQuery* self); +struct miqt_string QUrlQuery_Query(const QUrlQuery* self); +void QUrlQuery_SetQuery(QUrlQuery* self, struct miqt_string queryString); +struct miqt_string QUrlQuery_ToString(const QUrlQuery* self); void QUrlQuery_SetQueryDelimiters(QUrlQuery* self, QChar* valueDelimiter, QChar* pairDelimiter); QChar* QUrlQuery_QueryValueDelimiter(const QUrlQuery* self); QChar* QUrlQuery_QueryPairDelimiter(const QUrlQuery* self); -bool QUrlQuery_HasQueryItem(const QUrlQuery* self, struct miqt_string* key); -void QUrlQuery_AddQueryItem(QUrlQuery* self, struct miqt_string* key, struct miqt_string* value); -void QUrlQuery_RemoveQueryItem(QUrlQuery* self, struct miqt_string* key); -struct miqt_string* QUrlQuery_QueryItemValue(const QUrlQuery* self, struct miqt_string* key); -struct miqt_array* QUrlQuery_AllQueryItemValues(const QUrlQuery* self, struct miqt_string* key); -void QUrlQuery_RemoveAllQueryItems(QUrlQuery* self, struct miqt_string* key); +bool QUrlQuery_HasQueryItem(const QUrlQuery* self, struct miqt_string key); +void QUrlQuery_AddQueryItem(QUrlQuery* self, struct miqt_string key, struct miqt_string value); +void QUrlQuery_RemoveQueryItem(QUrlQuery* self, struct miqt_string key); +struct miqt_string QUrlQuery_QueryItemValue(const QUrlQuery* self, struct miqt_string key); +struct miqt_array* QUrlQuery_AllQueryItemValues(const QUrlQuery* self, struct miqt_string key); +void QUrlQuery_RemoveAllQueryItems(QUrlQuery* self, struct miqt_string key); QChar* QUrlQuery_DefaultQueryValueDelimiter(); QChar* QUrlQuery_DefaultQueryPairDelimiter(); -struct miqt_string* QUrlQuery_Query1(const QUrlQuery* self, int encoding); -struct miqt_string* QUrlQuery_ToString1(const QUrlQuery* self, int encoding); -struct miqt_string* QUrlQuery_QueryItemValue2(const QUrlQuery* self, struct miqt_string* key, int encoding); -struct miqt_array* QUrlQuery_AllQueryItemValues2(const QUrlQuery* self, struct miqt_string* key, int encoding); +struct miqt_string QUrlQuery_Query1(const QUrlQuery* self, int encoding); +struct miqt_string QUrlQuery_ToString1(const QUrlQuery* self, int encoding); +struct miqt_string QUrlQuery_QueryItemValue2(const QUrlQuery* self, struct miqt_string key, int encoding); +struct miqt_array* QUrlQuery_AllQueryItemValues2(const QUrlQuery* self, struct miqt_string key, int encoding); void QUrlQuery_Delete(QUrlQuery* self); #ifdef __cplusplus diff --git a/qt/gen_quuid.cpp b/qt/gen_quuid.cpp index 9514af35..e2adc5bd 100644 --- a/qt/gen_quuid.cpp +++ b/qt/gen_quuid.cpp @@ -15,8 +15,8 @@ QUuid* QUuid_new2(unsigned int l, uint16_t w1, uint16_t w2, unsigned char b1, un return new QUuid(static_cast(l), static_cast(w1), static_cast(w2), static_cast(b1), static_cast(b2), static_cast(b3), static_cast(b4), static_cast(b5), static_cast(b6), static_cast(b7), static_cast(b8)); } -QUuid* QUuid_new3(struct miqt_string* param1) { - QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); +QUuid* QUuid_new3(struct miqt_string param1) { + QString param1_QString = QString::fromUtf8(param1.data, param1.len); return new QUuid(param1_QString); } @@ -24,42 +24,67 @@ QUuid* QUuid_new4(const char* param1) { return new QUuid(param1); } -QUuid* QUuid_new5(QByteArray* param1) { - return new QUuid(*param1); +QUuid* QUuid_new5(struct miqt_string param1) { + QByteArray param1_QByteArray(param1.data, param1.len); + return new QUuid(param1_QByteArray); } QUuid* QUuid_new6(QUuid* param1) { return new QUuid(*param1); } -struct miqt_string* QUuid_ToString(const QUuid* self) { +struct miqt_string QUuid_ToString(const QUuid* self) { QString _ret = self->toString(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QUuid_ToStringWithMode(const QUuid* self, int mode) { +struct miqt_string QUuid_ToStringWithMode(const QUuid* self, int mode) { QString _ret = self->toString(static_cast(mode)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -QByteArray* QUuid_ToByteArray(const QUuid* self) { - return new QByteArray(self->toByteArray()); +struct miqt_string QUuid_ToByteArray(const QUuid* self) { + QByteArray _qb = self->toByteArray(); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } -QByteArray* QUuid_ToByteArrayWithMode(const QUuid* self, int mode) { - return new QByteArray(self->toByteArray(static_cast(mode))); +struct miqt_string QUuid_ToByteArrayWithMode(const QUuid* self, int mode) { + QByteArray _qb = self->toByteArray(static_cast(mode)); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } -QByteArray* QUuid_ToRfc4122(const QUuid* self) { - return new QByteArray(self->toRfc4122()); +struct miqt_string QUuid_ToRfc4122(const QUuid* self) { + QByteArray _qb = self->toRfc4122(); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } -QUuid* QUuid_FromRfc4122(QByteArray* param1) { - return new QUuid(QUuid::fromRfc4122(*param1)); +QUuid* QUuid_FromRfc4122(struct miqt_string param1) { + QByteArray param1_QByteArray(param1.data, param1.len); + return new QUuid(QUuid::fromRfc4122(param1_QByteArray)); } bool QUuid_IsNull(const QUuid* self) { @@ -86,21 +111,23 @@ QUuid* QUuid_CreateUuid() { return new QUuid(QUuid::createUuid()); } -QUuid* QUuid_CreateUuidV3(QUuid* ns, QByteArray* baseData) { - return new QUuid(QUuid::createUuidV3(*ns, *baseData)); +QUuid* QUuid_CreateUuidV3(QUuid* ns, struct miqt_string baseData) { + QByteArray baseData_QByteArray(baseData.data, baseData.len); + return new QUuid(QUuid::createUuidV3(*ns, baseData_QByteArray)); } -QUuid* QUuid_CreateUuidV5(QUuid* ns, QByteArray* baseData) { - return new QUuid(QUuid::createUuidV5(*ns, *baseData)); +QUuid* QUuid_CreateUuidV5(QUuid* ns, struct miqt_string baseData) { + QByteArray baseData_QByteArray(baseData.data, baseData.len); + return new QUuid(QUuid::createUuidV5(*ns, baseData_QByteArray)); } -QUuid* QUuid_CreateUuidV32(QUuid* ns, struct miqt_string* baseData) { - QString baseData_QString = QString::fromUtf8(&baseData->data, baseData->len); +QUuid* QUuid_CreateUuidV32(QUuid* ns, struct miqt_string baseData) { + QString baseData_QString = QString::fromUtf8(baseData.data, baseData.len); return new QUuid(QUuid::createUuidV3(*ns, baseData_QString)); } -QUuid* QUuid_CreateUuidV52(QUuid* ns, struct miqt_string* baseData) { - QString baseData_QString = QString::fromUtf8(&baseData->data, baseData->len); +QUuid* QUuid_CreateUuidV52(QUuid* ns, struct miqt_string baseData) { + QString baseData_QString = QString::fromUtf8(baseData.data, baseData.len); return new QUuid(QUuid::createUuidV5(*ns, baseData_QString)); } diff --git a/qt/gen_quuid.go b/qt/gen_quuid.go index 8cba0567..3735a292 100644 --- a/qt/gen_quuid.go +++ b/qt/gen_quuid.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -87,9 +86,11 @@ func NewQUuid2(l uint, w1 uint16, w2 uint16, b1 byte, b2 byte, b3 byte, b4 byte, // NewQUuid3 constructs a new QUuid object. func NewQUuid3(param1 string) *QUuid { - param1_ms := libmiqt.Strdupg(param1) - defer C.free(param1_ms) - ret := C.QUuid_new3((*C.struct_miqt_string)(param1_ms)) + param1_ms := C.struct_miqt_string{} + param1_ms.data = C.CString(param1) + param1_ms.len = C.size_t(len(param1)) + defer C.free(unsafe.Pointer(param1_ms.data)) + ret := C.QUuid_new3(param1_ms) return newQUuid(ret) } @@ -102,8 +103,11 @@ func NewQUuid4(param1 string) *QUuid { } // NewQUuid5 constructs a new QUuid object. -func NewQUuid5(param1 *QByteArray) *QUuid { - ret := C.QUuid_new5(param1.cPointer()) +func NewQUuid5(param1 []byte) *QUuid { + param1_alias := C.struct_miqt_string{} + param1_alias.data = (*C.char)(unsafe.Pointer(¶m1[0])) + param1_alias.len = C.size_t(len(param1)) + ret := C.QUuid_new5(param1_alias) return newQUuid(ret) } @@ -114,42 +118,45 @@ func NewQUuid6(param1 *QUuid) *QUuid { } func (this *QUuid) ToString() string { - var _ms *C.struct_miqt_string = C.QUuid_ToString(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QUuid_ToString(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QUuid) ToStringWithMode(mode QUuid__StringFormat) string { - var _ms *C.struct_miqt_string = C.QUuid_ToStringWithMode(this.h, (C.int)(mode)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QUuid_ToStringWithMode(this.h, (C.int)(mode)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } -func (this *QUuid) ToByteArray() *QByteArray { - _ret := C.QUuid_ToByteArray(this.h) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QUuid) ToByteArray() []byte { + var _bytearray C.struct_miqt_string = C.QUuid_ToByteArray(this.h) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } -func (this *QUuid) ToByteArrayWithMode(mode QUuid__StringFormat) *QByteArray { - _ret := C.QUuid_ToByteArrayWithMode(this.h, (C.int)(mode)) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QUuid) ToByteArrayWithMode(mode QUuid__StringFormat) []byte { + var _bytearray C.struct_miqt_string = C.QUuid_ToByteArrayWithMode(this.h, (C.int)(mode)) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } -func (this *QUuid) ToRfc4122() *QByteArray { - _ret := C.QUuid_ToRfc4122(this.h) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QUuid) ToRfc4122() []byte { + var _bytearray C.struct_miqt_string = C.QUuid_ToRfc4122(this.h) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } -func QUuid_FromRfc4122(param1 *QByteArray) *QUuid { - _ret := C.QUuid_FromRfc4122(param1.cPointer()) +func QUuid_FromRfc4122(param1 []byte) *QUuid { + param1_alias := C.struct_miqt_string{} + param1_alias.data = (*C.char)(unsafe.Pointer(¶m1[0])) + param1_alias.len = C.size_t(len(param1)) + _ret := C.QUuid_FromRfc4122(param1_alias) _goptr := newQUuid(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -182,33 +189,43 @@ func QUuid_CreateUuid() *QUuid { return _goptr } -func QUuid_CreateUuidV3(ns *QUuid, baseData *QByteArray) *QUuid { - _ret := C.QUuid_CreateUuidV3(ns.cPointer(), baseData.cPointer()) +func QUuid_CreateUuidV3(ns *QUuid, baseData []byte) *QUuid { + baseData_alias := C.struct_miqt_string{} + baseData_alias.data = (*C.char)(unsafe.Pointer(&baseData[0])) + baseData_alias.len = C.size_t(len(baseData)) + _ret := C.QUuid_CreateUuidV3(ns.cPointer(), baseData_alias) _goptr := newQUuid(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func QUuid_CreateUuidV5(ns *QUuid, baseData *QByteArray) *QUuid { - _ret := C.QUuid_CreateUuidV5(ns.cPointer(), baseData.cPointer()) +func QUuid_CreateUuidV5(ns *QUuid, baseData []byte) *QUuid { + baseData_alias := C.struct_miqt_string{} + baseData_alias.data = (*C.char)(unsafe.Pointer(&baseData[0])) + baseData_alias.len = C.size_t(len(baseData)) + _ret := C.QUuid_CreateUuidV5(ns.cPointer(), baseData_alias) _goptr := newQUuid(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func QUuid_CreateUuidV32(ns *QUuid, baseData string) *QUuid { - baseData_ms := libmiqt.Strdupg(baseData) - defer C.free(baseData_ms) - _ret := C.QUuid_CreateUuidV32(ns.cPointer(), (*C.struct_miqt_string)(baseData_ms)) + baseData_ms := C.struct_miqt_string{} + baseData_ms.data = C.CString(baseData) + baseData_ms.len = C.size_t(len(baseData)) + defer C.free(unsafe.Pointer(baseData_ms.data)) + _ret := C.QUuid_CreateUuidV32(ns.cPointer(), baseData_ms) _goptr := newQUuid(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func QUuid_CreateUuidV52(ns *QUuid, baseData string) *QUuid { - baseData_ms := libmiqt.Strdupg(baseData) - defer C.free(baseData_ms) - _ret := C.QUuid_CreateUuidV52(ns.cPointer(), (*C.struct_miqt_string)(baseData_ms)) + baseData_ms := C.struct_miqt_string{} + baseData_ms.data = C.CString(baseData) + baseData_ms.len = C.size_t(len(baseData)) + defer C.free(unsafe.Pointer(baseData_ms.data)) + _ret := C.QUuid_CreateUuidV52(ns.cPointer(), baseData_ms) _goptr := newQUuid(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr diff --git a/qt/gen_quuid.h b/qt/gen_quuid.h index 2ef9d5d1..39942490 100644 --- a/qt/gen_quuid.h +++ b/qt/gen_quuid.h @@ -23,26 +23,26 @@ typedef struct QUuid QUuid; QUuid* QUuid_new(); QUuid* QUuid_new2(unsigned int l, uint16_t w1, uint16_t w2, unsigned char b1, unsigned char b2, unsigned char b3, unsigned char b4, unsigned char b5, unsigned char b6, unsigned char b7, unsigned char b8); -QUuid* QUuid_new3(struct miqt_string* param1); +QUuid* QUuid_new3(struct miqt_string param1); QUuid* QUuid_new4(const char* param1); -QUuid* QUuid_new5(QByteArray* param1); +QUuid* QUuid_new5(struct miqt_string param1); QUuid* QUuid_new6(QUuid* param1); -struct miqt_string* QUuid_ToString(const QUuid* self); -struct miqt_string* QUuid_ToStringWithMode(const QUuid* self, int mode); -QByteArray* QUuid_ToByteArray(const QUuid* self); -QByteArray* QUuid_ToByteArrayWithMode(const QUuid* self, int mode); -QByteArray* QUuid_ToRfc4122(const QUuid* self); -QUuid* QUuid_FromRfc4122(QByteArray* param1); +struct miqt_string QUuid_ToString(const QUuid* self); +struct miqt_string QUuid_ToStringWithMode(const QUuid* self, int mode); +struct miqt_string QUuid_ToByteArray(const QUuid* self); +struct miqt_string QUuid_ToByteArrayWithMode(const QUuid* self, int mode); +struct miqt_string QUuid_ToRfc4122(const QUuid* self); +QUuid* QUuid_FromRfc4122(struct miqt_string param1); bool QUuid_IsNull(const QUuid* self); bool QUuid_OperatorEqual(const QUuid* self, QUuid* orig); bool QUuid_OperatorNotEqual(const QUuid* self, QUuid* orig); bool QUuid_OperatorLesser(const QUuid* self, QUuid* other); bool QUuid_OperatorGreater(const QUuid* self, QUuid* other); QUuid* QUuid_CreateUuid(); -QUuid* QUuid_CreateUuidV3(QUuid* ns, QByteArray* baseData); -QUuid* QUuid_CreateUuidV5(QUuid* ns, QByteArray* baseData); -QUuid* QUuid_CreateUuidV32(QUuid* ns, struct miqt_string* baseData); -QUuid* QUuid_CreateUuidV52(QUuid* ns, struct miqt_string* baseData); +QUuid* QUuid_CreateUuidV3(QUuid* ns, struct miqt_string baseData); +QUuid* QUuid_CreateUuidV5(QUuid* ns, struct miqt_string baseData); +QUuid* QUuid_CreateUuidV32(QUuid* ns, struct miqt_string baseData); +QUuid* QUuid_CreateUuidV52(QUuid* ns, struct miqt_string baseData); int QUuid_Variant(const QUuid* self); int QUuid_Version(const QUuid* self); void QUuid_Delete(QUuid* self); diff --git a/qt/gen_qvalidator.cpp b/qt/gen_qvalidator.cpp index 390233d6..dc097006 100644 --- a/qt/gen_qvalidator.cpp +++ b/qt/gen_qvalidator.cpp @@ -23,18 +23,26 @@ void* QValidator_Metacast(QValidator* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QValidator_Tr(const char* s) { +struct miqt_string QValidator_Tr(const char* s) { QString _ret = QValidator::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QValidator_TrUtf8(const char* s) { +struct miqt_string QValidator_TrUtf8(const char* s) { QString _ret = QValidator::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QValidator_SetLocale(QValidator* self, QLocale* locale) { @@ -45,14 +53,14 @@ QLocale* QValidator_Locale(const QValidator* self) { return new QLocale(self->locale()); } -int QValidator_Validate(const QValidator* self, struct miqt_string* param1, int* param2) { - QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); +int QValidator_Validate(const QValidator* self, struct miqt_string param1, int* param2) { + QString param1_QString = QString::fromUtf8(param1.data, param1.len); QValidator::State _ret = self->validate(param1_QString, static_cast(*param2)); return static_cast(_ret); } -void QValidator_Fixup(const QValidator* self, struct miqt_string* param1) { - QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); +void QValidator_Fixup(const QValidator* self, struct miqt_string param1) { + QString param1_QString = QString::fromUtf8(param1.data, param1.len); self->fixup(param1_QString); } @@ -66,32 +74,48 @@ void QValidator_connect_Changed(QValidator* self, intptr_t slot) { }); } -struct miqt_string* QValidator_Tr2(const char* s, const char* c) { +struct miqt_string QValidator_Tr2(const char* s, const char* c) { QString _ret = QValidator::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QValidator_Tr3(const char* s, const char* c, int n) { +struct miqt_string QValidator_Tr3(const char* s, const char* c, int n) { QString _ret = QValidator::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QValidator_TrUtf82(const char* s, const char* c) { +struct miqt_string QValidator_TrUtf82(const char* s, const char* c) { QString _ret = QValidator::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QValidator_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QValidator_TrUtf83(const char* s, const char* c, int n) { QString _ret = QValidator::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QValidator_Delete(QValidator* self) { @@ -122,28 +146,36 @@ void* QIntValidator_Metacast(QIntValidator* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QIntValidator_Tr(const char* s) { +struct miqt_string QIntValidator_Tr(const char* s) { QString _ret = QIntValidator::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QIntValidator_TrUtf8(const char* s) { +struct miqt_string QIntValidator_TrUtf8(const char* s) { QString _ret = QIntValidator::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -int QIntValidator_Validate(const QIntValidator* self, struct miqt_string* param1, int* param2) { - QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); +int QIntValidator_Validate(const QIntValidator* self, struct miqt_string param1, int* param2) { + QString param1_QString = QString::fromUtf8(param1.data, param1.len); QValidator::State _ret = self->validate(param1_QString, static_cast(*param2)); return static_cast(_ret); } -void QIntValidator_Fixup(const QIntValidator* self, struct miqt_string* input) { - QString input_QString = QString::fromUtf8(&input->data, input->len); +void QIntValidator_Fixup(const QIntValidator* self, struct miqt_string input) { + QString input_QString = QString::fromUtf8(input.data, input.len); self->fixup(input_QString); } @@ -189,32 +221,48 @@ void QIntValidator_connect_TopChanged(QIntValidator* self, intptr_t slot) { }); } -struct miqt_string* QIntValidator_Tr2(const char* s, const char* c) { +struct miqt_string QIntValidator_Tr2(const char* s, const char* c) { QString _ret = QIntValidator::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QIntValidator_Tr3(const char* s, const char* c, int n) { +struct miqt_string QIntValidator_Tr3(const char* s, const char* c, int n) { QString _ret = QIntValidator::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QIntValidator_TrUtf82(const char* s, const char* c) { +struct miqt_string QIntValidator_TrUtf82(const char* s, const char* c) { QString _ret = QIntValidator::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QIntValidator_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QIntValidator_TrUtf83(const char* s, const char* c, int n) { QString _ret = QIntValidator::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QIntValidator_Delete(QIntValidator* self) { @@ -245,22 +293,30 @@ void* QDoubleValidator_Metacast(QDoubleValidator* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QDoubleValidator_Tr(const char* s) { +struct miqt_string QDoubleValidator_Tr(const char* s) { QString _ret = QDoubleValidator::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDoubleValidator_TrUtf8(const char* s) { +struct miqt_string QDoubleValidator_TrUtf8(const char* s) { QString _ret = QDoubleValidator::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -int QDoubleValidator_Validate(const QDoubleValidator* self, struct miqt_string* param1, int* param2) { - QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); +int QDoubleValidator_Validate(const QDoubleValidator* self, struct miqt_string param1, int* param2) { + QString param1_QString = QString::fromUtf8(param1.data, param1.len); QValidator::State _ret = self->validate(param1_QString, static_cast(*param2)); return static_cast(_ret); } @@ -347,32 +403,48 @@ void QDoubleValidator_connect_NotationChanged(QDoubleValidator* self, intptr_t s }); } -struct miqt_string* QDoubleValidator_Tr2(const char* s, const char* c) { +struct miqt_string QDoubleValidator_Tr2(const char* s, const char* c) { QString _ret = QDoubleValidator::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDoubleValidator_Tr3(const char* s, const char* c, int n) { +struct miqt_string QDoubleValidator_Tr3(const char* s, const char* c, int n) { QString _ret = QDoubleValidator::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDoubleValidator_TrUtf82(const char* s, const char* c) { +struct miqt_string QDoubleValidator_TrUtf82(const char* s, const char* c) { QString _ret = QDoubleValidator::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QDoubleValidator_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QDoubleValidator_TrUtf83(const char* s, const char* c, int n) { QString _ret = QDoubleValidator::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QDoubleValidator_SetRange3(QDoubleValidator* self, double bottom, double top, int decimals) { @@ -407,22 +479,30 @@ void* QRegExpValidator_Metacast(QRegExpValidator* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QRegExpValidator_Tr(const char* s) { +struct miqt_string QRegExpValidator_Tr(const char* s) { QString _ret = QRegExpValidator::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QRegExpValidator_TrUtf8(const char* s) { +struct miqt_string QRegExpValidator_TrUtf8(const char* s) { QString _ret = QRegExpValidator::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -int QRegExpValidator_Validate(const QRegExpValidator* self, struct miqt_string* input, int* pos) { - QString input_QString = QString::fromUtf8(&input->data, input->len); +int QRegExpValidator_Validate(const QRegExpValidator* self, struct miqt_string input, int* pos) { + QString input_QString = QString::fromUtf8(input.data, input.len); QValidator::State _ret = self->validate(input_QString, static_cast(*pos)); return static_cast(_ret); } @@ -450,32 +530,48 @@ void QRegExpValidator_connect_RegExpChanged(QRegExpValidator* self, intptr_t slo }); } -struct miqt_string* QRegExpValidator_Tr2(const char* s, const char* c) { +struct miqt_string QRegExpValidator_Tr2(const char* s, const char* c) { QString _ret = QRegExpValidator::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QRegExpValidator_Tr3(const char* s, const char* c, int n) { +struct miqt_string QRegExpValidator_Tr3(const char* s, const char* c, int n) { QString _ret = QRegExpValidator::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QRegExpValidator_TrUtf82(const char* s, const char* c) { +struct miqt_string QRegExpValidator_TrUtf82(const char* s, const char* c) { QString _ret = QRegExpValidator::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QRegExpValidator_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QRegExpValidator_TrUtf83(const char* s, const char* c, int n) { QString _ret = QRegExpValidator::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QRegExpValidator_Delete(QRegExpValidator* self) { @@ -506,22 +602,30 @@ void* QRegularExpressionValidator_Metacast(QRegularExpressionValidator* self, co return self->qt_metacast(param1); } -struct miqt_string* QRegularExpressionValidator_Tr(const char* s) { +struct miqt_string QRegularExpressionValidator_Tr(const char* s) { QString _ret = QRegularExpressionValidator::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QRegularExpressionValidator_TrUtf8(const char* s) { +struct miqt_string QRegularExpressionValidator_TrUtf8(const char* s) { QString _ret = QRegularExpressionValidator::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -int QRegularExpressionValidator_Validate(const QRegularExpressionValidator* self, struct miqt_string* input, int* pos) { - QString input_QString = QString::fromUtf8(&input->data, input->len); +int QRegularExpressionValidator_Validate(const QRegularExpressionValidator* self, struct miqt_string input, int* pos) { + QString input_QString = QString::fromUtf8(input.data, input.len); QValidator::State _ret = self->validate(input_QString, static_cast(*pos)); return static_cast(_ret); } @@ -547,32 +651,48 @@ void QRegularExpressionValidator_connect_RegularExpressionChanged(QRegularExpres }); } -struct miqt_string* QRegularExpressionValidator_Tr2(const char* s, const char* c) { +struct miqt_string QRegularExpressionValidator_Tr2(const char* s, const char* c) { QString _ret = QRegularExpressionValidator::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QRegularExpressionValidator_Tr3(const char* s, const char* c, int n) { +struct miqt_string QRegularExpressionValidator_Tr3(const char* s, const char* c, int n) { QString _ret = QRegularExpressionValidator::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QRegularExpressionValidator_TrUtf82(const char* s, const char* c) { +struct miqt_string QRegularExpressionValidator_TrUtf82(const char* s, const char* c) { QString _ret = QRegularExpressionValidator::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QRegularExpressionValidator_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QRegularExpressionValidator_TrUtf83(const char* s, const char* c, int n) { QString _ret = QRegularExpressionValidator::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QRegularExpressionValidator_Delete(QRegularExpressionValidator* self) { diff --git a/qt/gen_qvalidator.go b/qt/gen_qvalidator.go index b6728216..2329c3b3 100644 --- a/qt/gen_qvalidator.go +++ b/qt/gen_qvalidator.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "runtime/cgo" "unsafe" @@ -67,24 +66,24 @@ func (this *QValidator) MetaObject() *QMetaObject { func (this *QValidator) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QValidator_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QValidator_Metacast(this.h, param1_Cstring)) } func QValidator_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QValidator_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QValidator_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QValidator_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QValidator_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QValidator_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -100,15 +99,19 @@ func (this *QValidator) Locale() *QLocale { } func (this *QValidator) Validate(param1 string, param2 *int) QValidator__State { - param1_ms := libmiqt.Strdupg(param1) - defer C.free(param1_ms) - return (QValidator__State)(C.QValidator_Validate(this.h, (*C.struct_miqt_string)(param1_ms), (*C.int)(unsafe.Pointer(param2)))) + param1_ms := C.struct_miqt_string{} + param1_ms.data = C.CString(param1) + param1_ms.len = C.size_t(len(param1)) + defer C.free(unsafe.Pointer(param1_ms.data)) + return (QValidator__State)(C.QValidator_Validate(this.h, param1_ms, (*C.int)(unsafe.Pointer(param2)))) } func (this *QValidator) Fixup(param1 string) { - param1_ms := libmiqt.Strdupg(param1) - defer C.free(param1_ms) - C.QValidator_Fixup(this.h, (*C.struct_miqt_string)(param1_ms)) + param1_ms := C.struct_miqt_string{} + param1_ms.data = C.CString(param1) + param1_ms.len = C.size_t(len(param1)) + defer C.free(unsafe.Pointer(param1_ms.data)) + C.QValidator_Fixup(this.h, param1_ms) } func (this *QValidator) Changed() { @@ -133,9 +136,9 @@ func QValidator_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QValidator_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QValidator_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -144,9 +147,9 @@ func QValidator_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QValidator_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QValidator_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -155,9 +158,9 @@ func QValidator_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QValidator_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QValidator_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -166,9 +169,9 @@ func QValidator_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QValidator_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QValidator_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -247,37 +250,41 @@ func (this *QIntValidator) MetaObject() *QMetaObject { func (this *QIntValidator) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QIntValidator_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QIntValidator_Metacast(this.h, param1_Cstring)) } func QIntValidator_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QIntValidator_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QIntValidator_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QIntValidator_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QIntValidator_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QIntValidator_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QIntValidator) Validate(param1 string, param2 *int) QValidator__State { - param1_ms := libmiqt.Strdupg(param1) - defer C.free(param1_ms) - return (QValidator__State)(C.QIntValidator_Validate(this.h, (*C.struct_miqt_string)(param1_ms), (*C.int)(unsafe.Pointer(param2)))) + param1_ms := C.struct_miqt_string{} + param1_ms.data = C.CString(param1) + param1_ms.len = C.size_t(len(param1)) + defer C.free(unsafe.Pointer(param1_ms.data)) + return (QValidator__State)(C.QIntValidator_Validate(this.h, param1_ms, (*C.int)(unsafe.Pointer(param2)))) } func (this *QIntValidator) Fixup(input string) { - input_ms := libmiqt.Strdupg(input) - defer C.free(input_ms) - C.QIntValidator_Fixup(this.h, (*C.struct_miqt_string)(input_ms)) + input_ms := C.struct_miqt_string{} + input_ms.data = C.CString(input) + input_ms.len = C.size_t(len(input)) + defer C.free(unsafe.Pointer(input_ms.data)) + C.QIntValidator_Fixup(this.h, input_ms) } func (this *QIntValidator) SetBottom(bottom int) { @@ -345,9 +352,9 @@ func QIntValidator_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QIntValidator_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QIntValidator_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -356,9 +363,9 @@ func QIntValidator_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QIntValidator_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QIntValidator_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -367,9 +374,9 @@ func QIntValidator_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QIntValidator_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QIntValidator_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -378,9 +385,9 @@ func QIntValidator_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QIntValidator_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QIntValidator_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -459,31 +466,33 @@ func (this *QDoubleValidator) MetaObject() *QMetaObject { func (this *QDoubleValidator) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QDoubleValidator_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QDoubleValidator_Metacast(this.h, param1_Cstring)) } func QDoubleValidator_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QDoubleValidator_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDoubleValidator_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QDoubleValidator_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QDoubleValidator_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDoubleValidator_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QDoubleValidator) Validate(param1 string, param2 *int) QValidator__State { - param1_ms := libmiqt.Strdupg(param1) - defer C.free(param1_ms) - return (QValidator__State)(C.QDoubleValidator_Validate(this.h, (*C.struct_miqt_string)(param1_ms), (*C.int)(unsafe.Pointer(param2)))) + param1_ms := C.struct_miqt_string{} + param1_ms.data = C.CString(param1) + param1_ms.len = C.size_t(len(param1)) + defer C.free(unsafe.Pointer(param1_ms.data)) + return (QValidator__State)(C.QDoubleValidator_Validate(this.h, param1_ms, (*C.int)(unsafe.Pointer(param2)))) } func (this *QDoubleValidator) SetRange(bottom float64, top float64) { @@ -607,9 +616,9 @@ func QDoubleValidator_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDoubleValidator_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDoubleValidator_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -618,9 +627,9 @@ func QDoubleValidator_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDoubleValidator_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDoubleValidator_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -629,9 +638,9 @@ func QDoubleValidator_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDoubleValidator_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDoubleValidator_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -640,9 +649,9 @@ func QDoubleValidator_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDoubleValidator_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QDoubleValidator_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -725,31 +734,33 @@ func (this *QRegExpValidator) MetaObject() *QMetaObject { func (this *QRegExpValidator) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QRegExpValidator_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QRegExpValidator_Metacast(this.h, param1_Cstring)) } func QRegExpValidator_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QRegExpValidator_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QRegExpValidator_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QRegExpValidator_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QRegExpValidator_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QRegExpValidator_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QRegExpValidator) Validate(input string, pos *int) QValidator__State { - input_ms := libmiqt.Strdupg(input) - defer C.free(input_ms) - return (QValidator__State)(C.QRegExpValidator_Validate(this.h, (*C.struct_miqt_string)(input_ms), (*C.int)(unsafe.Pointer(pos)))) + input_ms := C.struct_miqt_string{} + input_ms.data = C.CString(input) + input_ms.len = C.size_t(len(input)) + defer C.free(unsafe.Pointer(input_ms.data)) + return (QValidator__State)(C.QRegExpValidator_Validate(this.h, input_ms, (*C.int)(unsafe.Pointer(pos)))) } func (this *QRegExpValidator) SetRegExp(rx *QRegExp) { @@ -785,9 +796,9 @@ func QRegExpValidator_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QRegExpValidator_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QRegExpValidator_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -796,9 +807,9 @@ func QRegExpValidator_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QRegExpValidator_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QRegExpValidator_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -807,9 +818,9 @@ func QRegExpValidator_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QRegExpValidator_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QRegExpValidator_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -818,9 +829,9 @@ func QRegExpValidator_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QRegExpValidator_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QRegExpValidator_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -899,31 +910,33 @@ func (this *QRegularExpressionValidator) MetaObject() *QMetaObject { func (this *QRegularExpressionValidator) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QRegularExpressionValidator_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QRegularExpressionValidator_Metacast(this.h, param1_Cstring)) } func QRegularExpressionValidator_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QRegularExpressionValidator_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QRegularExpressionValidator_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QRegularExpressionValidator_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QRegularExpressionValidator_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QRegularExpressionValidator_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QRegularExpressionValidator) Validate(input string, pos *int) QValidator__State { - input_ms := libmiqt.Strdupg(input) - defer C.free(input_ms) - return (QValidator__State)(C.QRegularExpressionValidator_Validate(this.h, (*C.struct_miqt_string)(input_ms), (*C.int)(unsafe.Pointer(pos)))) + input_ms := C.struct_miqt_string{} + input_ms.data = C.CString(input) + input_ms.len = C.size_t(len(input)) + defer C.free(unsafe.Pointer(input_ms.data)) + return (QValidator__State)(C.QRegularExpressionValidator_Validate(this.h, input_ms, (*C.int)(unsafe.Pointer(pos)))) } func (this *QRegularExpressionValidator) RegularExpression() *QRegularExpression { @@ -962,9 +975,9 @@ func QRegularExpressionValidator_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QRegularExpressionValidator_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QRegularExpressionValidator_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -973,9 +986,9 @@ func QRegularExpressionValidator_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QRegularExpressionValidator_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QRegularExpressionValidator_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -984,9 +997,9 @@ func QRegularExpressionValidator_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QRegularExpressionValidator_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QRegularExpressionValidator_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -995,9 +1008,9 @@ func QRegularExpressionValidator_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QRegularExpressionValidator_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QRegularExpressionValidator_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qvalidator.h b/qt/gen_qvalidator.h index 34764cf3..1452e8e0 100644 --- a/qt/gen_qvalidator.h +++ b/qt/gen_qvalidator.h @@ -39,18 +39,18 @@ typedef struct QValidator QValidator; QMetaObject* QValidator_MetaObject(const QValidator* self); void* QValidator_Metacast(QValidator* self, const char* param1); -struct miqt_string* QValidator_Tr(const char* s); -struct miqt_string* QValidator_TrUtf8(const char* s); +struct miqt_string QValidator_Tr(const char* s); +struct miqt_string QValidator_TrUtf8(const char* s); void QValidator_SetLocale(QValidator* self, QLocale* locale); QLocale* QValidator_Locale(const QValidator* self); -int QValidator_Validate(const QValidator* self, struct miqt_string* param1, int* param2); -void QValidator_Fixup(const QValidator* self, struct miqt_string* param1); +int QValidator_Validate(const QValidator* self, struct miqt_string param1, int* param2); +void QValidator_Fixup(const QValidator* self, struct miqt_string param1); void QValidator_Changed(QValidator* self); void QValidator_connect_Changed(QValidator* self, intptr_t slot); -struct miqt_string* QValidator_Tr2(const char* s, const char* c); -struct miqt_string* QValidator_Tr3(const char* s, const char* c, int n); -struct miqt_string* QValidator_TrUtf82(const char* s, const char* c); -struct miqt_string* QValidator_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QValidator_Tr2(const char* s, const char* c); +struct miqt_string QValidator_Tr3(const char* s, const char* c, int n); +struct miqt_string QValidator_TrUtf82(const char* s, const char* c); +struct miqt_string QValidator_TrUtf83(const char* s, const char* c, int n); void QValidator_Delete(QValidator* self); QIntValidator* QIntValidator_new(); @@ -59,10 +59,10 @@ QIntValidator* QIntValidator_new3(QObject* parent); QIntValidator* QIntValidator_new4(int bottom, int top, QObject* parent); QMetaObject* QIntValidator_MetaObject(const QIntValidator* self); void* QIntValidator_Metacast(QIntValidator* self, const char* param1); -struct miqt_string* QIntValidator_Tr(const char* s); -struct miqt_string* QIntValidator_TrUtf8(const char* s); -int QIntValidator_Validate(const QIntValidator* self, struct miqt_string* param1, int* param2); -void QIntValidator_Fixup(const QIntValidator* self, struct miqt_string* input); +struct miqt_string QIntValidator_Tr(const char* s); +struct miqt_string QIntValidator_TrUtf8(const char* s); +int QIntValidator_Validate(const QIntValidator* self, struct miqt_string param1, int* param2); +void QIntValidator_Fixup(const QIntValidator* self, struct miqt_string input); void QIntValidator_SetBottom(QIntValidator* self, int bottom); void QIntValidator_SetTop(QIntValidator* self, int top); void QIntValidator_SetRange(QIntValidator* self, int bottom, int top); @@ -72,10 +72,10 @@ void QIntValidator_BottomChanged(QIntValidator* self, int bottom); void QIntValidator_connect_BottomChanged(QIntValidator* self, intptr_t slot); void QIntValidator_TopChanged(QIntValidator* self, int top); void QIntValidator_connect_TopChanged(QIntValidator* self, intptr_t slot); -struct miqt_string* QIntValidator_Tr2(const char* s, const char* c); -struct miqt_string* QIntValidator_Tr3(const char* s, const char* c, int n); -struct miqt_string* QIntValidator_TrUtf82(const char* s, const char* c); -struct miqt_string* QIntValidator_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QIntValidator_Tr2(const char* s, const char* c); +struct miqt_string QIntValidator_Tr3(const char* s, const char* c, int n); +struct miqt_string QIntValidator_TrUtf82(const char* s, const char* c); +struct miqt_string QIntValidator_TrUtf83(const char* s, const char* c, int n); void QIntValidator_Delete(QIntValidator* self); QDoubleValidator* QDoubleValidator_new(); @@ -84,9 +84,9 @@ QDoubleValidator* QDoubleValidator_new3(QObject* parent); QDoubleValidator* QDoubleValidator_new4(double bottom, double top, int decimals, QObject* parent); QMetaObject* QDoubleValidator_MetaObject(const QDoubleValidator* self); void* QDoubleValidator_Metacast(QDoubleValidator* self, const char* param1); -struct miqt_string* QDoubleValidator_Tr(const char* s); -struct miqt_string* QDoubleValidator_TrUtf8(const char* s); -int QDoubleValidator_Validate(const QDoubleValidator* self, struct miqt_string* param1, int* param2); +struct miqt_string QDoubleValidator_Tr(const char* s); +struct miqt_string QDoubleValidator_TrUtf8(const char* s); +int QDoubleValidator_Validate(const QDoubleValidator* self, struct miqt_string param1, int* param2); void QDoubleValidator_SetRange(QDoubleValidator* self, double bottom, double top); void QDoubleValidator_SetBottom(QDoubleValidator* self, double bottom); void QDoubleValidator_SetTop(QDoubleValidator* self, double top); @@ -104,10 +104,10 @@ void QDoubleValidator_DecimalsChanged(QDoubleValidator* self, int decimals); void QDoubleValidator_connect_DecimalsChanged(QDoubleValidator* self, intptr_t slot); void QDoubleValidator_NotationChanged(QDoubleValidator* self, int notation); void QDoubleValidator_connect_NotationChanged(QDoubleValidator* self, intptr_t slot); -struct miqt_string* QDoubleValidator_Tr2(const char* s, const char* c); -struct miqt_string* QDoubleValidator_Tr3(const char* s, const char* c, int n); -struct miqt_string* QDoubleValidator_TrUtf82(const char* s, const char* c); -struct miqt_string* QDoubleValidator_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QDoubleValidator_Tr2(const char* s, const char* c); +struct miqt_string QDoubleValidator_Tr3(const char* s, const char* c, int n); +struct miqt_string QDoubleValidator_TrUtf82(const char* s, const char* c); +struct miqt_string QDoubleValidator_TrUtf83(const char* s, const char* c, int n); void QDoubleValidator_SetRange3(QDoubleValidator* self, double bottom, double top, int decimals); void QDoubleValidator_Delete(QDoubleValidator* self); @@ -117,17 +117,17 @@ QRegExpValidator* QRegExpValidator_new3(QObject* parent); QRegExpValidator* QRegExpValidator_new4(QRegExp* rx, QObject* parent); QMetaObject* QRegExpValidator_MetaObject(const QRegExpValidator* self); void* QRegExpValidator_Metacast(QRegExpValidator* self, const char* param1); -struct miqt_string* QRegExpValidator_Tr(const char* s); -struct miqt_string* QRegExpValidator_TrUtf8(const char* s); -int QRegExpValidator_Validate(const QRegExpValidator* self, struct miqt_string* input, int* pos); +struct miqt_string QRegExpValidator_Tr(const char* s); +struct miqt_string QRegExpValidator_TrUtf8(const char* s); +int QRegExpValidator_Validate(const QRegExpValidator* self, struct miqt_string input, int* pos); void QRegExpValidator_SetRegExp(QRegExpValidator* self, QRegExp* rx); QRegExp* QRegExpValidator_RegExp(const QRegExpValidator* self); void QRegExpValidator_RegExpChanged(QRegExpValidator* self, QRegExp* regExp); void QRegExpValidator_connect_RegExpChanged(QRegExpValidator* self, intptr_t slot); -struct miqt_string* QRegExpValidator_Tr2(const char* s, const char* c); -struct miqt_string* QRegExpValidator_Tr3(const char* s, const char* c, int n); -struct miqt_string* QRegExpValidator_TrUtf82(const char* s, const char* c); -struct miqt_string* QRegExpValidator_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QRegExpValidator_Tr2(const char* s, const char* c); +struct miqt_string QRegExpValidator_Tr3(const char* s, const char* c, int n); +struct miqt_string QRegExpValidator_TrUtf82(const char* s, const char* c); +struct miqt_string QRegExpValidator_TrUtf83(const char* s, const char* c, int n); void QRegExpValidator_Delete(QRegExpValidator* self); QRegularExpressionValidator* QRegularExpressionValidator_new(); @@ -136,17 +136,17 @@ QRegularExpressionValidator* QRegularExpressionValidator_new3(QObject* parent); QRegularExpressionValidator* QRegularExpressionValidator_new4(QRegularExpression* re, QObject* parent); QMetaObject* QRegularExpressionValidator_MetaObject(const QRegularExpressionValidator* self); void* QRegularExpressionValidator_Metacast(QRegularExpressionValidator* self, const char* param1); -struct miqt_string* QRegularExpressionValidator_Tr(const char* s); -struct miqt_string* QRegularExpressionValidator_TrUtf8(const char* s); -int QRegularExpressionValidator_Validate(const QRegularExpressionValidator* self, struct miqt_string* input, int* pos); +struct miqt_string QRegularExpressionValidator_Tr(const char* s); +struct miqt_string QRegularExpressionValidator_TrUtf8(const char* s); +int QRegularExpressionValidator_Validate(const QRegularExpressionValidator* self, struct miqt_string input, int* pos); QRegularExpression* QRegularExpressionValidator_RegularExpression(const QRegularExpressionValidator* self); void QRegularExpressionValidator_SetRegularExpression(QRegularExpressionValidator* self, QRegularExpression* re); void QRegularExpressionValidator_RegularExpressionChanged(QRegularExpressionValidator* self, QRegularExpression* re); void QRegularExpressionValidator_connect_RegularExpressionChanged(QRegularExpressionValidator* self, intptr_t slot); -struct miqt_string* QRegularExpressionValidator_Tr2(const char* s, const char* c); -struct miqt_string* QRegularExpressionValidator_Tr3(const char* s, const char* c, int n); -struct miqt_string* QRegularExpressionValidator_TrUtf82(const char* s, const char* c); -struct miqt_string* QRegularExpressionValidator_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QRegularExpressionValidator_Tr2(const char* s, const char* c); +struct miqt_string QRegularExpressionValidator_Tr3(const char* s, const char* c, int n); +struct miqt_string QRegularExpressionValidator_TrUtf82(const char* s, const char* c); +struct miqt_string QRegularExpressionValidator_TrUtf83(const char* s, const char* c, int n); void QRegularExpressionValidator_Delete(QRegularExpressionValidator* self); #ifdef __cplusplus diff --git a/qt/gen_qvariant.cpp b/qt/gen_qvariant.cpp index fe977631..78663f26 100644 --- a/qt/gen_qvariant.cpp +++ b/qt/gen_qvariant.cpp @@ -99,25 +99,26 @@ QVariant* QVariant_new14(const char* str) { return new QVariant(str); } -QVariant* QVariant_new15(QByteArray* bytearray) { - return new QVariant(*bytearray); +QVariant* QVariant_new15(struct miqt_string bytearray) { + QByteArray bytearray_QByteArray(bytearray.data, bytearray.len); + return new QVariant(bytearray_QByteArray); } QVariant* QVariant_new16(QBitArray* bitarray) { return new QVariant(*bitarray); } -QVariant* QVariant_new17(struct miqt_string* stringVal) { - QString stringVal_QString = QString::fromUtf8(&stringVal->data, stringVal->len); +QVariant* QVariant_new17(struct miqt_string stringVal) { + QString stringVal_QString = QString::fromUtf8(stringVal.data, stringVal.len); return new QVariant(stringVal_QString); } -QVariant* QVariant_new18(struct miqt_array* /* of struct miqt_string* */ stringlist) { +QVariant* QVariant_new18(struct miqt_array* /* of struct miqt_string */ stringlist) { QStringList stringlist_QList; stringlist_QList.reserve(stringlist->len); - struct miqt_string** stringlist_arr = static_cast(stringlist->data); + struct miqt_string* stringlist_arr = static_cast(stringlist->data); for(size_t i = 0; i < stringlist->len; ++i) { - QString stringlist_arr_i_QString = QString::fromUtf8(&stringlist_arr[i]->data, stringlist_arr[i]->len); + QString stringlist_arr_i_QString = QString::fromUtf8(stringlist_arr[i].data, stringlist_arr[i].len); stringlist_QList.push_back(stringlist_arr_i_QString); } return new QVariant(stringlist_QList); @@ -304,30 +305,43 @@ double QVariant_ToReal(const QVariant* self) { return static_cast(_ret); } -QByteArray* QVariant_ToByteArray(const QVariant* self) { - return new QByteArray(self->toByteArray()); +struct miqt_string QVariant_ToByteArray(const QVariant* self) { + QByteArray _qb = self->toByteArray(); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } QBitArray* QVariant_ToBitArray(const QVariant* self) { return new QBitArray(self->toBitArray()); } -struct miqt_string* QVariant_ToString(const QVariant* self) { +struct miqt_string QVariant_ToString(const QVariant* self) { QString _ret = self->toString(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } struct miqt_array* QVariant_ToStringList(const QVariant* self) { QStringList _ret = self->toStringList(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); diff --git a/qt/gen_qvariant.go b/qt/gen_qvariant.go index f6982851..0f9485e6 100644 --- a/qt/gen_qvariant.go +++ b/qt/gen_qvariant.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -197,8 +196,11 @@ func NewQVariant14(str string) *QVariant { } // NewQVariant15 constructs a new QVariant object. -func NewQVariant15(bytearray *QByteArray) *QVariant { - ret := C.QVariant_new15(bytearray.cPointer()) +func NewQVariant15(bytearray []byte) *QVariant { + bytearray_alias := C.struct_miqt_string{} + bytearray_alias.data = (*C.char)(unsafe.Pointer(&bytearray[0])) + bytearray_alias.len = C.size_t(len(bytearray)) + ret := C.QVariant_new15(bytearray_alias) return newQVariant(ret) } @@ -210,21 +212,25 @@ func NewQVariant16(bitarray *QBitArray) *QVariant { // NewQVariant17 constructs a new QVariant object. func NewQVariant17(stringVal string) *QVariant { - stringVal_ms := libmiqt.Strdupg(stringVal) - defer C.free(stringVal_ms) - ret := C.QVariant_new17((*C.struct_miqt_string)(stringVal_ms)) + stringVal_ms := C.struct_miqt_string{} + stringVal_ms.data = C.CString(stringVal) + stringVal_ms.len = C.size_t(len(stringVal)) + defer C.free(unsafe.Pointer(stringVal_ms.data)) + ret := C.QVariant_new17(stringVal_ms) return newQVariant(ret) } // NewQVariant18 constructs a new QVariant object. func NewQVariant18(stringlist []string) *QVariant { // For the C ABI, malloc a C array of raw pointers - stringlist_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(stringlist)))) + stringlist_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(8 * len(stringlist)))) defer C.free(unsafe.Pointer(stringlist_CArray)) for i := range stringlist { - stringlist_i_ms := libmiqt.Strdupg(stringlist[i]) - defer C.free(stringlist_i_ms) - stringlist_CArray[i] = (*C.struct_miqt_string)(stringlist_i_ms) + stringlist_i_ms := C.struct_miqt_string{} + stringlist_i_ms.data = C.CString(stringlist[i]) + stringlist_i_ms.len = C.size_t(len(stringlist[i])) + defer C.free(unsafe.Pointer(stringlist_i_ms.data)) + stringlist_CArray[i] = stringlist_i_ms } stringlist_ma := &C.struct_miqt_array{len: C.size_t(len(stringlist)), data: unsafe.Pointer(stringlist_CArray)} defer runtime.KeepAlive(unsafe.Pointer(stringlist_ma)) @@ -392,9 +398,9 @@ func (this *QVariant) UserType() int { return (int)(C.QVariant_UserType(this.h)) } -func (this *QVariant) TypeName() unsafe.Pointer { +func (this *QVariant) TypeName() string { _ret := C.QVariant_TypeName(this.h) - return (unsafe.Pointer)(_ret) + return C.GoString(_ret) } func (this *QVariant) CanConvert(targetTypeId int) bool { @@ -457,11 +463,11 @@ func (this *QVariant) ToReal() float64 { return (float64)(C.QVariant_ToReal(this.h)) } -func (this *QVariant) ToByteArray() *QByteArray { - _ret := C.QVariant_ToByteArray(this.h) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QVariant) ToByteArray() []byte { + var _bytearray C.struct_miqt_string = C.QVariant_ToByteArray(this.h) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } func (this *QVariant) ToBitArray() *QBitArray { @@ -472,20 +478,20 @@ func (this *QVariant) ToBitArray() *QBitArray { } func (this *QVariant) ToString() string { - var _ms *C.struct_miqt_string = C.QVariant_ToString(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QVariant_ToString(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QVariant) ToStringList() []string { var _ma *C.struct_miqt_array = C.QVariant_ToStringList(this.h) _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -668,9 +674,9 @@ func (this *QVariant) Save(ds *QDataStream) { C.QVariant_Save(this.h, ds.cPointer()) } -func QVariant_TypeToName(typeId int) unsafe.Pointer { +func QVariant_TypeToName(typeId int) string { _ret := C.QVariant_TypeToName((C.int)(typeId)) - return (unsafe.Pointer)(_ret) + return C.GoString(_ret) } func QVariant_NameToType(name string) QVariant__Type { @@ -680,15 +686,15 @@ func QVariant_NameToType(name string) QVariant__Type { } func (this *QVariant) Data() unsafe.Pointer { - return C.QVariant_Data(this.h) + return (unsafe.Pointer)(C.QVariant_Data(this.h)) } func (this *QVariant) ConstData() unsafe.Pointer { - return C.QVariant_ConstData(this.h) + return (unsafe.Pointer)(C.QVariant_ConstData(this.h)) } func (this *QVariant) Data2() unsafe.Pointer { - return C.QVariant_Data2(this.h) + return (unsafe.Pointer)(C.QVariant_Data2(this.h)) } func (this *QVariant) OperatorEqual(v *QVariant) bool { diff --git a/qt/gen_qvariant.h b/qt/gen_qvariant.h index 1a98ec82..b2ccf37b 100644 --- a/qt/gen_qvariant.h +++ b/qt/gen_qvariant.h @@ -129,10 +129,10 @@ QVariant* QVariant_new11(bool b); QVariant* QVariant_new12(double d); QVariant* QVariant_new13(float f); QVariant* QVariant_new14(const char* str); -QVariant* QVariant_new15(QByteArray* bytearray); +QVariant* QVariant_new15(struct miqt_string bytearray); QVariant* QVariant_new16(QBitArray* bitarray); -QVariant* QVariant_new17(struct miqt_string* stringVal); -QVariant* QVariant_new18(struct miqt_array* /* of struct miqt_string* */ stringlist); +QVariant* QVariant_new17(struct miqt_string stringVal); +QVariant* QVariant_new18(struct miqt_array* /* of struct miqt_string */ stringlist); QVariant* QVariant_new19(QChar* qchar); QVariant* QVariant_new20(QDate* date); QVariant* QVariant_new21(QTime* time); @@ -177,9 +177,9 @@ bool QVariant_ToBool(const QVariant* self); double QVariant_ToDouble(const QVariant* self); float QVariant_ToFloat(const QVariant* self); double QVariant_ToReal(const QVariant* self); -QByteArray* QVariant_ToByteArray(const QVariant* self); +struct miqt_string QVariant_ToByteArray(const QVariant* self); QBitArray* QVariant_ToBitArray(const QVariant* self); -struct miqt_string* QVariant_ToString(const QVariant* self); +struct miqt_string QVariant_ToString(const QVariant* self); struct miqt_array* QVariant_ToStringList(const QVariant* self); QChar* QVariant_ToChar(const QVariant* self); QDate* QVariant_ToDate(const QVariant* self); diff --git a/qt/gen_qvariantanimation.cpp b/qt/gen_qvariantanimation.cpp index 793d961f..aeb60290 100644 --- a/qt/gen_qvariantanimation.cpp +++ b/qt/gen_qvariantanimation.cpp @@ -26,18 +26,26 @@ void* QVariantAnimation_Metacast(QVariantAnimation* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QVariantAnimation_Tr(const char* s) { +struct miqt_string QVariantAnimation_Tr(const char* s) { QString _ret = QVariantAnimation::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QVariantAnimation_TrUtf8(const char* s) { +struct miqt_string QVariantAnimation_TrUtf8(const char* s) { QString _ret = QVariantAnimation::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QVariant* QVariantAnimation_StartValue(const QVariantAnimation* self) { @@ -97,32 +105,48 @@ void QVariantAnimation_connect_ValueChanged(QVariantAnimation* self, intptr_t sl }); } -struct miqt_string* QVariantAnimation_Tr2(const char* s, const char* c) { +struct miqt_string QVariantAnimation_Tr2(const char* s, const char* c) { QString _ret = QVariantAnimation::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QVariantAnimation_Tr3(const char* s, const char* c, int n) { +struct miqt_string QVariantAnimation_Tr3(const char* s, const char* c, int n) { QString _ret = QVariantAnimation::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QVariantAnimation_TrUtf82(const char* s, const char* c) { +struct miqt_string QVariantAnimation_TrUtf82(const char* s, const char* c) { QString _ret = QVariantAnimation::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QVariantAnimation_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QVariantAnimation_TrUtf83(const char* s, const char* c, int n) { QString _ret = QVariantAnimation::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QVariantAnimation_Delete(QVariantAnimation* self) { diff --git a/qt/gen_qvariantanimation.go b/qt/gen_qvariantanimation.go index 7a95b5bc..74a9573a 100644 --- a/qt/gen_qvariantanimation.go +++ b/qt/gen_qvariantanimation.go @@ -63,24 +63,24 @@ func (this *QVariantAnimation) MetaObject() *QMetaObject { func (this *QVariantAnimation) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QVariantAnimation_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QVariantAnimation_Metacast(this.h, param1_Cstring)) } func QVariantAnimation_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QVariantAnimation_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QVariantAnimation_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QVariantAnimation_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QVariantAnimation_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QVariantAnimation_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -168,9 +168,9 @@ func QVariantAnimation_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QVariantAnimation_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QVariantAnimation_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -179,9 +179,9 @@ func QVariantAnimation_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QVariantAnimation_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QVariantAnimation_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -190,9 +190,9 @@ func QVariantAnimation_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QVariantAnimation_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QVariantAnimation_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -201,9 +201,9 @@ func QVariantAnimation_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QVariantAnimation_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QVariantAnimation_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qvariantanimation.h b/qt/gen_qvariantanimation.h index cd38b25d..f211c1b8 100644 --- a/qt/gen_qvariantanimation.h +++ b/qt/gen_qvariantanimation.h @@ -31,8 +31,8 @@ QVariantAnimation* QVariantAnimation_new(); QVariantAnimation* QVariantAnimation_new2(QObject* parent); QMetaObject* QVariantAnimation_MetaObject(const QVariantAnimation* self); void* QVariantAnimation_Metacast(QVariantAnimation* self, const char* param1); -struct miqt_string* QVariantAnimation_Tr(const char* s); -struct miqt_string* QVariantAnimation_TrUtf8(const char* s); +struct miqt_string QVariantAnimation_Tr(const char* s); +struct miqt_string QVariantAnimation_TrUtf8(const char* s); QVariant* QVariantAnimation_StartValue(const QVariantAnimation* self); void QVariantAnimation_SetStartValue(QVariantAnimation* self, QVariant* value); QVariant* QVariantAnimation_EndValue(const QVariantAnimation* self); @@ -46,10 +46,10 @@ QEasingCurve* QVariantAnimation_EasingCurve(const QVariantAnimation* self); void QVariantAnimation_SetEasingCurve(QVariantAnimation* self, QEasingCurve* easing); void QVariantAnimation_ValueChanged(QVariantAnimation* self, QVariant* value); void QVariantAnimation_connect_ValueChanged(QVariantAnimation* self, intptr_t slot); -struct miqt_string* QVariantAnimation_Tr2(const char* s, const char* c); -struct miqt_string* QVariantAnimation_Tr3(const char* s, const char* c, int n); -struct miqt_string* QVariantAnimation_TrUtf82(const char* s, const char* c); -struct miqt_string* QVariantAnimation_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QVariantAnimation_Tr2(const char* s, const char* c); +struct miqt_string QVariantAnimation_Tr3(const char* s, const char* c, int n); +struct miqt_string QVariantAnimation_TrUtf82(const char* s, const char* c); +struct miqt_string QVariantAnimation_TrUtf83(const char* s, const char* c, int n); void QVariantAnimation_Delete(QVariantAnimation* self); #ifdef __cplusplus diff --git a/qt/gen_qversionnumber.cpp b/qt/gen_qversionnumber.cpp index 973f78e9..12f17b3b 100644 --- a/qt/gen_qversionnumber.cpp +++ b/qt/gen_qversionnumber.cpp @@ -90,20 +90,24 @@ QVersionNumber* QVersionNumber_CommonPrefix(QVersionNumber* v1, QVersionNumber* return new QVersionNumber(QVersionNumber::commonPrefix(*v1, *v2)); } -struct miqt_string* QVersionNumber_ToString(const QVersionNumber* self) { +struct miqt_string QVersionNumber_ToString(const QVersionNumber* self) { QString _ret = self->toString(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -QVersionNumber* QVersionNumber_FromString(struct miqt_string* stringVal) { - QString stringVal_QString = QString::fromUtf8(&stringVal->data, stringVal->len); +QVersionNumber* QVersionNumber_FromString(struct miqt_string stringVal) { + QString stringVal_QString = QString::fromUtf8(stringVal.data, stringVal.len); return new QVersionNumber(QVersionNumber::fromString(stringVal_QString)); } -QVersionNumber* QVersionNumber_FromString22(struct miqt_string* stringVal, int* suffixIndex) { - QString stringVal_QString = QString::fromUtf8(&stringVal->data, stringVal->len); +QVersionNumber* QVersionNumber_FromString22(struct miqt_string stringVal, int* suffixIndex) { + QString stringVal_QString = QString::fromUtf8(stringVal.data, stringVal.len); return new QVersionNumber(QVersionNumber::fromString(stringVal_QString, static_cast(suffixIndex))); } diff --git a/qt/gen_qversionnumber.go b/qt/gen_qversionnumber.go index 9298ea9a..c151c0b5 100644 --- a/qt/gen_qversionnumber.go +++ b/qt/gen_qversionnumber.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -143,25 +142,29 @@ func QVersionNumber_CommonPrefix(v1 *QVersionNumber, v2 *QVersionNumber) *QVersi } func (this *QVersionNumber) ToString() string { - var _ms *C.struct_miqt_string = C.QVersionNumber_ToString(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QVersionNumber_ToString(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QVersionNumber_FromString(stringVal string) *QVersionNumber { - stringVal_ms := libmiqt.Strdupg(stringVal) - defer C.free(stringVal_ms) - _ret := C.QVersionNumber_FromString((*C.struct_miqt_string)(stringVal_ms)) + stringVal_ms := C.struct_miqt_string{} + stringVal_ms.data = C.CString(stringVal) + stringVal_ms.len = C.size_t(len(stringVal)) + defer C.free(unsafe.Pointer(stringVal_ms.data)) + _ret := C.QVersionNumber_FromString(stringVal_ms) _goptr := newQVersionNumber(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func QVersionNumber_FromString22(stringVal string, suffixIndex *int) *QVersionNumber { - stringVal_ms := libmiqt.Strdupg(stringVal) - defer C.free(stringVal_ms) - _ret := C.QVersionNumber_FromString22((*C.struct_miqt_string)(stringVal_ms), (*C.int)(unsafe.Pointer(suffixIndex))) + stringVal_ms := C.struct_miqt_string{} + stringVal_ms.data = C.CString(stringVal) + stringVal_ms.len = C.size_t(len(stringVal)) + defer C.free(unsafe.Pointer(stringVal_ms.data)) + _ret := C.QVersionNumber_FromString22(stringVal_ms, (*C.int)(unsafe.Pointer(suffixIndex))) _goptr := newQVersionNumber(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr diff --git a/qt/gen_qversionnumber.h b/qt/gen_qversionnumber.h index 93393a27..57b807b6 100644 --- a/qt/gen_qversionnumber.h +++ b/qt/gen_qversionnumber.h @@ -36,9 +36,9 @@ int QVersionNumber_SegmentCount(const QVersionNumber* self); bool QVersionNumber_IsPrefixOf(const QVersionNumber* self, QVersionNumber* other); int QVersionNumber_Compare(QVersionNumber* v1, QVersionNumber* v2); QVersionNumber* QVersionNumber_CommonPrefix(QVersionNumber* v1, QVersionNumber* v2); -struct miqt_string* QVersionNumber_ToString(const QVersionNumber* self); -QVersionNumber* QVersionNumber_FromString(struct miqt_string* stringVal); -QVersionNumber* QVersionNumber_FromString22(struct miqt_string* stringVal, int* suffixIndex); +struct miqt_string QVersionNumber_ToString(const QVersionNumber* self); +QVersionNumber* QVersionNumber_FromString(struct miqt_string stringVal); +QVersionNumber* QVersionNumber_FromString22(struct miqt_string stringVal, int* suffixIndex); void QVersionNumber_Delete(QVersionNumber* self); #ifdef __cplusplus diff --git a/qt/gen_qwhatsthis.cpp b/qt/gen_qwhatsthis.cpp index ffc89689..c7501669 100644 --- a/qt/gen_qwhatsthis.cpp +++ b/qt/gen_qwhatsthis.cpp @@ -22,8 +22,8 @@ void QWhatsThis_LeaveWhatsThisMode() { QWhatsThis::leaveWhatsThisMode(); } -void QWhatsThis_ShowText(QPoint* pos, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QWhatsThis_ShowText(QPoint* pos, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); QWhatsThis::showText(*pos, text_QString); } @@ -35,8 +35,8 @@ QAction* QWhatsThis_CreateAction() { return QWhatsThis::createAction(); } -void QWhatsThis_ShowText3(QPoint* pos, struct miqt_string* text, QWidget* w) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QWhatsThis_ShowText3(QPoint* pos, struct miqt_string text, QWidget* w) { + QString text_QString = QString::fromUtf8(text.data, text.len); QWhatsThis::showText(*pos, text_QString, w); } diff --git a/qt/gen_qwhatsthis.go b/qt/gen_qwhatsthis.go index 5e1ab774..5a8529da 100644 --- a/qt/gen_qwhatsthis.go +++ b/qt/gen_qwhatsthis.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -56,9 +55,11 @@ func QWhatsThis_LeaveWhatsThisMode() { } func QWhatsThis_ShowText(pos *QPoint, text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QWhatsThis_ShowText(pos.cPointer(), (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QWhatsThis_ShowText(pos.cPointer(), text_ms) } func QWhatsThis_HideText() { @@ -70,9 +71,11 @@ func QWhatsThis_CreateAction() *QAction { } func QWhatsThis_ShowText3(pos *QPoint, text string, w *QWidget) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QWhatsThis_ShowText3(pos.cPointer(), (*C.struct_miqt_string)(text_ms), w.cPointer()) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QWhatsThis_ShowText3(pos.cPointer(), text_ms, w.cPointer()) } func QWhatsThis_CreateAction1(parent *QObject) *QAction { diff --git a/qt/gen_qwhatsthis.h b/qt/gen_qwhatsthis.h index a01d2722..e427a89a 100644 --- a/qt/gen_qwhatsthis.h +++ b/qt/gen_qwhatsthis.h @@ -30,10 +30,10 @@ typedef struct QWidget QWidget; void QWhatsThis_EnterWhatsThisMode(); bool QWhatsThis_InWhatsThisMode(); void QWhatsThis_LeaveWhatsThisMode(); -void QWhatsThis_ShowText(QPoint* pos, struct miqt_string* text); +void QWhatsThis_ShowText(QPoint* pos, struct miqt_string text); void QWhatsThis_HideText(); QAction* QWhatsThis_CreateAction(); -void QWhatsThis_ShowText3(QPoint* pos, struct miqt_string* text, QWidget* w); +void QWhatsThis_ShowText3(QPoint* pos, struct miqt_string text, QWidget* w); QAction* QWhatsThis_CreateAction1(QObject* parent); void QWhatsThis_Delete(QWhatsThis* self); diff --git a/qt/gen_qwidget.cpp b/qt/gen_qwidget.cpp index 7895ad50..0f4362b6 100644 --- a/qt/gen_qwidget.cpp +++ b/qt/gen_qwidget.cpp @@ -70,18 +70,26 @@ void* QWidget_Metacast(QWidget* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QWidget_Tr(const char* s) { +struct miqt_string QWidget_Tr(const char* s) { QString _ret = QWidget::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QWidget_TrUtf8(const char* s) { +struct miqt_string QWidget_TrUtf8(const char* s) { QString _ret = QWidget::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QWidget_DevType(const QWidget* self) { @@ -468,28 +476,36 @@ void QWidget_UngrabGesture(QWidget* self, int typeVal) { self->ungrabGesture(static_cast(typeVal)); } -void QWidget_SetWindowTitle(QWidget* self, struct miqt_string* windowTitle) { - QString windowTitle_QString = QString::fromUtf8(&windowTitle->data, windowTitle->len); +void QWidget_SetWindowTitle(QWidget* self, struct miqt_string windowTitle) { + QString windowTitle_QString = QString::fromUtf8(windowTitle.data, windowTitle.len); self->setWindowTitle(windowTitle_QString); } -void QWidget_SetStyleSheet(QWidget* self, struct miqt_string* styleSheet) { - QString styleSheet_QString = QString::fromUtf8(&styleSheet->data, styleSheet->len); +void QWidget_SetStyleSheet(QWidget* self, struct miqt_string styleSheet) { + QString styleSheet_QString = QString::fromUtf8(styleSheet.data, styleSheet.len); self->setStyleSheet(styleSheet_QString); } -struct miqt_string* QWidget_StyleSheet(const QWidget* self) { +struct miqt_string QWidget_StyleSheet(const QWidget* self) { QString _ret = self->styleSheet(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QWidget_WindowTitle(const QWidget* self) { +struct miqt_string QWidget_WindowTitle(const QWidget* self) { QString _ret = self->windowTitle(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QWidget_SetWindowIcon(QWidget* self, QIcon* icon) { @@ -500,40 +516,52 @@ QIcon* QWidget_WindowIcon(const QWidget* self) { return new QIcon(self->windowIcon()); } -void QWidget_SetWindowIconText(QWidget* self, struct miqt_string* windowIconText) { - QString windowIconText_QString = QString::fromUtf8(&windowIconText->data, windowIconText->len); +void QWidget_SetWindowIconText(QWidget* self, struct miqt_string windowIconText) { + QString windowIconText_QString = QString::fromUtf8(windowIconText.data, windowIconText.len); self->setWindowIconText(windowIconText_QString); } -struct miqt_string* QWidget_WindowIconText(const QWidget* self) { +struct miqt_string QWidget_WindowIconText(const QWidget* self) { QString _ret = self->windowIconText(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QWidget_SetWindowRole(QWidget* self, struct miqt_string* windowRole) { - QString windowRole_QString = QString::fromUtf8(&windowRole->data, windowRole->len); +void QWidget_SetWindowRole(QWidget* self, struct miqt_string windowRole) { + QString windowRole_QString = QString::fromUtf8(windowRole.data, windowRole.len); self->setWindowRole(windowRole_QString); } -struct miqt_string* QWidget_WindowRole(const QWidget* self) { +struct miqt_string QWidget_WindowRole(const QWidget* self) { QString _ret = self->windowRole(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QWidget_SetWindowFilePath(QWidget* self, struct miqt_string* filePath) { - QString filePath_QString = QString::fromUtf8(&filePath->data, filePath->len); +void QWidget_SetWindowFilePath(QWidget* self, struct miqt_string filePath) { + QString filePath_QString = QString::fromUtf8(filePath.data, filePath.len); self->setWindowFilePath(filePath_QString); } -struct miqt_string* QWidget_WindowFilePath(const QWidget* self) { +struct miqt_string QWidget_WindowFilePath(const QWidget* self) { QString _ret = self->windowFilePath(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QWidget_SetWindowOpacity(QWidget* self, double level) { @@ -549,16 +577,20 @@ bool QWidget_IsWindowModified(const QWidget* self) { return self->isWindowModified(); } -void QWidget_SetToolTip(QWidget* self, struct miqt_string* toolTip) { - QString toolTip_QString = QString::fromUtf8(&toolTip->data, toolTip->len); +void QWidget_SetToolTip(QWidget* self, struct miqt_string toolTip) { + QString toolTip_QString = QString::fromUtf8(toolTip.data, toolTip.len); self->setToolTip(toolTip_QString); } -struct miqt_string* QWidget_ToolTip(const QWidget* self) { +struct miqt_string QWidget_ToolTip(const QWidget* self) { QString _ret = self->toolTip(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QWidget_SetToolTipDuration(QWidget* self, int msec) { @@ -569,51 +601,67 @@ int QWidget_ToolTipDuration(const QWidget* self) { return self->toolTipDuration(); } -void QWidget_SetStatusTip(QWidget* self, struct miqt_string* statusTip) { - QString statusTip_QString = QString::fromUtf8(&statusTip->data, statusTip->len); +void QWidget_SetStatusTip(QWidget* self, struct miqt_string statusTip) { + QString statusTip_QString = QString::fromUtf8(statusTip.data, statusTip.len); self->setStatusTip(statusTip_QString); } -struct miqt_string* QWidget_StatusTip(const QWidget* self) { +struct miqt_string QWidget_StatusTip(const QWidget* self) { QString _ret = self->statusTip(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QWidget_SetWhatsThis(QWidget* self, struct miqt_string* whatsThis) { - QString whatsThis_QString = QString::fromUtf8(&whatsThis->data, whatsThis->len); +void QWidget_SetWhatsThis(QWidget* self, struct miqt_string whatsThis) { + QString whatsThis_QString = QString::fromUtf8(whatsThis.data, whatsThis.len); self->setWhatsThis(whatsThis_QString); } -struct miqt_string* QWidget_WhatsThis(const QWidget* self) { +struct miqt_string QWidget_WhatsThis(const QWidget* self) { QString _ret = self->whatsThis(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QWidget_AccessibleName(const QWidget* self) { +struct miqt_string QWidget_AccessibleName(const QWidget* self) { QString _ret = self->accessibleName(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QWidget_SetAccessibleName(QWidget* self, struct miqt_string* name) { - QString name_QString = QString::fromUtf8(&name->data, name->len); +void QWidget_SetAccessibleName(QWidget* self, struct miqt_string name) { + QString name_QString = QString::fromUtf8(name.data, name.len); self->setAccessibleName(name_QString); } -struct miqt_string* QWidget_AccessibleDescription(const QWidget* self) { +struct miqt_string QWidget_AccessibleDescription(const QWidget* self) { QString _ret = self->accessibleDescription(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QWidget_SetAccessibleDescription(QWidget* self, struct miqt_string* description) { - QString description_QString = QString::fromUtf8(&description->data, description->len); +void QWidget_SetAccessibleDescription(QWidget* self, struct miqt_string description) { + QString description_QString = QString::fromUtf8(description.data, description.len); self->setAccessibleDescription(description_QString); } @@ -864,12 +912,18 @@ void QWidget_SetGeometryWithGeometry(QWidget* self, QRect* geometry) { self->setGeometry(*geometry); } -QByteArray* QWidget_SaveGeometry(const QWidget* self) { - return new QByteArray(self->saveGeometry()); +struct miqt_string QWidget_SaveGeometry(const QWidget* self) { + QByteArray _qb = self->saveGeometry(); + struct miqt_string _ms; + _ms.len = _qb.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _qb.data(), _ms.len); + return _ms; } -bool QWidget_RestoreGeometry(QWidget* self, QByteArray* geometry) { - return self->restoreGeometry(*geometry); +bool QWidget_RestoreGeometry(QWidget* self, struct miqt_string geometry) { + QByteArray geometry_QByteArray(geometry.data, geometry.len); + return self->restoreGeometry(geometry_QByteArray); } void QWidget_AdjustSize(QWidget* self) { @@ -1140,8 +1194,8 @@ QWidget* QWidget_CreateWindowContainer(QWindow* window) { return QWidget::createWindowContainer(window); } -void QWidget_WindowTitleChanged(QWidget* self, struct miqt_string* title) { - QString title_QString = QString::fromUtf8(&title->data, title->len); +void QWidget_WindowTitleChanged(QWidget* self, struct miqt_string title) { + QString title_QString = QString::fromUtf8(title.data, title.len); self->windowTitleChanged(title_QString); } @@ -1150,7 +1204,11 @@ void QWidget_connect_WindowTitleChanged(QWidget* self, intptr_t slot) { const QString title_ret = title; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray title_b = title_ret.toUtf8(); - struct miqt_string* sigval1 = miqt_strdup(title_b.data(), title_b.length()); + struct miqt_string title_ms; + title_ms.len = title_b.length(); + title_ms.data = static_cast(malloc(title_ms.len)); + memcpy(title_ms.data, title_b.data(), title_ms.len); + struct miqt_string sigval1 = title_ms; miqt_exec_callback_QWidget_WindowTitleChanged(slot, sigval1); }); } @@ -1168,8 +1226,8 @@ void QWidget_connect_WindowIconChanged(QWidget* self, intptr_t slot) { }); } -void QWidget_WindowIconTextChanged(QWidget* self, struct miqt_string* iconText) { - QString iconText_QString = QString::fromUtf8(&iconText->data, iconText->len); +void QWidget_WindowIconTextChanged(QWidget* self, struct miqt_string iconText) { + QString iconText_QString = QString::fromUtf8(iconText.data, iconText.len); self->windowIconTextChanged(iconText_QString); } @@ -1178,7 +1236,11 @@ void QWidget_connect_WindowIconTextChanged(QWidget* self, intptr_t slot) { const QString iconText_ret = iconText; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray iconText_b = iconText_ret.toUtf8(); - struct miqt_string* sigval1 = miqt_strdup(iconText_b.data(), iconText_b.length()); + struct miqt_string iconText_ms; + iconText_ms.len = iconText_b.length(); + iconText_ms.data = static_cast(malloc(iconText_ms.len)); + memcpy(iconText_ms.data, iconText_b.data(), iconText_ms.len); + struct miqt_string sigval1 = iconText_ms; miqt_exec_callback_QWidget_WindowIconTextChanged(slot, sigval1); }); } @@ -1209,32 +1271,48 @@ void QWidget_SetInputMethodHints(QWidget* self, int hints) { self->setInputMethodHints(static_cast(hints)); } -struct miqt_string* QWidget_Tr2(const char* s, const char* c) { +struct miqt_string QWidget_Tr2(const char* s, const char* c) { QString _ret = QWidget::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QWidget_Tr3(const char* s, const char* c, int n) { +struct miqt_string QWidget_Tr3(const char* s, const char* c, int n) { QString _ret = QWidget::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QWidget_TrUtf82(const char* s, const char* c) { +struct miqt_string QWidget_TrUtf82(const char* s, const char* c) { QString _ret = QWidget::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QWidget_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QWidget_TrUtf83(const char* s, const char* c, int n) { QString _ret = QWidget::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QWidget_Render2(QWidget* self, QPaintDevice* target, QPoint* targetOffset) { diff --git a/qt/gen_qwidget.go b/qt/gen_qwidget.go index 1443bcf7..99b1bf21 100644 --- a/qt/gen_qwidget.go +++ b/qt/gen_qwidget.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "runtime/cgo" "unsafe" @@ -132,24 +131,24 @@ func (this *QWidget) MetaObject() *QMetaObject { func (this *QWidget) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QWidget_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QWidget_Metacast(this.h, param1_Cstring)) } func QWidget_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QWidget_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QWidget_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QWidget_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QWidget_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QWidget_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -595,28 +594,32 @@ func (this *QWidget) UngrabGesture(typeVal GestureType) { } func (this *QWidget) SetWindowTitle(windowTitle string) { - windowTitle_ms := libmiqt.Strdupg(windowTitle) - defer C.free(windowTitle_ms) - C.QWidget_SetWindowTitle(this.h, (*C.struct_miqt_string)(windowTitle_ms)) + windowTitle_ms := C.struct_miqt_string{} + windowTitle_ms.data = C.CString(windowTitle) + windowTitle_ms.len = C.size_t(len(windowTitle)) + defer C.free(unsafe.Pointer(windowTitle_ms.data)) + C.QWidget_SetWindowTitle(this.h, windowTitle_ms) } func (this *QWidget) SetStyleSheet(styleSheet string) { - styleSheet_ms := libmiqt.Strdupg(styleSheet) - defer C.free(styleSheet_ms) - C.QWidget_SetStyleSheet(this.h, (*C.struct_miqt_string)(styleSheet_ms)) + styleSheet_ms := C.struct_miqt_string{} + styleSheet_ms.data = C.CString(styleSheet) + styleSheet_ms.len = C.size_t(len(styleSheet)) + defer C.free(unsafe.Pointer(styleSheet_ms.data)) + C.QWidget_SetStyleSheet(this.h, styleSheet_ms) } func (this *QWidget) StyleSheet() string { - var _ms *C.struct_miqt_string = C.QWidget_StyleSheet(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QWidget_StyleSheet(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QWidget) WindowTitle() string { - var _ms *C.struct_miqt_string = C.QWidget_WindowTitle(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QWidget_WindowTitle(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -632,41 +635,47 @@ func (this *QWidget) WindowIcon() *QIcon { } func (this *QWidget) SetWindowIconText(windowIconText string) { - windowIconText_ms := libmiqt.Strdupg(windowIconText) - defer C.free(windowIconText_ms) - C.QWidget_SetWindowIconText(this.h, (*C.struct_miqt_string)(windowIconText_ms)) + windowIconText_ms := C.struct_miqt_string{} + windowIconText_ms.data = C.CString(windowIconText) + windowIconText_ms.len = C.size_t(len(windowIconText)) + defer C.free(unsafe.Pointer(windowIconText_ms.data)) + C.QWidget_SetWindowIconText(this.h, windowIconText_ms) } func (this *QWidget) WindowIconText() string { - var _ms *C.struct_miqt_string = C.QWidget_WindowIconText(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QWidget_WindowIconText(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QWidget) SetWindowRole(windowRole string) { - windowRole_ms := libmiqt.Strdupg(windowRole) - defer C.free(windowRole_ms) - C.QWidget_SetWindowRole(this.h, (*C.struct_miqt_string)(windowRole_ms)) + windowRole_ms := C.struct_miqt_string{} + windowRole_ms.data = C.CString(windowRole) + windowRole_ms.len = C.size_t(len(windowRole)) + defer C.free(unsafe.Pointer(windowRole_ms.data)) + C.QWidget_SetWindowRole(this.h, windowRole_ms) } func (this *QWidget) WindowRole() string { - var _ms *C.struct_miqt_string = C.QWidget_WindowRole(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QWidget_WindowRole(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QWidget) SetWindowFilePath(filePath string) { - filePath_ms := libmiqt.Strdupg(filePath) - defer C.free(filePath_ms) - C.QWidget_SetWindowFilePath(this.h, (*C.struct_miqt_string)(filePath_ms)) + filePath_ms := C.struct_miqt_string{} + filePath_ms.data = C.CString(filePath) + filePath_ms.len = C.size_t(len(filePath)) + defer C.free(unsafe.Pointer(filePath_ms.data)) + C.QWidget_SetWindowFilePath(this.h, filePath_ms) } func (this *QWidget) WindowFilePath() string { - var _ms *C.struct_miqt_string = C.QWidget_WindowFilePath(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QWidget_WindowFilePath(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -683,15 +692,17 @@ func (this *QWidget) IsWindowModified() bool { } func (this *QWidget) SetToolTip(toolTip string) { - toolTip_ms := libmiqt.Strdupg(toolTip) - defer C.free(toolTip_ms) - C.QWidget_SetToolTip(this.h, (*C.struct_miqt_string)(toolTip_ms)) + toolTip_ms := C.struct_miqt_string{} + toolTip_ms.data = C.CString(toolTip) + toolTip_ms.len = C.size_t(len(toolTip)) + defer C.free(unsafe.Pointer(toolTip_ms.data)) + C.QWidget_SetToolTip(this.h, toolTip_ms) } func (this *QWidget) ToolTip() string { - var _ms *C.struct_miqt_string = C.QWidget_ToolTip(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QWidget_ToolTip(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -704,55 +715,63 @@ func (this *QWidget) ToolTipDuration() int { } func (this *QWidget) SetStatusTip(statusTip string) { - statusTip_ms := libmiqt.Strdupg(statusTip) - defer C.free(statusTip_ms) - C.QWidget_SetStatusTip(this.h, (*C.struct_miqt_string)(statusTip_ms)) + statusTip_ms := C.struct_miqt_string{} + statusTip_ms.data = C.CString(statusTip) + statusTip_ms.len = C.size_t(len(statusTip)) + defer C.free(unsafe.Pointer(statusTip_ms.data)) + C.QWidget_SetStatusTip(this.h, statusTip_ms) } func (this *QWidget) StatusTip() string { - var _ms *C.struct_miqt_string = C.QWidget_StatusTip(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QWidget_StatusTip(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QWidget) SetWhatsThis(whatsThis string) { - whatsThis_ms := libmiqt.Strdupg(whatsThis) - defer C.free(whatsThis_ms) - C.QWidget_SetWhatsThis(this.h, (*C.struct_miqt_string)(whatsThis_ms)) + whatsThis_ms := C.struct_miqt_string{} + whatsThis_ms.data = C.CString(whatsThis) + whatsThis_ms.len = C.size_t(len(whatsThis)) + defer C.free(unsafe.Pointer(whatsThis_ms.data)) + C.QWidget_SetWhatsThis(this.h, whatsThis_ms) } func (this *QWidget) WhatsThis() string { - var _ms *C.struct_miqt_string = C.QWidget_WhatsThis(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QWidget_WhatsThis(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QWidget) AccessibleName() string { - var _ms *C.struct_miqt_string = C.QWidget_AccessibleName(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QWidget_AccessibleName(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QWidget) SetAccessibleName(name string) { - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - C.QWidget_SetAccessibleName(this.h, (*C.struct_miqt_string)(name_ms)) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + C.QWidget_SetAccessibleName(this.h, name_ms) } func (this *QWidget) AccessibleDescription() string { - var _ms *C.struct_miqt_string = C.QWidget_AccessibleDescription(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QWidget_AccessibleDescription(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QWidget) SetAccessibleDescription(description string) { - description_ms := libmiqt.Strdupg(description) - defer C.free(description_ms) - C.QWidget_SetAccessibleDescription(this.h, (*C.struct_miqt_string)(description_ms)) + description_ms := C.struct_miqt_string{} + description_ms.data = C.CString(description) + description_ms.len = C.size_t(len(description)) + defer C.free(unsafe.Pointer(description_ms.data)) + C.QWidget_SetAccessibleDescription(this.h, description_ms) } func (this *QWidget) SetLayoutDirection(direction LayoutDirection) { @@ -1002,15 +1021,18 @@ func (this *QWidget) SetGeometryWithGeometry(geometry *QRect) { C.QWidget_SetGeometryWithGeometry(this.h, geometry.cPointer()) } -func (this *QWidget) SaveGeometry() *QByteArray { - _ret := C.QWidget_SaveGeometry(this.h) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QWidget) SaveGeometry() []byte { + var _bytearray C.struct_miqt_string = C.QWidget_SaveGeometry(this.h) + _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) + C.free(unsafe.Pointer(_bytearray.data)) + return _ret } -func (this *QWidget) RestoreGeometry(geometry *QByteArray) bool { - return (bool)(C.QWidget_RestoreGeometry(this.h, geometry.cPointer())) +func (this *QWidget) RestoreGeometry(geometry []byte) bool { + geometry_alias := C.struct_miqt_string{} + geometry_alias.data = (*C.char)(unsafe.Pointer(&geometry[0])) + geometry_alias.len = C.size_t(len(geometry)) + return (bool)(C.QWidget_RestoreGeometry(this.h, geometry_alias)) } func (this *QWidget) AdjustSize() { @@ -1299,25 +1321,27 @@ func QWidget_CreateWindowContainer(window *QWindow) *QWidget { } func (this *QWidget) WindowTitleChanged(title string) { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - C.QWidget_WindowTitleChanged(this.h, (*C.struct_miqt_string)(title_ms)) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + C.QWidget_WindowTitleChanged(this.h, title_ms) } func (this *QWidget) OnWindowTitleChanged(slot func(title string)) { C.QWidget_connect_WindowTitleChanged(this.h, C.intptr_t(cgo.NewHandle(slot))) } //export miqt_exec_callback_QWidget_WindowTitleChanged -func miqt_exec_callback_QWidget_WindowTitleChanged(cb C.intptr_t, title *C.struct_miqt_string) { +func miqt_exec_callback_QWidget_WindowTitleChanged(cb C.intptr_t, title C.struct_miqt_string) { gofunc, ok := cgo.Handle(cb).Value().(func(title string)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") } // Convert all CABI parameters to Go parameters - var title_ms *C.struct_miqt_string = title - title_ret := C.GoStringN(&title_ms.data, C.int(int64(title_ms.len))) - C.free(unsafe.Pointer(title_ms)) + var title_ms C.struct_miqt_string = title + title_ret := C.GoStringN(title_ms.data, C.int(int64(title_ms.len))) + C.free(unsafe.Pointer(title_ms.data)) slotval1 := title_ret gofunc(slotval1) @@ -1344,25 +1368,27 @@ func miqt_exec_callback_QWidget_WindowIconChanged(cb C.intptr_t, icon *C.QIcon) } func (this *QWidget) WindowIconTextChanged(iconText string) { - iconText_ms := libmiqt.Strdupg(iconText) - defer C.free(iconText_ms) - C.QWidget_WindowIconTextChanged(this.h, (*C.struct_miqt_string)(iconText_ms)) + iconText_ms := C.struct_miqt_string{} + iconText_ms.data = C.CString(iconText) + iconText_ms.len = C.size_t(len(iconText)) + defer C.free(unsafe.Pointer(iconText_ms.data)) + C.QWidget_WindowIconTextChanged(this.h, iconText_ms) } func (this *QWidget) OnWindowIconTextChanged(slot func(iconText string)) { C.QWidget_connect_WindowIconTextChanged(this.h, C.intptr_t(cgo.NewHandle(slot))) } //export miqt_exec_callback_QWidget_WindowIconTextChanged -func miqt_exec_callback_QWidget_WindowIconTextChanged(cb C.intptr_t, iconText *C.struct_miqt_string) { +func miqt_exec_callback_QWidget_WindowIconTextChanged(cb C.intptr_t, iconText C.struct_miqt_string) { gofunc, ok := cgo.Handle(cb).Value().(func(iconText string)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") } // Convert all CABI parameters to Go parameters - var iconText_ms *C.struct_miqt_string = iconText - iconText_ret := C.GoStringN(&iconText_ms.data, C.int(int64(iconText_ms.len))) - C.free(unsafe.Pointer(iconText_ms)) + var iconText_ms C.struct_miqt_string = iconText + iconText_ret := C.GoStringN(iconText_ms.data, C.int(int64(iconText_ms.len))) + C.free(unsafe.Pointer(iconText_ms.data)) slotval1 := iconText_ret gofunc(slotval1) @@ -1408,9 +1434,9 @@ func QWidget_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QWidget_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QWidget_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -1419,9 +1445,9 @@ func QWidget_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QWidget_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QWidget_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -1430,9 +1456,9 @@ func QWidget_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QWidget_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QWidget_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -1441,9 +1467,9 @@ func QWidget_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QWidget_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QWidget_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qwidget.h b/qt/gen_qwidget.h index acc86c0f..b039b1d8 100644 --- a/qt/gen_qwidget.h +++ b/qt/gen_qwidget.h @@ -90,8 +90,8 @@ QWidget* QWidget_new2(QWidget* parent); QWidget* QWidget_new3(QWidget* parent, int f); QMetaObject* QWidget_MetaObject(const QWidget* self); void* QWidget_Metacast(QWidget* self, const char* param1); -struct miqt_string* QWidget_Tr(const char* s); -struct miqt_string* QWidget_TrUtf8(const char* s); +struct miqt_string QWidget_Tr(const char* s); +struct miqt_string QWidget_TrUtf8(const char* s); int QWidget_DevType(const QWidget* self); uintptr_t QWidget_WinId(const QWidget* self); void QWidget_CreateWinId(QWidget* self); @@ -185,33 +185,33 @@ QGraphicsEffect* QWidget_GraphicsEffect(const QWidget* self); void QWidget_SetGraphicsEffect(QWidget* self, QGraphicsEffect* effect); void QWidget_GrabGesture(QWidget* self, int typeVal); void QWidget_UngrabGesture(QWidget* self, int typeVal); -void QWidget_SetWindowTitle(QWidget* self, struct miqt_string* windowTitle); -void QWidget_SetStyleSheet(QWidget* self, struct miqt_string* styleSheet); -struct miqt_string* QWidget_StyleSheet(const QWidget* self); -struct miqt_string* QWidget_WindowTitle(const QWidget* self); +void QWidget_SetWindowTitle(QWidget* self, struct miqt_string windowTitle); +void QWidget_SetStyleSheet(QWidget* self, struct miqt_string styleSheet); +struct miqt_string QWidget_StyleSheet(const QWidget* self); +struct miqt_string QWidget_WindowTitle(const QWidget* self); void QWidget_SetWindowIcon(QWidget* self, QIcon* icon); QIcon* QWidget_WindowIcon(const QWidget* self); -void QWidget_SetWindowIconText(QWidget* self, struct miqt_string* windowIconText); -struct miqt_string* QWidget_WindowIconText(const QWidget* self); -void QWidget_SetWindowRole(QWidget* self, struct miqt_string* windowRole); -struct miqt_string* QWidget_WindowRole(const QWidget* self); -void QWidget_SetWindowFilePath(QWidget* self, struct miqt_string* filePath); -struct miqt_string* QWidget_WindowFilePath(const QWidget* self); +void QWidget_SetWindowIconText(QWidget* self, struct miqt_string windowIconText); +struct miqt_string QWidget_WindowIconText(const QWidget* self); +void QWidget_SetWindowRole(QWidget* self, struct miqt_string windowRole); +struct miqt_string QWidget_WindowRole(const QWidget* self); +void QWidget_SetWindowFilePath(QWidget* self, struct miqt_string filePath); +struct miqt_string QWidget_WindowFilePath(const QWidget* self); void QWidget_SetWindowOpacity(QWidget* self, double level); double QWidget_WindowOpacity(const QWidget* self); bool QWidget_IsWindowModified(const QWidget* self); -void QWidget_SetToolTip(QWidget* self, struct miqt_string* toolTip); -struct miqt_string* QWidget_ToolTip(const QWidget* self); +void QWidget_SetToolTip(QWidget* self, struct miqt_string toolTip); +struct miqt_string QWidget_ToolTip(const QWidget* self); void QWidget_SetToolTipDuration(QWidget* self, int msec); int QWidget_ToolTipDuration(const QWidget* self); -void QWidget_SetStatusTip(QWidget* self, struct miqt_string* statusTip); -struct miqt_string* QWidget_StatusTip(const QWidget* self); -void QWidget_SetWhatsThis(QWidget* self, struct miqt_string* whatsThis); -struct miqt_string* QWidget_WhatsThis(const QWidget* self); -struct miqt_string* QWidget_AccessibleName(const QWidget* self); -void QWidget_SetAccessibleName(QWidget* self, struct miqt_string* name); -struct miqt_string* QWidget_AccessibleDescription(const QWidget* self); -void QWidget_SetAccessibleDescription(QWidget* self, struct miqt_string* description); +void QWidget_SetStatusTip(QWidget* self, struct miqt_string statusTip); +struct miqt_string QWidget_StatusTip(const QWidget* self); +void QWidget_SetWhatsThis(QWidget* self, struct miqt_string whatsThis); +struct miqt_string QWidget_WhatsThis(const QWidget* self); +struct miqt_string QWidget_AccessibleName(const QWidget* self); +void QWidget_SetAccessibleName(QWidget* self, struct miqt_string name); +struct miqt_string QWidget_AccessibleDescription(const QWidget* self); +void QWidget_SetAccessibleDescription(QWidget* self, struct miqt_string description); void QWidget_SetLayoutDirection(QWidget* self, int direction); int QWidget_LayoutDirection(const QWidget* self); void QWidget_UnsetLayoutDirection(QWidget* self); @@ -273,8 +273,8 @@ void QWidget_Resize(QWidget* self, int w, int h); void QWidget_ResizeWithQSize(QWidget* self, QSize* param1); void QWidget_SetGeometry(QWidget* self, int x, int y, int w, int h); void QWidget_SetGeometryWithGeometry(QWidget* self, QRect* geometry); -QByteArray* QWidget_SaveGeometry(const QWidget* self); -bool QWidget_RestoreGeometry(QWidget* self, QByteArray* geometry); +struct miqt_string QWidget_SaveGeometry(const QWidget* self); +bool QWidget_RestoreGeometry(QWidget* self, struct miqt_string geometry); void QWidget_AdjustSize(QWidget* self); bool QWidget_IsVisible(const QWidget* self); bool QWidget_IsVisibleTo(const QWidget* self, QWidget* param1); @@ -336,21 +336,21 @@ QBackingStore* QWidget_BackingStore(const QWidget* self); QWindow* QWidget_WindowHandle(const QWidget* self); QScreen* QWidget_Screen(const QWidget* self); QWidget* QWidget_CreateWindowContainer(QWindow* window); -void QWidget_WindowTitleChanged(QWidget* self, struct miqt_string* title); +void QWidget_WindowTitleChanged(QWidget* self, struct miqt_string title); void QWidget_connect_WindowTitleChanged(QWidget* self, intptr_t slot); void QWidget_WindowIconChanged(QWidget* self, QIcon* icon); void QWidget_connect_WindowIconChanged(QWidget* self, intptr_t slot); -void QWidget_WindowIconTextChanged(QWidget* self, struct miqt_string* iconText); +void QWidget_WindowIconTextChanged(QWidget* self, struct miqt_string iconText); void QWidget_connect_WindowIconTextChanged(QWidget* self, intptr_t slot); void QWidget_CustomContextMenuRequested(QWidget* self, QPoint* pos); void QWidget_connect_CustomContextMenuRequested(QWidget* self, intptr_t slot); QVariant* QWidget_InputMethodQuery(const QWidget* self, int param1); int QWidget_InputMethodHints(const QWidget* self); void QWidget_SetInputMethodHints(QWidget* self, int hints); -struct miqt_string* QWidget_Tr2(const char* s, const char* c); -struct miqt_string* QWidget_Tr3(const char* s, const char* c, int n); -struct miqt_string* QWidget_TrUtf82(const char* s, const char* c); -struct miqt_string* QWidget_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QWidget_Tr2(const char* s, const char* c); +struct miqt_string QWidget_Tr3(const char* s, const char* c, int n); +struct miqt_string QWidget_TrUtf82(const char* s, const char* c); +struct miqt_string QWidget_TrUtf83(const char* s, const char* c, int n); void QWidget_Render2(QWidget* self, QPaintDevice* target, QPoint* targetOffset); void QWidget_Render3(QWidget* self, QPaintDevice* target, QPoint* targetOffset, QRegion* sourceRegion); void QWidget_Render4(QWidget* self, QPaintDevice* target, QPoint* targetOffset, QRegion* sourceRegion, int renderFlags); diff --git a/qt/gen_qwidgetaction.cpp b/qt/gen_qwidgetaction.cpp index fe373d2f..dac90601 100644 --- a/qt/gen_qwidgetaction.cpp +++ b/qt/gen_qwidgetaction.cpp @@ -21,18 +21,26 @@ void* QWidgetAction_Metacast(QWidgetAction* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QWidgetAction_Tr(const char* s) { +struct miqt_string QWidgetAction_Tr(const char* s) { QString _ret = QWidgetAction::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QWidgetAction_TrUtf8(const char* s) { +struct miqt_string QWidgetAction_TrUtf8(const char* s) { QString _ret = QWidgetAction::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QWidgetAction_SetDefaultWidget(QWidgetAction* self, QWidget* w) { @@ -51,32 +59,48 @@ void QWidgetAction_ReleaseWidget(QWidgetAction* self, QWidget* widget) { self->releaseWidget(widget); } -struct miqt_string* QWidgetAction_Tr2(const char* s, const char* c) { +struct miqt_string QWidgetAction_Tr2(const char* s, const char* c) { QString _ret = QWidgetAction::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QWidgetAction_Tr3(const char* s, const char* c, int n) { +struct miqt_string QWidgetAction_Tr3(const char* s, const char* c, int n) { QString _ret = QWidgetAction::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QWidgetAction_TrUtf82(const char* s, const char* c) { +struct miqt_string QWidgetAction_TrUtf82(const char* s, const char* c) { QString _ret = QWidgetAction::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QWidgetAction_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QWidgetAction_TrUtf83(const char* s, const char* c, int n) { QString _ret = QWidgetAction::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QWidgetAction_Delete(QWidgetAction* self) { diff --git a/qt/gen_qwidgetaction.go b/qt/gen_qwidgetaction.go index 7be4471d..62b4ff10 100644 --- a/qt/gen_qwidgetaction.go +++ b/qt/gen_qwidgetaction.go @@ -56,24 +56,24 @@ func (this *QWidgetAction) MetaObject() *QMetaObject { func (this *QWidgetAction) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QWidgetAction_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QWidgetAction_Metacast(this.h, param1_Cstring)) } func QWidgetAction_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QWidgetAction_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QWidgetAction_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QWidgetAction_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QWidgetAction_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QWidgetAction_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -98,9 +98,9 @@ func QWidgetAction_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QWidgetAction_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QWidgetAction_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -109,9 +109,9 @@ func QWidgetAction_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QWidgetAction_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QWidgetAction_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -120,9 +120,9 @@ func QWidgetAction_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QWidgetAction_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QWidgetAction_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -131,9 +131,9 @@ func QWidgetAction_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QWidgetAction_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QWidgetAction_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qwidgetaction.h b/qt/gen_qwidgetaction.h index 0e5b9101..f3c10e6c 100644 --- a/qt/gen_qwidgetaction.h +++ b/qt/gen_qwidgetaction.h @@ -28,16 +28,16 @@ typedef struct QWidgetAction QWidgetAction; QWidgetAction* QWidgetAction_new(QObject* parent); QMetaObject* QWidgetAction_MetaObject(const QWidgetAction* self); void* QWidgetAction_Metacast(QWidgetAction* self, const char* param1); -struct miqt_string* QWidgetAction_Tr(const char* s); -struct miqt_string* QWidgetAction_TrUtf8(const char* s); +struct miqt_string QWidgetAction_Tr(const char* s); +struct miqt_string QWidgetAction_TrUtf8(const char* s); void QWidgetAction_SetDefaultWidget(QWidgetAction* self, QWidget* w); QWidget* QWidgetAction_DefaultWidget(const QWidgetAction* self); QWidget* QWidgetAction_RequestWidget(QWidgetAction* self, QWidget* parent); void QWidgetAction_ReleaseWidget(QWidgetAction* self, QWidget* widget); -struct miqt_string* QWidgetAction_Tr2(const char* s, const char* c); -struct miqt_string* QWidgetAction_Tr3(const char* s, const char* c, int n); -struct miqt_string* QWidgetAction_TrUtf82(const char* s, const char* c); -struct miqt_string* QWidgetAction_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QWidgetAction_Tr2(const char* s, const char* c); +struct miqt_string QWidgetAction_Tr3(const char* s, const char* c, int n); +struct miqt_string QWidgetAction_TrUtf82(const char* s, const char* c); +struct miqt_string QWidgetAction_TrUtf83(const char* s, const char* c, int n); void QWidgetAction_Delete(QWidgetAction* self); #ifdef __cplusplus diff --git a/qt/gen_qwindow.cpp b/qt/gen_qwindow.cpp index d7b822a9..d2077dd3 100644 --- a/qt/gen_qwindow.cpp +++ b/qt/gen_qwindow.cpp @@ -38,18 +38,26 @@ void* QWindow_Metacast(QWindow* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QWindow_Tr(const char* s) { +struct miqt_string QWindow_Tr(const char* s) { QString _ret = QWindow::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QWindow_TrUtf8(const char* s) { +struct miqt_string QWindow_TrUtf8(const char* s) { QString _ret = QWindow::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QWindow_SetSurfaceType(QWindow* self, int surfaceType) { @@ -142,11 +150,15 @@ int QWindow_Type(const QWindow* self) { return static_cast(_ret); } -struct miqt_string* QWindow_Title(const QWindow* self) { +struct miqt_string QWindow_Title(const QWindow* self) { QString _ret = self->title(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QWindow_SetOpacity(QWindow* self, double level) { @@ -326,16 +338,20 @@ void QWindow_Resize2(QWindow* self, int w, int h) { self->resize(static_cast(w), static_cast(h)); } -void QWindow_SetFilePath(QWindow* self, struct miqt_string* filePath) { - QString filePath_QString = QString::fromUtf8(&filePath->data, filePath->len); +void QWindow_SetFilePath(QWindow* self, struct miqt_string filePath) { + QString filePath_QString = QString::fromUtf8(filePath.data, filePath.len); self->setFilePath(filePath_QString); } -struct miqt_string* QWindow_FilePath(const QWindow* self) { +struct miqt_string QWindow_FilePath(const QWindow* self) { QString _ret = self->filePath(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QWindow_SetIcon(QWindow* self, QIcon* icon) { @@ -450,8 +466,8 @@ bool QWindow_StartSystemMove(QWindow* self) { return self->startSystemMove(); } -void QWindow_SetTitle(QWindow* self, struct miqt_string* title) { - QString title_QString = QString::fromUtf8(&title->data, title->len); +void QWindow_SetTitle(QWindow* self, struct miqt_string title) { + QString title_QString = QString::fromUtf8(title.data, title.len); self->setTitle(title_QString); } @@ -538,8 +554,8 @@ void QWindow_connect_WindowStateChanged(QWindow* self, intptr_t slot) { }); } -void QWindow_WindowTitleChanged(QWindow* self, struct miqt_string* title) { - QString title_QString = QString::fromUtf8(&title->data, title->len); +void QWindow_WindowTitleChanged(QWindow* self, struct miqt_string title) { + QString title_QString = QString::fromUtf8(title.data, title.len); self->windowTitleChanged(title_QString); } @@ -548,7 +564,11 @@ void QWindow_connect_WindowTitleChanged(QWindow* self, intptr_t slot) { const QString title_ret = title; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray title_b = title_ret.toUtf8(); - struct miqt_string* sigval1 = miqt_strdup(title_b.data(), title_b.length()); + struct miqt_string title_ms; + title_ms.len = title_b.length(); + title_ms.data = static_cast(malloc(title_ms.len)); + memcpy(title_ms.data, title_b.data(), title_ms.len); + struct miqt_string sigval1 = title_ms; miqt_exec_callback_QWindow_WindowTitleChanged(slot, sigval1); }); } @@ -720,32 +740,48 @@ void QWindow_connect_TransientParentChanged(QWindow* self, intptr_t slot) { }); } -struct miqt_string* QWindow_Tr2(const char* s, const char* c) { +struct miqt_string QWindow_Tr2(const char* s, const char* c) { QString _ret = QWindow::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QWindow_Tr3(const char* s, const char* c, int n) { +struct miqt_string QWindow_Tr3(const char* s, const char* c, int n) { QString _ret = QWindow::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QWindow_TrUtf82(const char* s, const char* c) { +struct miqt_string QWindow_TrUtf82(const char* s, const char* c) { QString _ret = QWindow::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QWindow_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QWindow_TrUtf83(const char* s, const char* c, int n) { QString _ret = QWindow::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QWindow_SetFlag2(QWindow* self, int param1, bool on) { diff --git a/qt/gen_qwindow.go b/qt/gen_qwindow.go index 2993c85b..5ac2657b 100644 --- a/qt/gen_qwindow.go +++ b/qt/gen_qwindow.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "runtime/cgo" "unsafe" @@ -89,24 +88,24 @@ func (this *QWindow) MetaObject() *QMetaObject { func (this *QWindow) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QWindow_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QWindow_Metacast(this.h, param1_Cstring)) } func QWindow_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QWindow_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QWindow_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QWindow_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QWindow_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QWindow_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -201,9 +200,9 @@ func (this *QWindow) Type() WindowType { } func (this *QWindow) Title() string { - var _ms *C.struct_miqt_string = C.QWindow_Title(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QWindow_Title(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -413,15 +412,17 @@ func (this *QWindow) Resize2(w int, h int) { } func (this *QWindow) SetFilePath(filePath string) { - filePath_ms := libmiqt.Strdupg(filePath) - defer C.free(filePath_ms) - C.QWindow_SetFilePath(this.h, (*C.struct_miqt_string)(filePath_ms)) + filePath_ms := C.struct_miqt_string{} + filePath_ms.data = C.CString(filePath) + filePath_ms.len = C.size_t(len(filePath)) + defer C.free(unsafe.Pointer(filePath_ms.data)) + C.QWindow_SetFilePath(this.h, filePath_ms) } func (this *QWindow) FilePath() string { - var _ms *C.struct_miqt_string = C.QWindow_FilePath(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QWindow_FilePath(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -550,9 +551,11 @@ func (this *QWindow) StartSystemMove() bool { } func (this *QWindow) SetTitle(title string) { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - C.QWindow_SetTitle(this.h, (*C.struct_miqt_string)(title_ms)) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + C.QWindow_SetTitle(this.h, title_ms) } func (this *QWindow) SetX(arg int) { @@ -664,25 +667,27 @@ func miqt_exec_callback_QWindow_WindowStateChanged(cb C.intptr_t, windowState C. } func (this *QWindow) WindowTitleChanged(title string) { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - C.QWindow_WindowTitleChanged(this.h, (*C.struct_miqt_string)(title_ms)) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + C.QWindow_WindowTitleChanged(this.h, title_ms) } func (this *QWindow) OnWindowTitleChanged(slot func(title string)) { C.QWindow_connect_WindowTitleChanged(this.h, C.intptr_t(cgo.NewHandle(slot))) } //export miqt_exec_callback_QWindow_WindowTitleChanged -func miqt_exec_callback_QWindow_WindowTitleChanged(cb C.intptr_t, title *C.struct_miqt_string) { +func miqt_exec_callback_QWindow_WindowTitleChanged(cb C.intptr_t, title C.struct_miqt_string) { gofunc, ok := cgo.Handle(cb).Value().(func(title string)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") } // Convert all CABI parameters to Go parameters - var title_ms *C.struct_miqt_string = title - title_ret := C.GoStringN(&title_ms.data, C.int(int64(title_ms.len))) - C.free(unsafe.Pointer(title_ms)) + var title_ms C.struct_miqt_string = title + title_ret := C.GoStringN(title_ms.data, C.int(int64(title_ms.len))) + C.free(unsafe.Pointer(title_ms.data)) slotval1 := title_ret gofunc(slotval1) @@ -990,9 +995,9 @@ func QWindow_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QWindow_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QWindow_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -1001,9 +1006,9 @@ func QWindow_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QWindow_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QWindow_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -1012,9 +1017,9 @@ func QWindow_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QWindow_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QWindow_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -1023,9 +1028,9 @@ func QWindow_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QWindow_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QWindow_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qwindow.h b/qt/gen_qwindow.h index b598c897..28943690 100644 --- a/qt/gen_qwindow.h +++ b/qt/gen_qwindow.h @@ -48,8 +48,8 @@ QWindow* QWindow_new2(QWindow* parent); QWindow* QWindow_new3(QScreen* screen); QMetaObject* QWindow_MetaObject(const QWindow* self); void* QWindow_Metacast(QWindow* self, const char* param1); -struct miqt_string* QWindow_Tr(const char* s); -struct miqt_string* QWindow_TrUtf8(const char* s); +struct miqt_string QWindow_Tr(const char* s); +struct miqt_string QWindow_TrUtf8(const char* s); void QWindow_SetSurfaceType(QWindow* self, int surfaceType); int QWindow_SurfaceType(const QWindow* self); bool QWindow_IsVisible(const QWindow* self); @@ -71,7 +71,7 @@ void QWindow_SetFlags(QWindow* self, int flags); int QWindow_Flags(const QWindow* self); void QWindow_SetFlag(QWindow* self, int param1); int QWindow_Type(const QWindow* self); -struct miqt_string* QWindow_Title(const QWindow* self); +struct miqt_string QWindow_Title(const QWindow* self); void QWindow_SetOpacity(QWindow* self, double level); double QWindow_Opacity(const QWindow* self); void QWindow_SetMask(QWindow* self, QRegion* region); @@ -115,8 +115,8 @@ void QWindow_SetPosition(QWindow* self, QPoint* pt); void QWindow_SetPosition2(QWindow* self, int posx, int posy); void QWindow_Resize(QWindow* self, QSize* newSize); void QWindow_Resize2(QWindow* self, int w, int h); -void QWindow_SetFilePath(QWindow* self, struct miqt_string* filePath); -struct miqt_string* QWindow_FilePath(const QWindow* self); +void QWindow_SetFilePath(QWindow* self, struct miqt_string filePath); +struct miqt_string QWindow_FilePath(const QWindow* self); void QWindow_SetIcon(QWindow* self, QIcon* icon); QIcon* QWindow_Icon(const QWindow* self); void QWindow_Destroy(QWindow* self); @@ -145,7 +145,7 @@ void QWindow_Raise(QWindow* self); void QWindow_Lower(QWindow* self); bool QWindow_StartSystemResize(QWindow* self, int edges); bool QWindow_StartSystemMove(QWindow* self); -void QWindow_SetTitle(QWindow* self, struct miqt_string* title); +void QWindow_SetTitle(QWindow* self, struct miqt_string title); void QWindow_SetX(QWindow* self, int arg); void QWindow_SetY(QWindow* self, int arg); void QWindow_SetWidth(QWindow* self, int arg); @@ -164,7 +164,7 @@ void QWindow_ModalityChanged(QWindow* self, int modality); void QWindow_connect_ModalityChanged(QWindow* self, intptr_t slot); void QWindow_WindowStateChanged(QWindow* self, int windowState); void QWindow_connect_WindowStateChanged(QWindow* self, intptr_t slot); -void QWindow_WindowTitleChanged(QWindow* self, struct miqt_string* title); +void QWindow_WindowTitleChanged(QWindow* self, struct miqt_string title); void QWindow_connect_WindowTitleChanged(QWindow* self, intptr_t slot); void QWindow_XChanged(QWindow* self, int arg); void QWindow_connect_XChanged(QWindow* self, intptr_t slot); @@ -196,10 +196,10 @@ void QWindow_OpacityChanged(QWindow* self, double opacity); void QWindow_connect_OpacityChanged(QWindow* self, intptr_t slot); void QWindow_TransientParentChanged(QWindow* self, QWindow* transientParent); void QWindow_connect_TransientParentChanged(QWindow* self, intptr_t slot); -struct miqt_string* QWindow_Tr2(const char* s, const char* c); -struct miqt_string* QWindow_Tr3(const char* s, const char* c, int n); -struct miqt_string* QWindow_TrUtf82(const char* s, const char* c); -struct miqt_string* QWindow_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QWindow_Tr2(const char* s, const char* c); +struct miqt_string QWindow_Tr3(const char* s, const char* c, int n); +struct miqt_string QWindow_TrUtf82(const char* s, const char* c); +struct miqt_string QWindow_TrUtf83(const char* s, const char* c, int n); void QWindow_SetFlag2(QWindow* self, int param1, bool on); bool QWindow_IsAncestorOf2(const QWindow* self, QWindow* child, int mode); void QWindow_Delete(QWindow* self); diff --git a/qt/gen_qwizard.cpp b/qt/gen_qwizard.cpp index bd00aee4..c5a6ebf0 100644 --- a/qt/gen_qwizard.cpp +++ b/qt/gen_qwizard.cpp @@ -34,18 +34,26 @@ void* QWizard_Metacast(QWizard* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QWizard_Tr(const char* s) { +struct miqt_string QWizard_Tr(const char* s) { QString _ret = QWizard::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QWizard_TrUtf8(const char* s) { +struct miqt_string QWizard_TrUtf8(const char* s) { QString _ret = QWizard::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QWizard_AddPage(QWizard* self, QWizardPage* page) { @@ -131,13 +139,13 @@ int QWizard_NextId(const QWizard* self) { return self->nextId(); } -void QWizard_SetField(QWizard* self, struct miqt_string* name, QVariant* value) { - QString name_QString = QString::fromUtf8(&name->data, name->len); +void QWizard_SetField(QWizard* self, struct miqt_string name, QVariant* value) { + QString name_QString = QString::fromUtf8(name.data, name.len); self->setField(name_QString, *value); } -QVariant* QWizard_Field(const QWizard* self, struct miqt_string* name) { - QString name_QString = QString::fromUtf8(&name->data, name->len); +QVariant* QWizard_Field(const QWizard* self, struct miqt_string name) { + QString name_QString = QString::fromUtf8(name.data, name.len); return new QVariant(self->field(name_QString)); } @@ -167,16 +175,20 @@ int QWizard_Options(const QWizard* self) { return static_cast(_ret); } -void QWizard_SetButtonText(QWizard* self, int which, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QWizard_SetButtonText(QWizard* self, int which, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->setButtonText(static_cast(which), text_QString); } -struct miqt_string* QWizard_ButtonText(const QWizard* self, int which) { +struct miqt_string QWizard_ButtonText(const QWizard* self, int which) { QString _ret = self->buttonText(static_cast(which)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QWizard_SetButtonLayout(QWizard* self, struct miqt_array* /* of int */ layout) { @@ -309,32 +321,48 @@ void QWizard_Restart(QWizard* self) { self->restart(); } -struct miqt_string* QWizard_Tr2(const char* s, const char* c) { +struct miqt_string QWizard_Tr2(const char* s, const char* c) { QString _ret = QWizard::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QWizard_Tr3(const char* s, const char* c, int n) { +struct miqt_string QWizard_Tr3(const char* s, const char* c, int n) { QString _ret = QWizard::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QWizard_TrUtf82(const char* s, const char* c) { +struct miqt_string QWizard_TrUtf82(const char* s, const char* c) { QString _ret = QWizard::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QWizard_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QWizard_TrUtf83(const char* s, const char* c, int n) { QString _ret = QWizard::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QWizard_SetOption2(QWizard* self, int option, bool on) { @@ -361,42 +389,58 @@ void* QWizardPage_Metacast(QWizardPage* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QWizardPage_Tr(const char* s) { +struct miqt_string QWizardPage_Tr(const char* s) { QString _ret = QWizardPage::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QWizardPage_TrUtf8(const char* s) { +struct miqt_string QWizardPage_TrUtf8(const char* s) { QString _ret = QWizardPage::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QWizardPage_SetTitle(QWizardPage* self, struct miqt_string* title) { - QString title_QString = QString::fromUtf8(&title->data, title->len); +void QWizardPage_SetTitle(QWizardPage* self, struct miqt_string title) { + QString title_QString = QString::fromUtf8(title.data, title.len); self->setTitle(title_QString); } -struct miqt_string* QWizardPage_Title(const QWizardPage* self) { +struct miqt_string QWizardPage_Title(const QWizardPage* self) { QString _ret = self->title(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QWizardPage_SetSubTitle(QWizardPage* self, struct miqt_string* subTitle) { - QString subTitle_QString = QString::fromUtf8(&subTitle->data, subTitle->len); +void QWizardPage_SetSubTitle(QWizardPage* self, struct miqt_string subTitle) { + QString subTitle_QString = QString::fromUtf8(subTitle.data, subTitle.len); self->setSubTitle(subTitle_QString); } -struct miqt_string* QWizardPage_SubTitle(const QWizardPage* self) { +struct miqt_string QWizardPage_SubTitle(const QWizardPage* self) { QString _ret = self->subTitle(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QWizardPage_SetPixmap(QWizardPage* self, int which, QPixmap* pixmap) { @@ -423,16 +467,20 @@ bool QWizardPage_IsCommitPage(const QWizardPage* self) { return self->isCommitPage(); } -void QWizardPage_SetButtonText(QWizardPage* self, int which, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QWizardPage_SetButtonText(QWizardPage* self, int which, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->setButtonText(static_cast(which), text_QString); } -struct miqt_string* QWizardPage_ButtonText(const QWizardPage* self, int which) { +struct miqt_string QWizardPage_ButtonText(const QWizardPage* self, int which) { QString _ret = self->buttonText(static_cast(which)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QWizardPage_InitializePage(QWizardPage* self) { @@ -465,32 +513,48 @@ void QWizardPage_connect_CompleteChanged(QWizardPage* self, intptr_t slot) { }); } -struct miqt_string* QWizardPage_Tr2(const char* s, const char* c) { +struct miqt_string QWizardPage_Tr2(const char* s, const char* c) { QString _ret = QWizardPage::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QWizardPage_Tr3(const char* s, const char* c, int n) { +struct miqt_string QWizardPage_Tr3(const char* s, const char* c, int n) { QString _ret = QWizardPage::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QWizardPage_TrUtf82(const char* s, const char* c) { +struct miqt_string QWizardPage_TrUtf82(const char* s, const char* c) { QString _ret = QWizardPage::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QWizardPage_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QWizardPage_TrUtf83(const char* s, const char* c, int n) { QString _ret = QWizardPage::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QWizardPage_Delete(QWizardPage* self) { diff --git a/qt/gen_qwizard.go b/qt/gen_qwizard.go index 9f568180..0d52c4eb 100644 --- a/qt/gen_qwizard.go +++ b/qt/gen_qwizard.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "runtime/cgo" "unsafe" @@ -130,24 +129,24 @@ func (this *QWizard) MetaObject() *QMetaObject { func (this *QWizard) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QWizard_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QWizard_Metacast(this.h, param1_Cstring)) } func QWizard_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QWizard_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QWizard_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QWizard_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QWizard_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QWizard_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -229,15 +228,19 @@ func (this *QWizard) NextId() int { } func (this *QWizard) SetField(name string, value *QVariant) { - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - C.QWizard_SetField(this.h, (*C.struct_miqt_string)(name_ms), value.cPointer()) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + C.QWizard_SetField(this.h, name_ms, value.cPointer()) } func (this *QWizard) Field(name string) *QVariant { - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - _ret := C.QWizard_Field(this.h, (*C.struct_miqt_string)(name_ms)) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + _ret := C.QWizard_Field(this.h, name_ms) _goptr := newQVariant(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -268,15 +271,17 @@ func (this *QWizard) Options() QWizard__WizardOption { } func (this *QWizard) SetButtonText(which QWizard__WizardButton, text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QWizard_SetButtonText(this.h, (C.int)(which), (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QWizard_SetButtonText(this.h, (C.int)(which), text_ms) } func (this *QWizard) ButtonText(which QWizard__WizardButton) string { - var _ms *C.struct_miqt_string = C.QWizard_ButtonText(this.h, (C.int)(which)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QWizard_ButtonText(this.h, (C.int)(which)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -470,9 +475,9 @@ func QWizard_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QWizard_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QWizard_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -481,9 +486,9 @@ func QWizard_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QWizard_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QWizard_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -492,9 +497,9 @@ func QWizard_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QWizard_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QWizard_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -503,9 +508,9 @@ func QWizard_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QWizard_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QWizard_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -576,50 +581,54 @@ func (this *QWizardPage) MetaObject() *QMetaObject { func (this *QWizardPage) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QWizardPage_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QWizardPage_Metacast(this.h, param1_Cstring)) } func QWizardPage_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QWizardPage_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QWizardPage_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QWizardPage_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QWizardPage_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QWizardPage_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QWizardPage) SetTitle(title string) { - title_ms := libmiqt.Strdupg(title) - defer C.free(title_ms) - C.QWizardPage_SetTitle(this.h, (*C.struct_miqt_string)(title_ms)) + title_ms := C.struct_miqt_string{} + title_ms.data = C.CString(title) + title_ms.len = C.size_t(len(title)) + defer C.free(unsafe.Pointer(title_ms.data)) + C.QWizardPage_SetTitle(this.h, title_ms) } func (this *QWizardPage) Title() string { - var _ms *C.struct_miqt_string = C.QWizardPage_Title(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QWizardPage_Title(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QWizardPage) SetSubTitle(subTitle string) { - subTitle_ms := libmiqt.Strdupg(subTitle) - defer C.free(subTitle_ms) - C.QWizardPage_SetSubTitle(this.h, (*C.struct_miqt_string)(subTitle_ms)) + subTitle_ms := C.struct_miqt_string{} + subTitle_ms.data = C.CString(subTitle) + subTitle_ms.len = C.size_t(len(subTitle)) + defer C.free(unsafe.Pointer(subTitle_ms.data)) + C.QWizardPage_SetSubTitle(this.h, subTitle_ms) } func (this *QWizardPage) SubTitle() string { - var _ms *C.struct_miqt_string = C.QWizardPage_SubTitle(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QWizardPage_SubTitle(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -651,15 +660,17 @@ func (this *QWizardPage) IsCommitPage() bool { } func (this *QWizardPage) SetButtonText(which QWizard__WizardButton, text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QWizardPage_SetButtonText(this.h, (C.int)(which), (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QWizardPage_SetButtonText(this.h, (C.int)(which), text_ms) } func (this *QWizardPage) ButtonText(which QWizard__WizardButton) string { - var _ms *C.struct_miqt_string = C.QWizardPage_ButtonText(this.h, (C.int)(which)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QWizardPage_ButtonText(this.h, (C.int)(which)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -705,9 +716,9 @@ func QWizardPage_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QWizardPage_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QWizardPage_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -716,9 +727,9 @@ func QWizardPage_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QWizardPage_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QWizardPage_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -727,9 +738,9 @@ func QWizardPage_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QWizardPage_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QWizardPage_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -738,9 +749,9 @@ func QWizardPage_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QWizardPage_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QWizardPage_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/gen_qwizard.h b/qt/gen_qwizard.h index a18b686e..fbcbdf86 100644 --- a/qt/gen_qwizard.h +++ b/qt/gen_qwizard.h @@ -38,8 +38,8 @@ QWizard* QWizard_new2(QWidget* parent); QWizard* QWizard_new3(QWidget* parent, int flags); QMetaObject* QWizard_MetaObject(const QWizard* self); void* QWizard_Metacast(QWizard* self, const char* param1); -struct miqt_string* QWizard_Tr(const char* s); -struct miqt_string* QWizard_TrUtf8(const char* s); +struct miqt_string QWizard_Tr(const char* s); +struct miqt_string QWizard_TrUtf8(const char* s); int QWizard_AddPage(QWizard* self, QWizardPage* page); void QWizard_SetPage(QWizard* self, int id, QWizardPage* page); void QWizard_RemovePage(QWizard* self, int id); @@ -54,16 +54,16 @@ QWizardPage* QWizard_CurrentPage(const QWizard* self); int QWizard_CurrentId(const QWizard* self); bool QWizard_ValidateCurrentPage(QWizard* self); int QWizard_NextId(const QWizard* self); -void QWizard_SetField(QWizard* self, struct miqt_string* name, QVariant* value); -QVariant* QWizard_Field(const QWizard* self, struct miqt_string* name); +void QWizard_SetField(QWizard* self, struct miqt_string name, QVariant* value); +QVariant* QWizard_Field(const QWizard* self, struct miqt_string name); void QWizard_SetWizardStyle(QWizard* self, int style); int QWizard_WizardStyle(const QWizard* self); void QWizard_SetOption(QWizard* self, int option); bool QWizard_TestOption(const QWizard* self, int option); void QWizard_SetOptions(QWizard* self, int options); int QWizard_Options(const QWizard* self); -void QWizard_SetButtonText(QWizard* self, int which, struct miqt_string* text); -struct miqt_string* QWizard_ButtonText(const QWizard* self, int which); +void QWizard_SetButtonText(QWizard* self, int which, struct miqt_string text); +struct miqt_string QWizard_ButtonText(const QWizard* self, int which); void QWizard_SetButtonLayout(QWizard* self, struct miqt_array* /* of int */ layout); void QWizard_SetButton(QWizard* self, int which, QAbstractButton* button); QAbstractButton* QWizard_Button(const QWizard* self, int which); @@ -91,10 +91,10 @@ void QWizard_connect_PageRemoved(QWizard* self, intptr_t slot); void QWizard_Back(QWizard* self); void QWizard_Next(QWizard* self); void QWizard_Restart(QWizard* self); -struct miqt_string* QWizard_Tr2(const char* s, const char* c); -struct miqt_string* QWizard_Tr3(const char* s, const char* c, int n); -struct miqt_string* QWizard_TrUtf82(const char* s, const char* c); -struct miqt_string* QWizard_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QWizard_Tr2(const char* s, const char* c); +struct miqt_string QWizard_Tr3(const char* s, const char* c, int n); +struct miqt_string QWizard_TrUtf82(const char* s, const char* c); +struct miqt_string QWizard_TrUtf83(const char* s, const char* c, int n); void QWizard_SetOption2(QWizard* self, int option, bool on); void QWizard_Delete(QWizard* self); @@ -102,20 +102,20 @@ QWizardPage* QWizardPage_new(); QWizardPage* QWizardPage_new2(QWidget* parent); QMetaObject* QWizardPage_MetaObject(const QWizardPage* self); void* QWizardPage_Metacast(QWizardPage* self, const char* param1); -struct miqt_string* QWizardPage_Tr(const char* s); -struct miqt_string* QWizardPage_TrUtf8(const char* s); -void QWizardPage_SetTitle(QWizardPage* self, struct miqt_string* title); -struct miqt_string* QWizardPage_Title(const QWizardPage* self); -void QWizardPage_SetSubTitle(QWizardPage* self, struct miqt_string* subTitle); -struct miqt_string* QWizardPage_SubTitle(const QWizardPage* self); +struct miqt_string QWizardPage_Tr(const char* s); +struct miqt_string QWizardPage_TrUtf8(const char* s); +void QWizardPage_SetTitle(QWizardPage* self, struct miqt_string title); +struct miqt_string QWizardPage_Title(const QWizardPage* self); +void QWizardPage_SetSubTitle(QWizardPage* self, struct miqt_string subTitle); +struct miqt_string QWizardPage_SubTitle(const QWizardPage* self); void QWizardPage_SetPixmap(QWizardPage* self, int which, QPixmap* pixmap); QPixmap* QWizardPage_Pixmap(const QWizardPage* self, int which); void QWizardPage_SetFinalPage(QWizardPage* self, bool finalPage); bool QWizardPage_IsFinalPage(const QWizardPage* self); void QWizardPage_SetCommitPage(QWizardPage* self, bool commitPage); bool QWizardPage_IsCommitPage(const QWizardPage* self); -void QWizardPage_SetButtonText(QWizardPage* self, int which, struct miqt_string* text); -struct miqt_string* QWizardPage_ButtonText(const QWizardPage* self, int which); +void QWizardPage_SetButtonText(QWizardPage* self, int which, struct miqt_string text); +struct miqt_string QWizardPage_ButtonText(const QWizardPage* self, int which); void QWizardPage_InitializePage(QWizardPage* self); void QWizardPage_CleanupPage(QWizardPage* self); bool QWizardPage_ValidatePage(QWizardPage* self); @@ -123,10 +123,10 @@ bool QWizardPage_IsComplete(const QWizardPage* self); int QWizardPage_NextId(const QWizardPage* self); void QWizardPage_CompleteChanged(QWizardPage* self); void QWizardPage_connect_CompleteChanged(QWizardPage* self, intptr_t slot); -struct miqt_string* QWizardPage_Tr2(const char* s, const char* c); -struct miqt_string* QWizardPage_Tr3(const char* s, const char* c, int n); -struct miqt_string* QWizardPage_TrUtf82(const char* s, const char* c); -struct miqt_string* QWizardPage_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QWizardPage_Tr2(const char* s, const char* c); +struct miqt_string QWizardPage_Tr3(const char* s, const char* c, int n); +struct miqt_string QWizardPage_TrUtf82(const char* s, const char* c); +struct miqt_string QWizardPage_TrUtf83(const char* s, const char* c, int n); void QWizardPage_Delete(QWizardPage* self); #ifdef __cplusplus diff --git a/qt/gen_qxmlstream.cpp b/qt/gen_qxmlstream.cpp index 13f0e083..44d37df9 100644 --- a/qt/gen_qxmlstream.cpp +++ b/qt/gen_qxmlstream.cpp @@ -21,8 +21,8 @@ QXmlStreamStringRef* QXmlStreamStringRef_new() { return new QXmlStreamStringRef(); } -QXmlStreamStringRef* QXmlStreamStringRef_new2(struct miqt_string* aString) { - QString aString_QString = QString::fromUtf8(&aString->data, aString->len); +QXmlStreamStringRef* QXmlStreamStringRef_new2(struct miqt_string aString) { + QString aString_QString = QString::fromUtf8(aString.data, aString.len); return new QXmlStreamStringRef(aString_QString); } @@ -42,11 +42,15 @@ void QXmlStreamStringRef_Clear(QXmlStreamStringRef* self) { self->clear(); } -struct miqt_string* QXmlStreamStringRef_String(const QXmlStreamStringRef* self) { +struct miqt_string QXmlStreamStringRef_String(const QXmlStreamStringRef* self) { const QString* _ret = self->string(); // Convert QString pointer from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret->toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QXmlStreamStringRef_Position(const QXmlStreamStringRef* self) { @@ -65,16 +69,16 @@ QXmlStreamAttribute* QXmlStreamAttribute_new() { return new QXmlStreamAttribute(); } -QXmlStreamAttribute* QXmlStreamAttribute_new2(struct miqt_string* qualifiedName, struct miqt_string* value) { - QString qualifiedName_QString = QString::fromUtf8(&qualifiedName->data, qualifiedName->len); - QString value_QString = QString::fromUtf8(&value->data, value->len); +QXmlStreamAttribute* QXmlStreamAttribute_new2(struct miqt_string qualifiedName, struct miqt_string value) { + QString qualifiedName_QString = QString::fromUtf8(qualifiedName.data, qualifiedName.len); + QString value_QString = QString::fromUtf8(value.data, value.len); return new QXmlStreamAttribute(qualifiedName_QString, value_QString); } -QXmlStreamAttribute* QXmlStreamAttribute_new3(struct miqt_string* namespaceUri, struct miqt_string* name, struct miqt_string* value) { - QString namespaceUri_QString = QString::fromUtf8(&namespaceUri->data, namespaceUri->len); - QString name_QString = QString::fromUtf8(&name->data, name->len); - QString value_QString = QString::fromUtf8(&value->data, value->len); +QXmlStreamAttribute* QXmlStreamAttribute_new3(struct miqt_string namespaceUri, struct miqt_string name, struct miqt_string value) { + QString namespaceUri_QString = QString::fromUtf8(namespaceUri.data, namespaceUri.len); + QString name_QString = QString::fromUtf8(name.data, name.len); + QString value_QString = QString::fromUtf8(value.data, value.len); return new QXmlStreamAttribute(namespaceUri_QString, name_QString, value_QString); } @@ -106,9 +110,9 @@ QXmlStreamNamespaceDeclaration* QXmlStreamNamespaceDeclaration_new() { return new QXmlStreamNamespaceDeclaration(); } -QXmlStreamNamespaceDeclaration* QXmlStreamNamespaceDeclaration_new2(struct miqt_string* prefix, struct miqt_string* namespaceUri) { - QString prefix_QString = QString::fromUtf8(&prefix->data, prefix->len); - QString namespaceUri_QString = QString::fromUtf8(&namespaceUri->data, namespaceUri->len); +QXmlStreamNamespaceDeclaration* QXmlStreamNamespaceDeclaration_new2(struct miqt_string prefix, struct miqt_string namespaceUri) { + QString prefix_QString = QString::fromUtf8(prefix.data, prefix.len); + QString namespaceUri_QString = QString::fromUtf8(namespaceUri.data, namespaceUri.len); return new QXmlStreamNamespaceDeclaration(prefix_QString, namespaceUri_QString); } @@ -180,21 +184,29 @@ void QXmlStreamEntityDeclaration_Delete(QXmlStreamEntityDeclaration* self) { delete self; } -struct miqt_string* QXmlStreamEntityResolver_ResolveEntity(QXmlStreamEntityResolver* self, struct miqt_string* publicId, struct miqt_string* systemId) { - QString publicId_QString = QString::fromUtf8(&publicId->data, publicId->len); - QString systemId_QString = QString::fromUtf8(&systemId->data, systemId->len); +struct miqt_string QXmlStreamEntityResolver_ResolveEntity(QXmlStreamEntityResolver* self, struct miqt_string publicId, struct miqt_string systemId) { + QString publicId_QString = QString::fromUtf8(publicId.data, publicId.len); + QString systemId_QString = QString::fromUtf8(systemId.data, systemId.len); QString _ret = self->resolveEntity(publicId_QString, systemId_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QXmlStreamEntityResolver_ResolveUndeclaredEntity(QXmlStreamEntityResolver* self, struct miqt_string* name) { - QString name_QString = QString::fromUtf8(&name->data, name->len); +struct miqt_string QXmlStreamEntityResolver_ResolveUndeclaredEntity(QXmlStreamEntityResolver* self, struct miqt_string name) { + QString name_QString = QString::fromUtf8(name.data, name.len); QString _ret = self->resolveUndeclaredEntity(name_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QXmlStreamEntityResolver_OperatorAssign(QXmlStreamEntityResolver* self, QXmlStreamEntityResolver* param1) { @@ -213,12 +225,13 @@ QXmlStreamReader* QXmlStreamReader_new2(QIODevice* device) { return new QXmlStreamReader(device); } -QXmlStreamReader* QXmlStreamReader_new3(QByteArray* data) { - return new QXmlStreamReader(*data); +QXmlStreamReader* QXmlStreamReader_new3(struct miqt_string data) { + QByteArray data_QByteArray(data.data, data.len); + return new QXmlStreamReader(data_QByteArray); } -QXmlStreamReader* QXmlStreamReader_new4(struct miqt_string* data) { - QString data_QString = QString::fromUtf8(&data->data, data->len); +QXmlStreamReader* QXmlStreamReader_new4(struct miqt_string data) { + QString data_QString = QString::fromUtf8(data.data, data.len); return new QXmlStreamReader(data_QString); } @@ -234,12 +247,13 @@ QIODevice* QXmlStreamReader_Device(const QXmlStreamReader* self) { return self->device(); } -void QXmlStreamReader_AddData(QXmlStreamReader* self, QByteArray* data) { - self->addData(*data); +void QXmlStreamReader_AddData(QXmlStreamReader* self, struct miqt_string data) { + QByteArray data_QByteArray(data.data, data.len); + self->addData(data_QByteArray); } -void QXmlStreamReader_AddDataWithData(QXmlStreamReader* self, struct miqt_string* data) { - QString data_QString = QString::fromUtf8(&data->data, data->len); +void QXmlStreamReader_AddDataWithData(QXmlStreamReader* self, struct miqt_string data) { + QString data_QString = QString::fromUtf8(data.data, data.len); self->addData(data_QString); } @@ -273,11 +287,15 @@ int QXmlStreamReader_TokenType(const QXmlStreamReader* self) { return static_cast(_ret); } -struct miqt_string* QXmlStreamReader_TokenString(const QXmlStreamReader* self) { +struct miqt_string QXmlStreamReader_TokenString(const QXmlStreamReader* self) { QString _ret = self->tokenString(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QXmlStreamReader_SetNamespaceProcessing(QXmlStreamReader* self, bool namespaceProcessing) { @@ -351,11 +369,15 @@ long long QXmlStreamReader_CharacterOffset(const QXmlStreamReader* self) { return static_cast(_ret); } -struct miqt_string* QXmlStreamReader_ReadElementText(QXmlStreamReader* self) { +struct miqt_string QXmlStreamReader_ReadElementText(QXmlStreamReader* self) { QString _ret = self->readElementText(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } struct miqt_array* QXmlStreamReader_NamespaceDeclarations(const QXmlStreamReader* self) { @@ -423,11 +445,15 @@ void QXmlStreamReader_RaiseError(QXmlStreamReader* self) { self->raiseError(); } -struct miqt_string* QXmlStreamReader_ErrorString(const QXmlStreamReader* self) { +struct miqt_string QXmlStreamReader_ErrorString(const QXmlStreamReader* self) { QString _ret = self->errorString(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QXmlStreamReader_Error(const QXmlStreamReader* self) { @@ -447,15 +473,19 @@ QXmlStreamEntityResolver* QXmlStreamReader_EntityResolver(const QXmlStreamReader return self->entityResolver(); } -struct miqt_string* QXmlStreamReader_ReadElementText1(QXmlStreamReader* self, int behaviour) { +struct miqt_string QXmlStreamReader_ReadElementText1(QXmlStreamReader* self, int behaviour) { QString _ret = self->readElementText(static_cast(behaviour)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QXmlStreamReader_RaiseError1(QXmlStreamReader* self, struct miqt_string* message) { - QString message_QString = QString::fromUtf8(&message->data, message->len); +void QXmlStreamReader_RaiseError1(QXmlStreamReader* self, struct miqt_string message) { + QString message_QString = QString::fromUtf8(message.data, message.len); self->raiseError(message_QString); } @@ -471,10 +501,6 @@ QXmlStreamWriter* QXmlStreamWriter_new2(QIODevice* device) { return new QXmlStreamWriter(device); } -QXmlStreamWriter* QXmlStreamWriter_new3(QByteArray* array) { - return new QXmlStreamWriter(array); -} - void QXmlStreamWriter_SetDevice(QXmlStreamWriter* self, QIODevice* device) { self->setDevice(device); } @@ -511,16 +537,16 @@ int QXmlStreamWriter_AutoFormattingIndent(const QXmlStreamWriter* self) { return self->autoFormattingIndent(); } -void QXmlStreamWriter_WriteAttribute(QXmlStreamWriter* self, struct miqt_string* qualifiedName, struct miqt_string* value) { - QString qualifiedName_QString = QString::fromUtf8(&qualifiedName->data, qualifiedName->len); - QString value_QString = QString::fromUtf8(&value->data, value->len); +void QXmlStreamWriter_WriteAttribute(QXmlStreamWriter* self, struct miqt_string qualifiedName, struct miqt_string value) { + QString qualifiedName_QString = QString::fromUtf8(qualifiedName.data, qualifiedName.len); + QString value_QString = QString::fromUtf8(value.data, value.len); self->writeAttribute(qualifiedName_QString, value_QString); } -void QXmlStreamWriter_WriteAttribute2(QXmlStreamWriter* self, struct miqt_string* namespaceUri, struct miqt_string* name, struct miqt_string* value) { - QString namespaceUri_QString = QString::fromUtf8(&namespaceUri->data, namespaceUri->len); - QString name_QString = QString::fromUtf8(&name->data, name->len); - QString value_QString = QString::fromUtf8(&value->data, value->len); +void QXmlStreamWriter_WriteAttribute2(QXmlStreamWriter* self, struct miqt_string namespaceUri, struct miqt_string name, struct miqt_string value) { + QString namespaceUri_QString = QString::fromUtf8(namespaceUri.data, namespaceUri.len); + QString name_QString = QString::fromUtf8(name.data, name.len); + QString value_QString = QString::fromUtf8(value.data, value.len); self->writeAttribute(namespaceUri_QString, name_QString, value_QString); } @@ -528,47 +554,47 @@ void QXmlStreamWriter_WriteAttributeWithAttribute(QXmlStreamWriter* self, QXmlSt self->writeAttribute(*attribute); } -void QXmlStreamWriter_WriteCDATA(QXmlStreamWriter* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QXmlStreamWriter_WriteCDATA(QXmlStreamWriter* self, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->writeCDATA(text_QString); } -void QXmlStreamWriter_WriteCharacters(QXmlStreamWriter* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QXmlStreamWriter_WriteCharacters(QXmlStreamWriter* self, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->writeCharacters(text_QString); } -void QXmlStreamWriter_WriteComment(QXmlStreamWriter* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QXmlStreamWriter_WriteComment(QXmlStreamWriter* self, struct miqt_string text) { + QString text_QString = QString::fromUtf8(text.data, text.len); self->writeComment(text_QString); } -void QXmlStreamWriter_WriteDTD(QXmlStreamWriter* self, struct miqt_string* dtd) { - QString dtd_QString = QString::fromUtf8(&dtd->data, dtd->len); +void QXmlStreamWriter_WriteDTD(QXmlStreamWriter* self, struct miqt_string dtd) { + QString dtd_QString = QString::fromUtf8(dtd.data, dtd.len); self->writeDTD(dtd_QString); } -void QXmlStreamWriter_WriteEmptyElement(QXmlStreamWriter* self, struct miqt_string* qualifiedName) { - QString qualifiedName_QString = QString::fromUtf8(&qualifiedName->data, qualifiedName->len); +void QXmlStreamWriter_WriteEmptyElement(QXmlStreamWriter* self, struct miqt_string qualifiedName) { + QString qualifiedName_QString = QString::fromUtf8(qualifiedName.data, qualifiedName.len); self->writeEmptyElement(qualifiedName_QString); } -void QXmlStreamWriter_WriteEmptyElement2(QXmlStreamWriter* self, struct miqt_string* namespaceUri, struct miqt_string* name) { - QString namespaceUri_QString = QString::fromUtf8(&namespaceUri->data, namespaceUri->len); - QString name_QString = QString::fromUtf8(&name->data, name->len); +void QXmlStreamWriter_WriteEmptyElement2(QXmlStreamWriter* self, struct miqt_string namespaceUri, struct miqt_string name) { + QString namespaceUri_QString = QString::fromUtf8(namespaceUri.data, namespaceUri.len); + QString name_QString = QString::fromUtf8(name.data, name.len); self->writeEmptyElement(namespaceUri_QString, name_QString); } -void QXmlStreamWriter_WriteTextElement(QXmlStreamWriter* self, struct miqt_string* qualifiedName, struct miqt_string* text) { - QString qualifiedName_QString = QString::fromUtf8(&qualifiedName->data, qualifiedName->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QXmlStreamWriter_WriteTextElement(QXmlStreamWriter* self, struct miqt_string qualifiedName, struct miqt_string text) { + QString qualifiedName_QString = QString::fromUtf8(qualifiedName.data, qualifiedName.len); + QString text_QString = QString::fromUtf8(text.data, text.len); self->writeTextElement(qualifiedName_QString, text_QString); } -void QXmlStreamWriter_WriteTextElement2(QXmlStreamWriter* self, struct miqt_string* namespaceUri, struct miqt_string* name, struct miqt_string* text) { - QString namespaceUri_QString = QString::fromUtf8(&namespaceUri->data, namespaceUri->len); - QString name_QString = QString::fromUtf8(&name->data, name->len); - QString text_QString = QString::fromUtf8(&text->data, text->len); +void QXmlStreamWriter_WriteTextElement2(QXmlStreamWriter* self, struct miqt_string namespaceUri, struct miqt_string name, struct miqt_string text) { + QString namespaceUri_QString = QString::fromUtf8(namespaceUri.data, namespaceUri.len); + QString name_QString = QString::fromUtf8(name.data, name.len); + QString text_QString = QString::fromUtf8(text.data, text.len); self->writeTextElement(namespaceUri_QString, name_QString, text_QString); } @@ -580,23 +606,23 @@ void QXmlStreamWriter_WriteEndElement(QXmlStreamWriter* self) { self->writeEndElement(); } -void QXmlStreamWriter_WriteEntityReference(QXmlStreamWriter* self, struct miqt_string* name) { - QString name_QString = QString::fromUtf8(&name->data, name->len); +void QXmlStreamWriter_WriteEntityReference(QXmlStreamWriter* self, struct miqt_string name) { + QString name_QString = QString::fromUtf8(name.data, name.len); self->writeEntityReference(name_QString); } -void QXmlStreamWriter_WriteNamespace(QXmlStreamWriter* self, struct miqt_string* namespaceUri) { - QString namespaceUri_QString = QString::fromUtf8(&namespaceUri->data, namespaceUri->len); +void QXmlStreamWriter_WriteNamespace(QXmlStreamWriter* self, struct miqt_string namespaceUri) { + QString namespaceUri_QString = QString::fromUtf8(namespaceUri.data, namespaceUri.len); self->writeNamespace(namespaceUri_QString); } -void QXmlStreamWriter_WriteDefaultNamespace(QXmlStreamWriter* self, struct miqt_string* namespaceUri) { - QString namespaceUri_QString = QString::fromUtf8(&namespaceUri->data, namespaceUri->len); +void QXmlStreamWriter_WriteDefaultNamespace(QXmlStreamWriter* self, struct miqt_string namespaceUri) { + QString namespaceUri_QString = QString::fromUtf8(namespaceUri.data, namespaceUri.len); self->writeDefaultNamespace(namespaceUri_QString); } -void QXmlStreamWriter_WriteProcessingInstruction(QXmlStreamWriter* self, struct miqt_string* target) { - QString target_QString = QString::fromUtf8(&target->data, target->len); +void QXmlStreamWriter_WriteProcessingInstruction(QXmlStreamWriter* self, struct miqt_string target) { + QString target_QString = QString::fromUtf8(target.data, target.len); self->writeProcessingInstruction(target_QString); } @@ -604,24 +630,24 @@ void QXmlStreamWriter_WriteStartDocument(QXmlStreamWriter* self) { self->writeStartDocument(); } -void QXmlStreamWriter_WriteStartDocumentWithVersion(QXmlStreamWriter* self, struct miqt_string* version) { - QString version_QString = QString::fromUtf8(&version->data, version->len); +void QXmlStreamWriter_WriteStartDocumentWithVersion(QXmlStreamWriter* self, struct miqt_string version) { + QString version_QString = QString::fromUtf8(version.data, version.len); self->writeStartDocument(version_QString); } -void QXmlStreamWriter_WriteStartDocument2(QXmlStreamWriter* self, struct miqt_string* version, bool standalone) { - QString version_QString = QString::fromUtf8(&version->data, version->len); +void QXmlStreamWriter_WriteStartDocument2(QXmlStreamWriter* self, struct miqt_string version, bool standalone) { + QString version_QString = QString::fromUtf8(version.data, version.len); self->writeStartDocument(version_QString, standalone); } -void QXmlStreamWriter_WriteStartElement(QXmlStreamWriter* self, struct miqt_string* qualifiedName) { - QString qualifiedName_QString = QString::fromUtf8(&qualifiedName->data, qualifiedName->len); +void QXmlStreamWriter_WriteStartElement(QXmlStreamWriter* self, struct miqt_string qualifiedName) { + QString qualifiedName_QString = QString::fromUtf8(qualifiedName.data, qualifiedName.len); self->writeStartElement(qualifiedName_QString); } -void QXmlStreamWriter_WriteStartElement2(QXmlStreamWriter* self, struct miqt_string* namespaceUri, struct miqt_string* name) { - QString namespaceUri_QString = QString::fromUtf8(&namespaceUri->data, namespaceUri->len); - QString name_QString = QString::fromUtf8(&name->data, name->len); +void QXmlStreamWriter_WriteStartElement2(QXmlStreamWriter* self, struct miqt_string namespaceUri, struct miqt_string name) { + QString namespaceUri_QString = QString::fromUtf8(namespaceUri.data, namespaceUri.len); + QString name_QString = QString::fromUtf8(name.data, name.len); self->writeStartElement(namespaceUri_QString, name_QString); } @@ -633,15 +659,15 @@ bool QXmlStreamWriter_HasError(const QXmlStreamWriter* self) { return self->hasError(); } -void QXmlStreamWriter_WriteNamespace2(QXmlStreamWriter* self, struct miqt_string* namespaceUri, struct miqt_string* prefix) { - QString namespaceUri_QString = QString::fromUtf8(&namespaceUri->data, namespaceUri->len); - QString prefix_QString = QString::fromUtf8(&prefix->data, prefix->len); +void QXmlStreamWriter_WriteNamespace2(QXmlStreamWriter* self, struct miqt_string namespaceUri, struct miqt_string prefix) { + QString namespaceUri_QString = QString::fromUtf8(namespaceUri.data, namespaceUri.len); + QString prefix_QString = QString::fromUtf8(prefix.data, prefix.len); self->writeNamespace(namespaceUri_QString, prefix_QString); } -void QXmlStreamWriter_WriteProcessingInstruction2(QXmlStreamWriter* self, struct miqt_string* target, struct miqt_string* data) { - QString target_QString = QString::fromUtf8(&target->data, target->len); - QString data_QString = QString::fromUtf8(&data->data, data->len); +void QXmlStreamWriter_WriteProcessingInstruction2(QXmlStreamWriter* self, struct miqt_string target, struct miqt_string data) { + QString target_QString = QString::fromUtf8(target.data, target.len); + QString data_QString = QString::fromUtf8(data.data, data.len); self->writeProcessingInstruction(target_QString, data_QString); } diff --git a/qt/gen_qxmlstream.go b/qt/gen_qxmlstream.go index f0efba57..0661050c 100644 --- a/qt/gen_qxmlstream.go +++ b/qt/gen_qxmlstream.go @@ -9,7 +9,6 @@ package qt import "C" import ( - "github.com/mappu/miqt/libmiqt" "runtime" "unsafe" ) @@ -85,9 +84,11 @@ func NewQXmlStreamStringRef() *QXmlStreamStringRef { // NewQXmlStreamStringRef2 constructs a new QXmlStreamStringRef object. func NewQXmlStreamStringRef2(aString string) *QXmlStreamStringRef { - aString_ms := libmiqt.Strdupg(aString) - defer C.free(aString_ms) - ret := C.QXmlStreamStringRef_new2((*C.struct_miqt_string)(aString_ms)) + aString_ms := C.struct_miqt_string{} + aString_ms.data = C.CString(aString) + aString_ms.len = C.size_t(len(aString)) + defer C.free(unsafe.Pointer(aString_ms.data)) + ret := C.QXmlStreamStringRef_new2(aString_ms) return newQXmlStreamStringRef(ret) } @@ -110,9 +111,9 @@ func (this *QXmlStreamStringRef) Clear() { } func (this *QXmlStreamStringRef) String() string { - var _ms *C.struct_miqt_string = C.QXmlStreamStringRef_String(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QXmlStreamStringRef_String(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -175,23 +176,33 @@ func NewQXmlStreamAttribute() *QXmlStreamAttribute { // NewQXmlStreamAttribute2 constructs a new QXmlStreamAttribute object. func NewQXmlStreamAttribute2(qualifiedName string, value string) *QXmlStreamAttribute { - qualifiedName_ms := libmiqt.Strdupg(qualifiedName) - defer C.free(qualifiedName_ms) - value_ms := libmiqt.Strdupg(value) - defer C.free(value_ms) - ret := C.QXmlStreamAttribute_new2((*C.struct_miqt_string)(qualifiedName_ms), (*C.struct_miqt_string)(value_ms)) + qualifiedName_ms := C.struct_miqt_string{} + qualifiedName_ms.data = C.CString(qualifiedName) + qualifiedName_ms.len = C.size_t(len(qualifiedName)) + defer C.free(unsafe.Pointer(qualifiedName_ms.data)) + value_ms := C.struct_miqt_string{} + value_ms.data = C.CString(value) + value_ms.len = C.size_t(len(value)) + defer C.free(unsafe.Pointer(value_ms.data)) + ret := C.QXmlStreamAttribute_new2(qualifiedName_ms, value_ms) return newQXmlStreamAttribute(ret) } // NewQXmlStreamAttribute3 constructs a new QXmlStreamAttribute object. func NewQXmlStreamAttribute3(namespaceUri string, name string, value string) *QXmlStreamAttribute { - namespaceUri_ms := libmiqt.Strdupg(namespaceUri) - defer C.free(namespaceUri_ms) - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - value_ms := libmiqt.Strdupg(value) - defer C.free(value_ms) - ret := C.QXmlStreamAttribute_new3((*C.struct_miqt_string)(namespaceUri_ms), (*C.struct_miqt_string)(name_ms), (*C.struct_miqt_string)(value_ms)) + namespaceUri_ms := C.struct_miqt_string{} + namespaceUri_ms.data = C.CString(namespaceUri) + namespaceUri_ms.len = C.size_t(len(namespaceUri)) + defer C.free(unsafe.Pointer(namespaceUri_ms.data)) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + value_ms := C.struct_miqt_string{} + value_ms.data = C.CString(value) + value_ms.len = C.size_t(len(value)) + defer C.free(unsafe.Pointer(value_ms.data)) + ret := C.QXmlStreamAttribute_new3(namespaceUri_ms, name_ms, value_ms) return newQXmlStreamAttribute(ret) } @@ -268,11 +279,15 @@ func NewQXmlStreamNamespaceDeclaration() *QXmlStreamNamespaceDeclaration { // NewQXmlStreamNamespaceDeclaration2 constructs a new QXmlStreamNamespaceDeclaration object. func NewQXmlStreamNamespaceDeclaration2(prefix string, namespaceUri string) *QXmlStreamNamespaceDeclaration { - prefix_ms := libmiqt.Strdupg(prefix) - defer C.free(prefix_ms) - namespaceUri_ms := libmiqt.Strdupg(namespaceUri) - defer C.free(namespaceUri_ms) - ret := C.QXmlStreamNamespaceDeclaration_new2((*C.struct_miqt_string)(prefix_ms), (*C.struct_miqt_string)(namespaceUri_ms)) + prefix_ms := C.struct_miqt_string{} + prefix_ms.data = C.CString(prefix) + prefix_ms.len = C.size_t(len(prefix)) + defer C.free(unsafe.Pointer(prefix_ms.data)) + namespaceUri_ms := C.struct_miqt_string{} + namespaceUri_ms.data = C.CString(namespaceUri) + namespaceUri_ms.len = C.size_t(len(namespaceUri)) + defer C.free(unsafe.Pointer(namespaceUri_ms.data)) + ret := C.QXmlStreamNamespaceDeclaration_new2(prefix_ms, namespaceUri_ms) return newQXmlStreamNamespaceDeclaration(ret) } @@ -472,22 +487,28 @@ func UnsafeNewQXmlStreamEntityResolver(h unsafe.Pointer) *QXmlStreamEntityResolv } func (this *QXmlStreamEntityResolver) ResolveEntity(publicId string, systemId string) string { - publicId_ms := libmiqt.Strdupg(publicId) - defer C.free(publicId_ms) - systemId_ms := libmiqt.Strdupg(systemId) - defer C.free(systemId_ms) - var _ms *C.struct_miqt_string = C.QXmlStreamEntityResolver_ResolveEntity(this.h, (*C.struct_miqt_string)(publicId_ms), (*C.struct_miqt_string)(systemId_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + publicId_ms := C.struct_miqt_string{} + publicId_ms.data = C.CString(publicId) + publicId_ms.len = C.size_t(len(publicId)) + defer C.free(unsafe.Pointer(publicId_ms.data)) + systemId_ms := C.struct_miqt_string{} + systemId_ms.data = C.CString(systemId) + systemId_ms.len = C.size_t(len(systemId)) + defer C.free(unsafe.Pointer(systemId_ms.data)) + var _ms C.struct_miqt_string = C.QXmlStreamEntityResolver_ResolveEntity(this.h, publicId_ms, systemId_ms) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QXmlStreamEntityResolver) ResolveUndeclaredEntity(name string) string { - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - var _ms *C.struct_miqt_string = C.QXmlStreamEntityResolver_ResolveUndeclaredEntity(this.h, (*C.struct_miqt_string)(name_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + var _ms C.struct_miqt_string = C.QXmlStreamEntityResolver_ResolveUndeclaredEntity(this.h, name_ms) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -551,16 +572,21 @@ func NewQXmlStreamReader2(device *QIODevice) *QXmlStreamReader { } // NewQXmlStreamReader3 constructs a new QXmlStreamReader object. -func NewQXmlStreamReader3(data *QByteArray) *QXmlStreamReader { - ret := C.QXmlStreamReader_new3(data.cPointer()) +func NewQXmlStreamReader3(data []byte) *QXmlStreamReader { + data_alias := C.struct_miqt_string{} + data_alias.data = (*C.char)(unsafe.Pointer(&data[0])) + data_alias.len = C.size_t(len(data)) + ret := C.QXmlStreamReader_new3(data_alias) return newQXmlStreamReader(ret) } // NewQXmlStreamReader4 constructs a new QXmlStreamReader object. func NewQXmlStreamReader4(data string) *QXmlStreamReader { - data_ms := libmiqt.Strdupg(data) - defer C.free(data_ms) - ret := C.QXmlStreamReader_new4((*C.struct_miqt_string)(data_ms)) + data_ms := C.struct_miqt_string{} + data_ms.data = C.CString(data) + data_ms.len = C.size_t(len(data)) + defer C.free(unsafe.Pointer(data_ms.data)) + ret := C.QXmlStreamReader_new4(data_ms) return newQXmlStreamReader(ret) } @@ -580,14 +606,19 @@ func (this *QXmlStreamReader) Device() *QIODevice { return UnsafeNewQIODevice(unsafe.Pointer(C.QXmlStreamReader_Device(this.h))) } -func (this *QXmlStreamReader) AddData(data *QByteArray) { - C.QXmlStreamReader_AddData(this.h, data.cPointer()) +func (this *QXmlStreamReader) AddData(data []byte) { + data_alias := C.struct_miqt_string{} + data_alias.data = (*C.char)(unsafe.Pointer(&data[0])) + data_alias.len = C.size_t(len(data)) + C.QXmlStreamReader_AddData(this.h, data_alias) } func (this *QXmlStreamReader) AddDataWithData(data string) { - data_ms := libmiqt.Strdupg(data) - defer C.free(data_ms) - C.QXmlStreamReader_AddDataWithData(this.h, (*C.struct_miqt_string)(data_ms)) + data_ms := C.struct_miqt_string{} + data_ms.data = C.CString(data) + data_ms.len = C.size_t(len(data)) + defer C.free(unsafe.Pointer(data_ms.data)) + C.QXmlStreamReader_AddDataWithData(this.h, data_ms) } func (this *QXmlStreamReader) AddData2(data string) { @@ -621,9 +652,9 @@ func (this *QXmlStreamReader) TokenType() QXmlStreamReader__TokenType { } func (this *QXmlStreamReader) TokenString() string { - var _ms *C.struct_miqt_string = C.QXmlStreamReader_TokenString(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QXmlStreamReader_TokenString(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -696,9 +727,9 @@ func (this *QXmlStreamReader) CharacterOffset() int64 { } func (this *QXmlStreamReader) ReadElementText() string { - var _ms *C.struct_miqt_string = C.QXmlStreamReader_ReadElementText(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QXmlStreamReader_ReadElementText(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -773,9 +804,9 @@ func (this *QXmlStreamReader) RaiseError() { } func (this *QXmlStreamReader) ErrorString() string { - var _ms *C.struct_miqt_string = C.QXmlStreamReader_ErrorString(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QXmlStreamReader_ErrorString(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -796,16 +827,18 @@ func (this *QXmlStreamReader) EntityResolver() *QXmlStreamEntityResolver { } func (this *QXmlStreamReader) ReadElementText1(behaviour QXmlStreamReader__ReadElementTextBehaviour) string { - var _ms *C.struct_miqt_string = C.QXmlStreamReader_ReadElementText1(this.h, (C.int)(behaviour)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QXmlStreamReader_ReadElementText1(this.h, (C.int)(behaviour)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QXmlStreamReader) RaiseError1(message string) { - message_ms := libmiqt.Strdupg(message) - defer C.free(message_ms) - C.QXmlStreamReader_RaiseError1(this.h, (*C.struct_miqt_string)(message_ms)) + message_ms := C.struct_miqt_string{} + message_ms.data = C.CString(message) + message_ms.len = C.size_t(len(message)) + defer C.free(unsafe.Pointer(message_ms.data)) + C.QXmlStreamReader_RaiseError1(this.h, message_ms) } // Delete this object from C++ memory. @@ -863,12 +896,6 @@ func NewQXmlStreamWriter2(device *QIODevice) *QXmlStreamWriter { return newQXmlStreamWriter(ret) } -// NewQXmlStreamWriter3 constructs a new QXmlStreamWriter object. -func NewQXmlStreamWriter3(array *QByteArray) *QXmlStreamWriter { - ret := C.QXmlStreamWriter_new3(array.cPointer()) - return newQXmlStreamWriter(ret) -} - func (this *QXmlStreamWriter) SetDevice(device *QIODevice) { C.QXmlStreamWriter_SetDevice(this.h, device.cPointer()) } @@ -908,21 +935,31 @@ func (this *QXmlStreamWriter) AutoFormattingIndent() int { } func (this *QXmlStreamWriter) WriteAttribute(qualifiedName string, value string) { - qualifiedName_ms := libmiqt.Strdupg(qualifiedName) - defer C.free(qualifiedName_ms) - value_ms := libmiqt.Strdupg(value) - defer C.free(value_ms) - C.QXmlStreamWriter_WriteAttribute(this.h, (*C.struct_miqt_string)(qualifiedName_ms), (*C.struct_miqt_string)(value_ms)) + qualifiedName_ms := C.struct_miqt_string{} + qualifiedName_ms.data = C.CString(qualifiedName) + qualifiedName_ms.len = C.size_t(len(qualifiedName)) + defer C.free(unsafe.Pointer(qualifiedName_ms.data)) + value_ms := C.struct_miqt_string{} + value_ms.data = C.CString(value) + value_ms.len = C.size_t(len(value)) + defer C.free(unsafe.Pointer(value_ms.data)) + C.QXmlStreamWriter_WriteAttribute(this.h, qualifiedName_ms, value_ms) } func (this *QXmlStreamWriter) WriteAttribute2(namespaceUri string, name string, value string) { - namespaceUri_ms := libmiqt.Strdupg(namespaceUri) - defer C.free(namespaceUri_ms) - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - value_ms := libmiqt.Strdupg(value) - defer C.free(value_ms) - C.QXmlStreamWriter_WriteAttribute2(this.h, (*C.struct_miqt_string)(namespaceUri_ms), (*C.struct_miqt_string)(name_ms), (*C.struct_miqt_string)(value_ms)) + namespaceUri_ms := C.struct_miqt_string{} + namespaceUri_ms.data = C.CString(namespaceUri) + namespaceUri_ms.len = C.size_t(len(namespaceUri)) + defer C.free(unsafe.Pointer(namespaceUri_ms.data)) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + value_ms := C.struct_miqt_string{} + value_ms.data = C.CString(value) + value_ms.len = C.size_t(len(value)) + defer C.free(unsafe.Pointer(value_ms.data)) + C.QXmlStreamWriter_WriteAttribute2(this.h, namespaceUri_ms, name_ms, value_ms) } func (this *QXmlStreamWriter) WriteAttributeWithAttribute(attribute *QXmlStreamAttribute) { @@ -930,59 +967,83 @@ func (this *QXmlStreamWriter) WriteAttributeWithAttribute(attribute *QXmlStreamA } func (this *QXmlStreamWriter) WriteCDATA(text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QXmlStreamWriter_WriteCDATA(this.h, (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QXmlStreamWriter_WriteCDATA(this.h, text_ms) } func (this *QXmlStreamWriter) WriteCharacters(text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QXmlStreamWriter_WriteCharacters(this.h, (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QXmlStreamWriter_WriteCharacters(this.h, text_ms) } func (this *QXmlStreamWriter) WriteComment(text string) { - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QXmlStreamWriter_WriteComment(this.h, (*C.struct_miqt_string)(text_ms)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QXmlStreamWriter_WriteComment(this.h, text_ms) } func (this *QXmlStreamWriter) WriteDTD(dtd string) { - dtd_ms := libmiqt.Strdupg(dtd) - defer C.free(dtd_ms) - C.QXmlStreamWriter_WriteDTD(this.h, (*C.struct_miqt_string)(dtd_ms)) + dtd_ms := C.struct_miqt_string{} + dtd_ms.data = C.CString(dtd) + dtd_ms.len = C.size_t(len(dtd)) + defer C.free(unsafe.Pointer(dtd_ms.data)) + C.QXmlStreamWriter_WriteDTD(this.h, dtd_ms) } func (this *QXmlStreamWriter) WriteEmptyElement(qualifiedName string) { - qualifiedName_ms := libmiqt.Strdupg(qualifiedName) - defer C.free(qualifiedName_ms) - C.QXmlStreamWriter_WriteEmptyElement(this.h, (*C.struct_miqt_string)(qualifiedName_ms)) + qualifiedName_ms := C.struct_miqt_string{} + qualifiedName_ms.data = C.CString(qualifiedName) + qualifiedName_ms.len = C.size_t(len(qualifiedName)) + defer C.free(unsafe.Pointer(qualifiedName_ms.data)) + C.QXmlStreamWriter_WriteEmptyElement(this.h, qualifiedName_ms) } func (this *QXmlStreamWriter) WriteEmptyElement2(namespaceUri string, name string) { - namespaceUri_ms := libmiqt.Strdupg(namespaceUri) - defer C.free(namespaceUri_ms) - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - C.QXmlStreamWriter_WriteEmptyElement2(this.h, (*C.struct_miqt_string)(namespaceUri_ms), (*C.struct_miqt_string)(name_ms)) + namespaceUri_ms := C.struct_miqt_string{} + namespaceUri_ms.data = C.CString(namespaceUri) + namespaceUri_ms.len = C.size_t(len(namespaceUri)) + defer C.free(unsafe.Pointer(namespaceUri_ms.data)) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + C.QXmlStreamWriter_WriteEmptyElement2(this.h, namespaceUri_ms, name_ms) } func (this *QXmlStreamWriter) WriteTextElement(qualifiedName string, text string) { - qualifiedName_ms := libmiqt.Strdupg(qualifiedName) - defer C.free(qualifiedName_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QXmlStreamWriter_WriteTextElement(this.h, (*C.struct_miqt_string)(qualifiedName_ms), (*C.struct_miqt_string)(text_ms)) + qualifiedName_ms := C.struct_miqt_string{} + qualifiedName_ms.data = C.CString(qualifiedName) + qualifiedName_ms.len = C.size_t(len(qualifiedName)) + defer C.free(unsafe.Pointer(qualifiedName_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QXmlStreamWriter_WriteTextElement(this.h, qualifiedName_ms, text_ms) } func (this *QXmlStreamWriter) WriteTextElement2(namespaceUri string, name string, text string) { - namespaceUri_ms := libmiqt.Strdupg(namespaceUri) - defer C.free(namespaceUri_ms) - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - text_ms := libmiqt.Strdupg(text) - defer C.free(text_ms) - C.QXmlStreamWriter_WriteTextElement2(this.h, (*C.struct_miqt_string)(namespaceUri_ms), (*C.struct_miqt_string)(name_ms), (*C.struct_miqt_string)(text_ms)) + namespaceUri_ms := C.struct_miqt_string{} + namespaceUri_ms.data = C.CString(namespaceUri) + namespaceUri_ms.len = C.size_t(len(namespaceUri)) + defer C.free(unsafe.Pointer(namespaceUri_ms.data)) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + text_ms := C.struct_miqt_string{} + text_ms.data = C.CString(text) + text_ms.len = C.size_t(len(text)) + defer C.free(unsafe.Pointer(text_ms.data)) + C.QXmlStreamWriter_WriteTextElement2(this.h, namespaceUri_ms, name_ms, text_ms) } func (this *QXmlStreamWriter) WriteEndDocument() { @@ -994,27 +1055,35 @@ func (this *QXmlStreamWriter) WriteEndElement() { } func (this *QXmlStreamWriter) WriteEntityReference(name string) { - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - C.QXmlStreamWriter_WriteEntityReference(this.h, (*C.struct_miqt_string)(name_ms)) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + C.QXmlStreamWriter_WriteEntityReference(this.h, name_ms) } func (this *QXmlStreamWriter) WriteNamespace(namespaceUri string) { - namespaceUri_ms := libmiqt.Strdupg(namespaceUri) - defer C.free(namespaceUri_ms) - C.QXmlStreamWriter_WriteNamespace(this.h, (*C.struct_miqt_string)(namespaceUri_ms)) + namespaceUri_ms := C.struct_miqt_string{} + namespaceUri_ms.data = C.CString(namespaceUri) + namespaceUri_ms.len = C.size_t(len(namespaceUri)) + defer C.free(unsafe.Pointer(namespaceUri_ms.data)) + C.QXmlStreamWriter_WriteNamespace(this.h, namespaceUri_ms) } func (this *QXmlStreamWriter) WriteDefaultNamespace(namespaceUri string) { - namespaceUri_ms := libmiqt.Strdupg(namespaceUri) - defer C.free(namespaceUri_ms) - C.QXmlStreamWriter_WriteDefaultNamespace(this.h, (*C.struct_miqt_string)(namespaceUri_ms)) + namespaceUri_ms := C.struct_miqt_string{} + namespaceUri_ms.data = C.CString(namespaceUri) + namespaceUri_ms.len = C.size_t(len(namespaceUri)) + defer C.free(unsafe.Pointer(namespaceUri_ms.data)) + C.QXmlStreamWriter_WriteDefaultNamespace(this.h, namespaceUri_ms) } func (this *QXmlStreamWriter) WriteProcessingInstruction(target string) { - target_ms := libmiqt.Strdupg(target) - defer C.free(target_ms) - C.QXmlStreamWriter_WriteProcessingInstruction(this.h, (*C.struct_miqt_string)(target_ms)) + target_ms := C.struct_miqt_string{} + target_ms.data = C.CString(target) + target_ms.len = C.size_t(len(target)) + defer C.free(unsafe.Pointer(target_ms.data)) + C.QXmlStreamWriter_WriteProcessingInstruction(this.h, target_ms) } func (this *QXmlStreamWriter) WriteStartDocument() { @@ -1022,29 +1091,39 @@ func (this *QXmlStreamWriter) WriteStartDocument() { } func (this *QXmlStreamWriter) WriteStartDocumentWithVersion(version string) { - version_ms := libmiqt.Strdupg(version) - defer C.free(version_ms) - C.QXmlStreamWriter_WriteStartDocumentWithVersion(this.h, (*C.struct_miqt_string)(version_ms)) + version_ms := C.struct_miqt_string{} + version_ms.data = C.CString(version) + version_ms.len = C.size_t(len(version)) + defer C.free(unsafe.Pointer(version_ms.data)) + C.QXmlStreamWriter_WriteStartDocumentWithVersion(this.h, version_ms) } func (this *QXmlStreamWriter) WriteStartDocument2(version string, standalone bool) { - version_ms := libmiqt.Strdupg(version) - defer C.free(version_ms) - C.QXmlStreamWriter_WriteStartDocument2(this.h, (*C.struct_miqt_string)(version_ms), (C.bool)(standalone)) + version_ms := C.struct_miqt_string{} + version_ms.data = C.CString(version) + version_ms.len = C.size_t(len(version)) + defer C.free(unsafe.Pointer(version_ms.data)) + C.QXmlStreamWriter_WriteStartDocument2(this.h, version_ms, (C.bool)(standalone)) } func (this *QXmlStreamWriter) WriteStartElement(qualifiedName string) { - qualifiedName_ms := libmiqt.Strdupg(qualifiedName) - defer C.free(qualifiedName_ms) - C.QXmlStreamWriter_WriteStartElement(this.h, (*C.struct_miqt_string)(qualifiedName_ms)) + qualifiedName_ms := C.struct_miqt_string{} + qualifiedName_ms.data = C.CString(qualifiedName) + qualifiedName_ms.len = C.size_t(len(qualifiedName)) + defer C.free(unsafe.Pointer(qualifiedName_ms.data)) + C.QXmlStreamWriter_WriteStartElement(this.h, qualifiedName_ms) } func (this *QXmlStreamWriter) WriteStartElement2(namespaceUri string, name string) { - namespaceUri_ms := libmiqt.Strdupg(namespaceUri) - defer C.free(namespaceUri_ms) - name_ms := libmiqt.Strdupg(name) - defer C.free(name_ms) - C.QXmlStreamWriter_WriteStartElement2(this.h, (*C.struct_miqt_string)(namespaceUri_ms), (*C.struct_miqt_string)(name_ms)) + namespaceUri_ms := C.struct_miqt_string{} + namespaceUri_ms.data = C.CString(namespaceUri) + namespaceUri_ms.len = C.size_t(len(namespaceUri)) + defer C.free(unsafe.Pointer(namespaceUri_ms.data)) + name_ms := C.struct_miqt_string{} + name_ms.data = C.CString(name) + name_ms.len = C.size_t(len(name)) + defer C.free(unsafe.Pointer(name_ms.data)) + C.QXmlStreamWriter_WriteStartElement2(this.h, namespaceUri_ms, name_ms) } func (this *QXmlStreamWriter) WriteCurrentToken(reader *QXmlStreamReader) { @@ -1056,19 +1135,27 @@ func (this *QXmlStreamWriter) HasError() bool { } func (this *QXmlStreamWriter) WriteNamespace2(namespaceUri string, prefix string) { - namespaceUri_ms := libmiqt.Strdupg(namespaceUri) - defer C.free(namespaceUri_ms) - prefix_ms := libmiqt.Strdupg(prefix) - defer C.free(prefix_ms) - C.QXmlStreamWriter_WriteNamespace2(this.h, (*C.struct_miqt_string)(namespaceUri_ms), (*C.struct_miqt_string)(prefix_ms)) + namespaceUri_ms := C.struct_miqt_string{} + namespaceUri_ms.data = C.CString(namespaceUri) + namespaceUri_ms.len = C.size_t(len(namespaceUri)) + defer C.free(unsafe.Pointer(namespaceUri_ms.data)) + prefix_ms := C.struct_miqt_string{} + prefix_ms.data = C.CString(prefix) + prefix_ms.len = C.size_t(len(prefix)) + defer C.free(unsafe.Pointer(prefix_ms.data)) + C.QXmlStreamWriter_WriteNamespace2(this.h, namespaceUri_ms, prefix_ms) } func (this *QXmlStreamWriter) WriteProcessingInstruction2(target string, data string) { - target_ms := libmiqt.Strdupg(target) - defer C.free(target_ms) - data_ms := libmiqt.Strdupg(data) - defer C.free(data_ms) - C.QXmlStreamWriter_WriteProcessingInstruction2(this.h, (*C.struct_miqt_string)(target_ms), (*C.struct_miqt_string)(data_ms)) + target_ms := C.struct_miqt_string{} + target_ms.data = C.CString(target) + target_ms.len = C.size_t(len(target)) + defer C.free(unsafe.Pointer(target_ms.data)) + data_ms := C.struct_miqt_string{} + data_ms.data = C.CString(data) + data_ms.len = C.size_t(len(data)) + defer C.free(unsafe.Pointer(data_ms.data)) + C.QXmlStreamWriter_WriteProcessingInstruction2(this.h, target_ms, data_ms) } // Delete this object from C++ memory. diff --git a/qt/gen_qxmlstream.h b/qt/gen_qxmlstream.h index c40c8150..c09df4b4 100644 --- a/qt/gen_qxmlstream.h +++ b/qt/gen_qxmlstream.h @@ -40,19 +40,19 @@ typedef struct QXmlStreamWriter QXmlStreamWriter; #endif QXmlStreamStringRef* QXmlStreamStringRef_new(); -QXmlStreamStringRef* QXmlStreamStringRef_new2(struct miqt_string* aString); +QXmlStreamStringRef* QXmlStreamStringRef_new2(struct miqt_string aString); QXmlStreamStringRef* QXmlStreamStringRef_new3(QXmlStreamStringRef* other); void QXmlStreamStringRef_OperatorAssign(QXmlStreamStringRef* self, QXmlStreamStringRef* other); void QXmlStreamStringRef_Swap(QXmlStreamStringRef* self, QXmlStreamStringRef* other); void QXmlStreamStringRef_Clear(QXmlStreamStringRef* self); -struct miqt_string* QXmlStreamStringRef_String(const QXmlStreamStringRef* self); +struct miqt_string QXmlStreamStringRef_String(const QXmlStreamStringRef* self); int QXmlStreamStringRef_Position(const QXmlStreamStringRef* self); int QXmlStreamStringRef_Size(const QXmlStreamStringRef* self); void QXmlStreamStringRef_Delete(QXmlStreamStringRef* self); QXmlStreamAttribute* QXmlStreamAttribute_new(); -QXmlStreamAttribute* QXmlStreamAttribute_new2(struct miqt_string* qualifiedName, struct miqt_string* value); -QXmlStreamAttribute* QXmlStreamAttribute_new3(struct miqt_string* namespaceUri, struct miqt_string* name, struct miqt_string* value); +QXmlStreamAttribute* QXmlStreamAttribute_new2(struct miqt_string qualifiedName, struct miqt_string value); +QXmlStreamAttribute* QXmlStreamAttribute_new3(struct miqt_string namespaceUri, struct miqt_string name, struct miqt_string value); QXmlStreamAttribute* QXmlStreamAttribute_new4(QXmlStreamAttribute* param1); void QXmlStreamAttribute_OperatorAssign(QXmlStreamAttribute* self, QXmlStreamAttribute* param1); bool QXmlStreamAttribute_IsDefault(const QXmlStreamAttribute* self); @@ -61,7 +61,7 @@ bool QXmlStreamAttribute_OperatorNotEqual(const QXmlStreamAttribute* self, QXmlS void QXmlStreamAttribute_Delete(QXmlStreamAttribute* self); QXmlStreamNamespaceDeclaration* QXmlStreamNamespaceDeclaration_new(); -QXmlStreamNamespaceDeclaration* QXmlStreamNamespaceDeclaration_new2(struct miqt_string* prefix, struct miqt_string* namespaceUri); +QXmlStreamNamespaceDeclaration* QXmlStreamNamespaceDeclaration_new2(struct miqt_string prefix, struct miqt_string namespaceUri); QXmlStreamNamespaceDeclaration* QXmlStreamNamespaceDeclaration_new3(QXmlStreamNamespaceDeclaration* param1); void QXmlStreamNamespaceDeclaration_OperatorAssign(QXmlStreamNamespaceDeclaration* self, QXmlStreamNamespaceDeclaration* param1); bool QXmlStreamNamespaceDeclaration_OperatorEqual(const QXmlStreamNamespaceDeclaration* self, QXmlStreamNamespaceDeclaration* other); @@ -82,20 +82,20 @@ bool QXmlStreamEntityDeclaration_OperatorEqual(const QXmlStreamEntityDeclaration bool QXmlStreamEntityDeclaration_OperatorNotEqual(const QXmlStreamEntityDeclaration* self, QXmlStreamEntityDeclaration* other); void QXmlStreamEntityDeclaration_Delete(QXmlStreamEntityDeclaration* self); -struct miqt_string* QXmlStreamEntityResolver_ResolveEntity(QXmlStreamEntityResolver* self, struct miqt_string* publicId, struct miqt_string* systemId); -struct miqt_string* QXmlStreamEntityResolver_ResolveUndeclaredEntity(QXmlStreamEntityResolver* self, struct miqt_string* name); +struct miqt_string QXmlStreamEntityResolver_ResolveEntity(QXmlStreamEntityResolver* self, struct miqt_string publicId, struct miqt_string systemId); +struct miqt_string QXmlStreamEntityResolver_ResolveUndeclaredEntity(QXmlStreamEntityResolver* self, struct miqt_string name); void QXmlStreamEntityResolver_OperatorAssign(QXmlStreamEntityResolver* self, QXmlStreamEntityResolver* param1); void QXmlStreamEntityResolver_Delete(QXmlStreamEntityResolver* self); QXmlStreamReader* QXmlStreamReader_new(); QXmlStreamReader* QXmlStreamReader_new2(QIODevice* device); -QXmlStreamReader* QXmlStreamReader_new3(QByteArray* data); -QXmlStreamReader* QXmlStreamReader_new4(struct miqt_string* data); +QXmlStreamReader* QXmlStreamReader_new3(struct miqt_string data); +QXmlStreamReader* QXmlStreamReader_new4(struct miqt_string data); QXmlStreamReader* QXmlStreamReader_new5(const char* data); void QXmlStreamReader_SetDevice(QXmlStreamReader* self, QIODevice* device); QIODevice* QXmlStreamReader_Device(const QXmlStreamReader* self); -void QXmlStreamReader_AddData(QXmlStreamReader* self, QByteArray* data); -void QXmlStreamReader_AddDataWithData(QXmlStreamReader* self, struct miqt_string* data); +void QXmlStreamReader_AddData(QXmlStreamReader* self, struct miqt_string data); +void QXmlStreamReader_AddDataWithData(QXmlStreamReader* self, struct miqt_string data); void QXmlStreamReader_AddData2(QXmlStreamReader* self, const char* data); void QXmlStreamReader_Clear(QXmlStreamReader* self); bool QXmlStreamReader_AtEnd(const QXmlStreamReader* self); @@ -103,7 +103,7 @@ int QXmlStreamReader_ReadNext(QXmlStreamReader* self); bool QXmlStreamReader_ReadNextStartElement(QXmlStreamReader* self); void QXmlStreamReader_SkipCurrentElement(QXmlStreamReader* self); int QXmlStreamReader_TokenType(const QXmlStreamReader* self); -struct miqt_string* QXmlStreamReader_TokenString(const QXmlStreamReader* self); +struct miqt_string QXmlStreamReader_TokenString(const QXmlStreamReader* self); void QXmlStreamReader_SetNamespaceProcessing(QXmlStreamReader* self, bool namespaceProcessing); bool QXmlStreamReader_NamespaceProcessing(const QXmlStreamReader* self); bool QXmlStreamReader_IsStartDocument(const QXmlStreamReader* self); @@ -121,7 +121,7 @@ bool QXmlStreamReader_IsStandaloneDocument(const QXmlStreamReader* self); long long QXmlStreamReader_LineNumber(const QXmlStreamReader* self); long long QXmlStreamReader_ColumnNumber(const QXmlStreamReader* self); long long QXmlStreamReader_CharacterOffset(const QXmlStreamReader* self); -struct miqt_string* QXmlStreamReader_ReadElementText(QXmlStreamReader* self); +struct miqt_string QXmlStreamReader_ReadElementText(QXmlStreamReader* self); struct miqt_array* QXmlStreamReader_NamespaceDeclarations(const QXmlStreamReader* self); void QXmlStreamReader_AddExtraNamespaceDeclaration(QXmlStreamReader* self, QXmlStreamNamespaceDeclaration* extraNamespaceDeclaraction); void QXmlStreamReader_AddExtraNamespaceDeclarations(QXmlStreamReader* self, struct miqt_array* /* of QXmlStreamNamespaceDeclaration* */ extraNamespaceDeclaractions); @@ -130,18 +130,17 @@ struct miqt_array* QXmlStreamReader_EntityDeclarations(const QXmlStreamReader* s int QXmlStreamReader_EntityExpansionLimit(const QXmlStreamReader* self); void QXmlStreamReader_SetEntityExpansionLimit(QXmlStreamReader* self, int limit); void QXmlStreamReader_RaiseError(QXmlStreamReader* self); -struct miqt_string* QXmlStreamReader_ErrorString(const QXmlStreamReader* self); +struct miqt_string QXmlStreamReader_ErrorString(const QXmlStreamReader* self); int QXmlStreamReader_Error(const QXmlStreamReader* self); bool QXmlStreamReader_HasError(const QXmlStreamReader* self); void QXmlStreamReader_SetEntityResolver(QXmlStreamReader* self, QXmlStreamEntityResolver* resolver); QXmlStreamEntityResolver* QXmlStreamReader_EntityResolver(const QXmlStreamReader* self); -struct miqt_string* QXmlStreamReader_ReadElementText1(QXmlStreamReader* self, int behaviour); -void QXmlStreamReader_RaiseError1(QXmlStreamReader* self, struct miqt_string* message); +struct miqt_string QXmlStreamReader_ReadElementText1(QXmlStreamReader* self, int behaviour); +void QXmlStreamReader_RaiseError1(QXmlStreamReader* self, struct miqt_string message); void QXmlStreamReader_Delete(QXmlStreamReader* self); QXmlStreamWriter* QXmlStreamWriter_new(); QXmlStreamWriter* QXmlStreamWriter_new2(QIODevice* device); -QXmlStreamWriter* QXmlStreamWriter_new3(QByteArray* array); void QXmlStreamWriter_SetDevice(QXmlStreamWriter* self, QIODevice* device); QIODevice* QXmlStreamWriter_Device(const QXmlStreamWriter* self); void QXmlStreamWriter_SetCodec(QXmlStreamWriter* self, QTextCodec* codec); @@ -151,32 +150,32 @@ void QXmlStreamWriter_SetAutoFormatting(QXmlStreamWriter* self, bool autoFormatt bool QXmlStreamWriter_AutoFormatting(const QXmlStreamWriter* self); void QXmlStreamWriter_SetAutoFormattingIndent(QXmlStreamWriter* self, int spacesOrTabs); int QXmlStreamWriter_AutoFormattingIndent(const QXmlStreamWriter* self); -void QXmlStreamWriter_WriteAttribute(QXmlStreamWriter* self, struct miqt_string* qualifiedName, struct miqt_string* value); -void QXmlStreamWriter_WriteAttribute2(QXmlStreamWriter* self, struct miqt_string* namespaceUri, struct miqt_string* name, struct miqt_string* value); +void QXmlStreamWriter_WriteAttribute(QXmlStreamWriter* self, struct miqt_string qualifiedName, struct miqt_string value); +void QXmlStreamWriter_WriteAttribute2(QXmlStreamWriter* self, struct miqt_string namespaceUri, struct miqt_string name, struct miqt_string value); void QXmlStreamWriter_WriteAttributeWithAttribute(QXmlStreamWriter* self, QXmlStreamAttribute* attribute); -void QXmlStreamWriter_WriteCDATA(QXmlStreamWriter* self, struct miqt_string* text); -void QXmlStreamWriter_WriteCharacters(QXmlStreamWriter* self, struct miqt_string* text); -void QXmlStreamWriter_WriteComment(QXmlStreamWriter* self, struct miqt_string* text); -void QXmlStreamWriter_WriteDTD(QXmlStreamWriter* self, struct miqt_string* dtd); -void QXmlStreamWriter_WriteEmptyElement(QXmlStreamWriter* self, struct miqt_string* qualifiedName); -void QXmlStreamWriter_WriteEmptyElement2(QXmlStreamWriter* self, struct miqt_string* namespaceUri, struct miqt_string* name); -void QXmlStreamWriter_WriteTextElement(QXmlStreamWriter* self, struct miqt_string* qualifiedName, struct miqt_string* text); -void QXmlStreamWriter_WriteTextElement2(QXmlStreamWriter* self, struct miqt_string* namespaceUri, struct miqt_string* name, struct miqt_string* text); +void QXmlStreamWriter_WriteCDATA(QXmlStreamWriter* self, struct miqt_string text); +void QXmlStreamWriter_WriteCharacters(QXmlStreamWriter* self, struct miqt_string text); +void QXmlStreamWriter_WriteComment(QXmlStreamWriter* self, struct miqt_string text); +void QXmlStreamWriter_WriteDTD(QXmlStreamWriter* self, struct miqt_string dtd); +void QXmlStreamWriter_WriteEmptyElement(QXmlStreamWriter* self, struct miqt_string qualifiedName); +void QXmlStreamWriter_WriteEmptyElement2(QXmlStreamWriter* self, struct miqt_string namespaceUri, struct miqt_string name); +void QXmlStreamWriter_WriteTextElement(QXmlStreamWriter* self, struct miqt_string qualifiedName, struct miqt_string text); +void QXmlStreamWriter_WriteTextElement2(QXmlStreamWriter* self, struct miqt_string namespaceUri, struct miqt_string name, struct miqt_string text); void QXmlStreamWriter_WriteEndDocument(QXmlStreamWriter* self); void QXmlStreamWriter_WriteEndElement(QXmlStreamWriter* self); -void QXmlStreamWriter_WriteEntityReference(QXmlStreamWriter* self, struct miqt_string* name); -void QXmlStreamWriter_WriteNamespace(QXmlStreamWriter* self, struct miqt_string* namespaceUri); -void QXmlStreamWriter_WriteDefaultNamespace(QXmlStreamWriter* self, struct miqt_string* namespaceUri); -void QXmlStreamWriter_WriteProcessingInstruction(QXmlStreamWriter* self, struct miqt_string* target); +void QXmlStreamWriter_WriteEntityReference(QXmlStreamWriter* self, struct miqt_string name); +void QXmlStreamWriter_WriteNamespace(QXmlStreamWriter* self, struct miqt_string namespaceUri); +void QXmlStreamWriter_WriteDefaultNamespace(QXmlStreamWriter* self, struct miqt_string namespaceUri); +void QXmlStreamWriter_WriteProcessingInstruction(QXmlStreamWriter* self, struct miqt_string target); void QXmlStreamWriter_WriteStartDocument(QXmlStreamWriter* self); -void QXmlStreamWriter_WriteStartDocumentWithVersion(QXmlStreamWriter* self, struct miqt_string* version); -void QXmlStreamWriter_WriteStartDocument2(QXmlStreamWriter* self, struct miqt_string* version, bool standalone); -void QXmlStreamWriter_WriteStartElement(QXmlStreamWriter* self, struct miqt_string* qualifiedName); -void QXmlStreamWriter_WriteStartElement2(QXmlStreamWriter* self, struct miqt_string* namespaceUri, struct miqt_string* name); +void QXmlStreamWriter_WriteStartDocumentWithVersion(QXmlStreamWriter* self, struct miqt_string version); +void QXmlStreamWriter_WriteStartDocument2(QXmlStreamWriter* self, struct miqt_string version, bool standalone); +void QXmlStreamWriter_WriteStartElement(QXmlStreamWriter* self, struct miqt_string qualifiedName); +void QXmlStreamWriter_WriteStartElement2(QXmlStreamWriter* self, struct miqt_string namespaceUri, struct miqt_string name); void QXmlStreamWriter_WriteCurrentToken(QXmlStreamWriter* self, QXmlStreamReader* reader); bool QXmlStreamWriter_HasError(const QXmlStreamWriter* self); -void QXmlStreamWriter_WriteNamespace2(QXmlStreamWriter* self, struct miqt_string* namespaceUri, struct miqt_string* prefix); -void QXmlStreamWriter_WriteProcessingInstruction2(QXmlStreamWriter* self, struct miqt_string* target, struct miqt_string* data); +void QXmlStreamWriter_WriteNamespace2(QXmlStreamWriter* self, struct miqt_string namespaceUri, struct miqt_string prefix); +void QXmlStreamWriter_WriteProcessingInstruction2(QXmlStreamWriter* self, struct miqt_string target, struct miqt_string data); void QXmlStreamWriter_Delete(QXmlStreamWriter* self); #ifdef __cplusplus diff --git a/qt/qprintsupport/gen_qabstractprintdialog.cpp b/qt/qprintsupport/gen_qabstractprintdialog.cpp index d789d12e..12f52b10 100644 --- a/qt/qprintsupport/gen_qabstractprintdialog.cpp +++ b/qt/qprintsupport/gen_qabstractprintdialog.cpp @@ -26,18 +26,26 @@ void* QAbstractPrintDialog_Metacast(QAbstractPrintDialog* self, const char* para return self->qt_metacast(param1); } -struct miqt_string* QAbstractPrintDialog_Tr(const char* s) { +struct miqt_string QAbstractPrintDialog_Tr(const char* s) { QString _ret = QAbstractPrintDialog::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractPrintDialog_TrUtf8(const char* s) { +struct miqt_string QAbstractPrintDialog_TrUtf8(const char* s) { QString _ret = QAbstractPrintDialog::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QAbstractPrintDialog_AddEnabledOption(QAbstractPrintDialog* self, int option) { @@ -104,32 +112,48 @@ QPrinter* QAbstractPrintDialog_Printer(const QAbstractPrintDialog* self) { return self->printer(); } -struct miqt_string* QAbstractPrintDialog_Tr2(const char* s, const char* c) { +struct miqt_string QAbstractPrintDialog_Tr2(const char* s, const char* c) { QString _ret = QAbstractPrintDialog::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractPrintDialog_Tr3(const char* s, const char* c, int n) { +struct miqt_string QAbstractPrintDialog_Tr3(const char* s, const char* c, int n) { QString _ret = QAbstractPrintDialog::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractPrintDialog_TrUtf82(const char* s, const char* c) { +struct miqt_string QAbstractPrintDialog_TrUtf82(const char* s, const char* c) { QString _ret = QAbstractPrintDialog::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QAbstractPrintDialog_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QAbstractPrintDialog_TrUtf83(const char* s, const char* c, int n) { QString _ret = QAbstractPrintDialog::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QAbstractPrintDialog_Delete(QAbstractPrintDialog* self) { diff --git a/qt/qprintsupport/gen_qabstractprintdialog.go b/qt/qprintsupport/gen_qabstractprintdialog.go index b0e3ba45..cab6a6e2 100644 --- a/qt/qprintsupport/gen_qabstractprintdialog.go +++ b/qt/qprintsupport/gen_qabstractprintdialog.go @@ -85,24 +85,24 @@ func (this *QAbstractPrintDialog) MetaObject() *qt.QMetaObject { func (this *QAbstractPrintDialog) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QAbstractPrintDialog_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QAbstractPrintDialog_Metacast(this.h, param1_Cstring)) } func QAbstractPrintDialog_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractPrintDialog_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractPrintDialog_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QAbstractPrintDialog_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractPrintDialog_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractPrintDialog_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -175,9 +175,9 @@ func QAbstractPrintDialog_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractPrintDialog_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractPrintDialog_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -186,9 +186,9 @@ func QAbstractPrintDialog_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractPrintDialog_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractPrintDialog_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -197,9 +197,9 @@ func QAbstractPrintDialog_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractPrintDialog_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractPrintDialog_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -208,9 +208,9 @@ func QAbstractPrintDialog_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractPrintDialog_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QAbstractPrintDialog_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/qprintsupport/gen_qabstractprintdialog.h b/qt/qprintsupport/gen_qabstractprintdialog.h index d8af6b71..05d878b2 100644 --- a/qt/qprintsupport/gen_qabstractprintdialog.h +++ b/qt/qprintsupport/gen_qabstractprintdialog.h @@ -29,8 +29,8 @@ QAbstractPrintDialog* QAbstractPrintDialog_new(QPrinter* printer); QAbstractPrintDialog* QAbstractPrintDialog_new2(QPrinter* printer, QWidget* parent); QMetaObject* QAbstractPrintDialog_MetaObject(const QAbstractPrintDialog* self); void* QAbstractPrintDialog_Metacast(QAbstractPrintDialog* self, const char* param1); -struct miqt_string* QAbstractPrintDialog_Tr(const char* s); -struct miqt_string* QAbstractPrintDialog_TrUtf8(const char* s); +struct miqt_string QAbstractPrintDialog_Tr(const char* s); +struct miqt_string QAbstractPrintDialog_TrUtf8(const char* s); void QAbstractPrintDialog_AddEnabledOption(QAbstractPrintDialog* self, int option); void QAbstractPrintDialog_SetEnabledOptions(QAbstractPrintDialog* self, int options); int QAbstractPrintDialog_EnabledOptions(const QAbstractPrintDialog* self); @@ -45,10 +45,10 @@ void QAbstractPrintDialog_SetFromTo(QAbstractPrintDialog* self, int fromPage, in int QAbstractPrintDialog_FromPage(const QAbstractPrintDialog* self); int QAbstractPrintDialog_ToPage(const QAbstractPrintDialog* self); QPrinter* QAbstractPrintDialog_Printer(const QAbstractPrintDialog* self); -struct miqt_string* QAbstractPrintDialog_Tr2(const char* s, const char* c); -struct miqt_string* QAbstractPrintDialog_Tr3(const char* s, const char* c, int n); -struct miqt_string* QAbstractPrintDialog_TrUtf82(const char* s, const char* c); -struct miqt_string* QAbstractPrintDialog_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QAbstractPrintDialog_Tr2(const char* s, const char* c); +struct miqt_string QAbstractPrintDialog_Tr3(const char* s, const char* c, int n); +struct miqt_string QAbstractPrintDialog_TrUtf82(const char* s, const char* c); +struct miqt_string QAbstractPrintDialog_TrUtf83(const char* s, const char* c, int n); void QAbstractPrintDialog_Delete(QAbstractPrintDialog* self); #ifdef __cplusplus diff --git a/qt/qprintsupport/gen_qpagesetupdialog.cpp b/qt/qprintsupport/gen_qpagesetupdialog.cpp index ffe635cc..847fff92 100644 --- a/qt/qprintsupport/gen_qpagesetupdialog.cpp +++ b/qt/qprintsupport/gen_qpagesetupdialog.cpp @@ -33,18 +33,26 @@ void* QPageSetupDialog_Metacast(QPageSetupDialog* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QPageSetupDialog_Tr(const char* s) { +struct miqt_string QPageSetupDialog_Tr(const char* s) { QString _ret = QPageSetupDialog::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPageSetupDialog_TrUtf8(const char* s) { +struct miqt_string QPageSetupDialog_TrUtf8(const char* s) { QString _ret = QPageSetupDialog::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QPageSetupDialog_Exec(QPageSetupDialog* self) { @@ -59,32 +67,48 @@ QPrinter* QPageSetupDialog_Printer(QPageSetupDialog* self) { return self->printer(); } -struct miqt_string* QPageSetupDialog_Tr2(const char* s, const char* c) { +struct miqt_string QPageSetupDialog_Tr2(const char* s, const char* c) { QString _ret = QPageSetupDialog::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPageSetupDialog_Tr3(const char* s, const char* c, int n) { +struct miqt_string QPageSetupDialog_Tr3(const char* s, const char* c, int n) { QString _ret = QPageSetupDialog::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPageSetupDialog_TrUtf82(const char* s, const char* c) { +struct miqt_string QPageSetupDialog_TrUtf82(const char* s, const char* c) { QString _ret = QPageSetupDialog::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPageSetupDialog_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QPageSetupDialog_TrUtf83(const char* s, const char* c, int n) { QString _ret = QPageSetupDialog::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QPageSetupDialog_Delete(QPageSetupDialog* self) { diff --git a/qt/qprintsupport/gen_qpagesetupdialog.go b/qt/qprintsupport/gen_qpagesetupdialog.go index 2b5f50c7..39d055e8 100644 --- a/qt/qprintsupport/gen_qpagesetupdialog.go +++ b/qt/qprintsupport/gen_qpagesetupdialog.go @@ -75,24 +75,24 @@ func (this *QPageSetupDialog) MetaObject() *qt.QMetaObject { func (this *QPageSetupDialog) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QPageSetupDialog_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QPageSetupDialog_Metacast(this.h, param1_Cstring)) } func QPageSetupDialog_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QPageSetupDialog_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPageSetupDialog_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QPageSetupDialog_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QPageSetupDialog_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPageSetupDialog_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -113,9 +113,9 @@ func QPageSetupDialog_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPageSetupDialog_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPageSetupDialog_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -124,9 +124,9 @@ func QPageSetupDialog_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPageSetupDialog_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPageSetupDialog_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -135,9 +135,9 @@ func QPageSetupDialog_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPageSetupDialog_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPageSetupDialog_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -146,9 +146,9 @@ func QPageSetupDialog_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPageSetupDialog_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPageSetupDialog_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/qprintsupport/gen_qpagesetupdialog.h b/qt/qprintsupport/gen_qpagesetupdialog.h index e48ce138..be0d8aa4 100644 --- a/qt/qprintsupport/gen_qpagesetupdialog.h +++ b/qt/qprintsupport/gen_qpagesetupdialog.h @@ -31,15 +31,15 @@ QPageSetupDialog* QPageSetupDialog_new3(QPrinter* printer, QWidget* parent); QPageSetupDialog* QPageSetupDialog_new4(QWidget* parent); QMetaObject* QPageSetupDialog_MetaObject(const QPageSetupDialog* self); void* QPageSetupDialog_Metacast(QPageSetupDialog* self, const char* param1); -struct miqt_string* QPageSetupDialog_Tr(const char* s); -struct miqt_string* QPageSetupDialog_TrUtf8(const char* s); +struct miqt_string QPageSetupDialog_Tr(const char* s); +struct miqt_string QPageSetupDialog_TrUtf8(const char* s); int QPageSetupDialog_Exec(QPageSetupDialog* self); void QPageSetupDialog_Done(QPageSetupDialog* self, int result); QPrinter* QPageSetupDialog_Printer(QPageSetupDialog* self); -struct miqt_string* QPageSetupDialog_Tr2(const char* s, const char* c); -struct miqt_string* QPageSetupDialog_Tr3(const char* s, const char* c, int n); -struct miqt_string* QPageSetupDialog_TrUtf82(const char* s, const char* c); -struct miqt_string* QPageSetupDialog_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QPageSetupDialog_Tr2(const char* s, const char* c); +struct miqt_string QPageSetupDialog_Tr3(const char* s, const char* c, int n); +struct miqt_string QPageSetupDialog_TrUtf82(const char* s, const char* c); +struct miqt_string QPageSetupDialog_TrUtf83(const char* s, const char* c, int n); void QPageSetupDialog_Delete(QPageSetupDialog* self); #ifdef __cplusplus diff --git a/qt/qprintsupport/gen_qprintdialog.cpp b/qt/qprintsupport/gen_qprintdialog.cpp index 71add150..3ec6dfc8 100644 --- a/qt/qprintsupport/gen_qprintdialog.cpp +++ b/qt/qprintsupport/gen_qprintdialog.cpp @@ -33,18 +33,26 @@ void* QPrintDialog_Metacast(QPrintDialog* self, const char* param1) { return self->qt_metacast(param1); } -struct miqt_string* QPrintDialog_Tr(const char* s) { +struct miqt_string QPrintDialog_Tr(const char* s) { QString _ret = QPrintDialog::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPrintDialog_TrUtf8(const char* s) { +struct miqt_string QPrintDialog_TrUtf8(const char* s) { QString _ret = QPrintDialog::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } int QPrintDialog_Exec(QPrintDialog* self) { @@ -91,32 +99,48 @@ void QPrintDialog_connect_Accepted(QPrintDialog* self, intptr_t slot) { }); } -struct miqt_string* QPrintDialog_Tr2(const char* s, const char* c) { +struct miqt_string QPrintDialog_Tr2(const char* s, const char* c) { QString _ret = QPrintDialog::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPrintDialog_Tr3(const char* s, const char* c, int n) { +struct miqt_string QPrintDialog_Tr3(const char* s, const char* c, int n) { QString _ret = QPrintDialog::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPrintDialog_TrUtf82(const char* s, const char* c) { +struct miqt_string QPrintDialog_TrUtf82(const char* s, const char* c) { QString _ret = QPrintDialog::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPrintDialog_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QPrintDialog_TrUtf83(const char* s, const char* c, int n) { QString _ret = QPrintDialog::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QPrintDialog_SetOption2(QPrintDialog* self, int option, bool on) { diff --git a/qt/qprintsupport/gen_qprintdialog.go b/qt/qprintsupport/gen_qprintdialog.go index 32840703..daa4fa55 100644 --- a/qt/qprintsupport/gen_qprintdialog.go +++ b/qt/qprintsupport/gen_qprintdialog.go @@ -76,24 +76,24 @@ func (this *QPrintDialog) MetaObject() *qt.QMetaObject { func (this *QPrintDialog) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QPrintDialog_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QPrintDialog_Metacast(this.h, param1_Cstring)) } func QPrintDialog_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QPrintDialog_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPrintDialog_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QPrintDialog_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QPrintDialog_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPrintDialog_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -154,9 +154,9 @@ func QPrintDialog_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPrintDialog_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPrintDialog_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -165,9 +165,9 @@ func QPrintDialog_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPrintDialog_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPrintDialog_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -176,9 +176,9 @@ func QPrintDialog_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPrintDialog_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPrintDialog_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -187,9 +187,9 @@ func QPrintDialog_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPrintDialog_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPrintDialog_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/qprintsupport/gen_qprintdialog.h b/qt/qprintsupport/gen_qprintdialog.h index a29e0833..cf720a44 100644 --- a/qt/qprintsupport/gen_qprintdialog.h +++ b/qt/qprintsupport/gen_qprintdialog.h @@ -31,8 +31,8 @@ QPrintDialog* QPrintDialog_new3(QPrinter* printer, QWidget* parent); QPrintDialog* QPrintDialog_new4(QWidget* parent); QMetaObject* QPrintDialog_MetaObject(const QPrintDialog* self); void* QPrintDialog_Metacast(QPrintDialog* self, const char* param1); -struct miqt_string* QPrintDialog_Tr(const char* s); -struct miqt_string* QPrintDialog_TrUtf8(const char* s); +struct miqt_string QPrintDialog_Tr(const char* s); +struct miqt_string QPrintDialog_TrUtf8(const char* s); int QPrintDialog_Exec(QPrintDialog* self); void QPrintDialog_Accept(QPrintDialog* self); void QPrintDialog_Done(QPrintDialog* self, int result); @@ -43,10 +43,10 @@ int QPrintDialog_Options(const QPrintDialog* self); void QPrintDialog_SetVisible(QPrintDialog* self, bool visible); void QPrintDialog_Accepted(QPrintDialog* self, QPrinter* printer); void QPrintDialog_connect_Accepted(QPrintDialog* self, intptr_t slot); -struct miqt_string* QPrintDialog_Tr2(const char* s, const char* c); -struct miqt_string* QPrintDialog_Tr3(const char* s, const char* c, int n); -struct miqt_string* QPrintDialog_TrUtf82(const char* s, const char* c); -struct miqt_string* QPrintDialog_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QPrintDialog_Tr2(const char* s, const char* c); +struct miqt_string QPrintDialog_Tr3(const char* s, const char* c, int n); +struct miqt_string QPrintDialog_TrUtf82(const char* s, const char* c); +struct miqt_string QPrintDialog_TrUtf83(const char* s, const char* c, int n); void QPrintDialog_SetOption2(QPrintDialog* self, int option, bool on); void QPrintDialog_Delete(QPrintDialog* self); diff --git a/qt/qprintsupport/gen_qprinter.cpp b/qt/qprintsupport/gen_qprinter.cpp index 91a90a77..9ec3e92c 100644 --- a/qt/qprintsupport/gen_qprinter.cpp +++ b/qt/qprintsupport/gen_qprinter.cpp @@ -52,68 +52,88 @@ int QPrinter_PdfVersion(const QPrinter* self) { return static_cast(_ret); } -void QPrinter_SetPrinterName(QPrinter* self, struct miqt_string* printerName) { - QString printerName_QString = QString::fromUtf8(&printerName->data, printerName->len); +void QPrinter_SetPrinterName(QPrinter* self, struct miqt_string printerName) { + QString printerName_QString = QString::fromUtf8(printerName.data, printerName.len); self->setPrinterName(printerName_QString); } -struct miqt_string* QPrinter_PrinterName(const QPrinter* self) { +struct miqt_string QPrinter_PrinterName(const QPrinter* self) { QString _ret = self->printerName(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } bool QPrinter_IsValid(const QPrinter* self) { return self->isValid(); } -void QPrinter_SetOutputFileName(QPrinter* self, struct miqt_string* outputFileName) { - QString outputFileName_QString = QString::fromUtf8(&outputFileName->data, outputFileName->len); +void QPrinter_SetOutputFileName(QPrinter* self, struct miqt_string outputFileName) { + QString outputFileName_QString = QString::fromUtf8(outputFileName.data, outputFileName.len); self->setOutputFileName(outputFileName_QString); } -struct miqt_string* QPrinter_OutputFileName(const QPrinter* self) { +struct miqt_string QPrinter_OutputFileName(const QPrinter* self) { QString _ret = self->outputFileName(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QPrinter_SetPrintProgram(QPrinter* self, struct miqt_string* printProgram) { - QString printProgram_QString = QString::fromUtf8(&printProgram->data, printProgram->len); +void QPrinter_SetPrintProgram(QPrinter* self, struct miqt_string printProgram) { + QString printProgram_QString = QString::fromUtf8(printProgram.data, printProgram.len); self->setPrintProgram(printProgram_QString); } -struct miqt_string* QPrinter_PrintProgram(const QPrinter* self) { +struct miqt_string QPrinter_PrintProgram(const QPrinter* self) { QString _ret = self->printProgram(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QPrinter_SetDocName(QPrinter* self, struct miqt_string* docName) { - QString docName_QString = QString::fromUtf8(&docName->data, docName->len); +void QPrinter_SetDocName(QPrinter* self, struct miqt_string docName) { + QString docName_QString = QString::fromUtf8(docName.data, docName.len); self->setDocName(docName_QString); } -struct miqt_string* QPrinter_DocName(const QPrinter* self) { +struct miqt_string QPrinter_DocName(const QPrinter* self) { QString _ret = self->docName(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QPrinter_SetCreator(QPrinter* self, struct miqt_string* creator) { - QString creator_QString = QString::fromUtf8(&creator->data, creator->len); +void QPrinter_SetCreator(QPrinter* self, struct miqt_string creator) { + QString creator_QString = QString::fromUtf8(creator.data, creator.len); self->setCreator(creator_QString); } -struct miqt_string* QPrinter_Creator(const QPrinter* self) { +struct miqt_string QPrinter_Creator(const QPrinter* self) { QString _ret = self->creator(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QPrinter_SetOrientation(QPrinter* self, int orientation) { @@ -155,16 +175,20 @@ QSizeF* QPrinter_PaperSizeWithUnit(const QPrinter* self, int unit) { return new QSizeF(self->paperSize(static_cast(unit))); } -void QPrinter_SetPaperName(QPrinter* self, struct miqt_string* paperName) { - QString paperName_QString = QString::fromUtf8(&paperName->data, paperName->len); +void QPrinter_SetPaperName(QPrinter* self, struct miqt_string paperName) { + QString paperName_QString = QString::fromUtf8(paperName.data, paperName.len); self->setPaperName(paperName_QString); } -struct miqt_string* QPrinter_PaperName(const QPrinter* self) { +struct miqt_string QPrinter_PaperName(const QPrinter* self) { QString _ret = self->paperName(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QPrinter_SetPageOrder(QPrinter* self, int pageOrder) { @@ -304,15 +328,19 @@ QRectF* QPrinter_PageRectWithQPrinterUnit(const QPrinter* self, int param1) { return new QRectF(self->pageRect(static_cast(param1))); } -struct miqt_string* QPrinter_PrinterSelectionOption(const QPrinter* self) { +struct miqt_string QPrinter_PrinterSelectionOption(const QPrinter* self) { QString _ret = self->printerSelectionOption(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -void QPrinter_SetPrinterSelectionOption(QPrinter* self, struct miqt_string* printerSelectionOption) { - QString printerSelectionOption_QString = QString::fromUtf8(&printerSelectionOption->data, printerSelectionOption->len); +void QPrinter_SetPrinterSelectionOption(QPrinter* self, struct miqt_string printerSelectionOption) { + QString printerSelectionOption_QString = QString::fromUtf8(printerSelectionOption.data, printerSelectionOption.len); self->setPrinterSelectionOption(printerSelectionOption_QString); } diff --git a/qt/qprintsupport/gen_qprinter.go b/qt/qprintsupport/gen_qprinter.go index 47605023..f4cc3754 100644 --- a/qt/qprintsupport/gen_qprinter.go +++ b/qt/qprintsupport/gen_qprinter.go @@ -9,7 +9,6 @@ package qprintsupport import "C" import ( - "github.com/mappu/miqt/libmiqt" "github.com/mappu/miqt/qt" "runtime" "unsafe" @@ -187,15 +186,17 @@ func (this *QPrinter) PdfVersion() qt.QPagedPaintDevice__PdfVersion { } func (this *QPrinter) SetPrinterName(printerName string) { - printerName_ms := libmiqt.Strdupg(printerName) - defer C.free(printerName_ms) - C.QPrinter_SetPrinterName(this.h, (*C.struct_miqt_string)(printerName_ms)) + printerName_ms := C.struct_miqt_string{} + printerName_ms.data = C.CString(printerName) + printerName_ms.len = C.size_t(len(printerName)) + defer C.free(unsafe.Pointer(printerName_ms.data)) + C.QPrinter_SetPrinterName(this.h, printerName_ms) } func (this *QPrinter) PrinterName() string { - var _ms *C.struct_miqt_string = C.QPrinter_PrinterName(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPrinter_PrinterName(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -204,54 +205,62 @@ func (this *QPrinter) IsValid() bool { } func (this *QPrinter) SetOutputFileName(outputFileName string) { - outputFileName_ms := libmiqt.Strdupg(outputFileName) - defer C.free(outputFileName_ms) - C.QPrinter_SetOutputFileName(this.h, (*C.struct_miqt_string)(outputFileName_ms)) + outputFileName_ms := C.struct_miqt_string{} + outputFileName_ms.data = C.CString(outputFileName) + outputFileName_ms.len = C.size_t(len(outputFileName)) + defer C.free(unsafe.Pointer(outputFileName_ms.data)) + C.QPrinter_SetOutputFileName(this.h, outputFileName_ms) } func (this *QPrinter) OutputFileName() string { - var _ms *C.struct_miqt_string = C.QPrinter_OutputFileName(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPrinter_OutputFileName(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QPrinter) SetPrintProgram(printProgram string) { - printProgram_ms := libmiqt.Strdupg(printProgram) - defer C.free(printProgram_ms) - C.QPrinter_SetPrintProgram(this.h, (*C.struct_miqt_string)(printProgram_ms)) + printProgram_ms := C.struct_miqt_string{} + printProgram_ms.data = C.CString(printProgram) + printProgram_ms.len = C.size_t(len(printProgram)) + defer C.free(unsafe.Pointer(printProgram_ms.data)) + C.QPrinter_SetPrintProgram(this.h, printProgram_ms) } func (this *QPrinter) PrintProgram() string { - var _ms *C.struct_miqt_string = C.QPrinter_PrintProgram(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPrinter_PrintProgram(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QPrinter) SetDocName(docName string) { - docName_ms := libmiqt.Strdupg(docName) - defer C.free(docName_ms) - C.QPrinter_SetDocName(this.h, (*C.struct_miqt_string)(docName_ms)) + docName_ms := C.struct_miqt_string{} + docName_ms.data = C.CString(docName) + docName_ms.len = C.size_t(len(docName)) + defer C.free(unsafe.Pointer(docName_ms.data)) + C.QPrinter_SetDocName(this.h, docName_ms) } func (this *QPrinter) DocName() string { - var _ms *C.struct_miqt_string = C.QPrinter_DocName(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPrinter_DocName(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QPrinter) SetCreator(creator string) { - creator_ms := libmiqt.Strdupg(creator) - defer C.free(creator_ms) - C.QPrinter_SetCreator(this.h, (*C.struct_miqt_string)(creator_ms)) + creator_ms := C.struct_miqt_string{} + creator_ms.data = C.CString(creator) + creator_ms.len = C.size_t(len(creator)) + defer C.free(unsafe.Pointer(creator_ms.data)) + C.QPrinter_SetCreator(this.h, creator_ms) } func (this *QPrinter) Creator() string { - var _ms *C.struct_miqt_string = C.QPrinter_Creator(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPrinter_Creator(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -295,15 +304,17 @@ func (this *QPrinter) PaperSizeWithUnit(unit QPrinter__Unit) *qt.QSizeF { } func (this *QPrinter) SetPaperName(paperName string) { - paperName_ms := libmiqt.Strdupg(paperName) - defer C.free(paperName_ms) - C.QPrinter_SetPaperName(this.h, (*C.struct_miqt_string)(paperName_ms)) + paperName_ms := C.struct_miqt_string{} + paperName_ms.data = C.CString(paperName) + paperName_ms.len = C.size_t(len(paperName)) + defer C.free(unsafe.Pointer(paperName_ms.data)) + C.QPrinter_SetPaperName(this.h, paperName_ms) } func (this *QPrinter) PaperName() string { - var _ms *C.struct_miqt_string = C.QPrinter_PaperName(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPrinter_PaperName(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -451,16 +462,18 @@ func (this *QPrinter) PageRectWithQPrinterUnit(param1 QPrinter__Unit) *qt.QRectF } func (this *QPrinter) PrinterSelectionOption() string { - var _ms *C.struct_miqt_string = C.QPrinter_PrinterSelectionOption(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPrinter_PrinterSelectionOption(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QPrinter) SetPrinterSelectionOption(printerSelectionOption string) { - printerSelectionOption_ms := libmiqt.Strdupg(printerSelectionOption) - defer C.free(printerSelectionOption_ms) - C.QPrinter_SetPrinterSelectionOption(this.h, (*C.struct_miqt_string)(printerSelectionOption_ms)) + printerSelectionOption_ms := C.struct_miqt_string{} + printerSelectionOption_ms.data = C.CString(printerSelectionOption) + printerSelectionOption_ms.len = C.size_t(len(printerSelectionOption)) + defer C.free(unsafe.Pointer(printerSelectionOption_ms.data)) + C.QPrinter_SetPrinterSelectionOption(this.h, printerSelectionOption_ms) } func (this *QPrinter) NewPage() bool { diff --git a/qt/qprintsupport/gen_qprinter.h b/qt/qprintsupport/gen_qprinter.h index 8f73d053..a463cab6 100644 --- a/qt/qprintsupport/gen_qprinter.h +++ b/qt/qprintsupport/gen_qprinter.h @@ -46,17 +46,17 @@ void QPrinter_SetOutputFormat(QPrinter* self, int format); int QPrinter_OutputFormat(const QPrinter* self); void QPrinter_SetPdfVersion(QPrinter* self, int version); int QPrinter_PdfVersion(const QPrinter* self); -void QPrinter_SetPrinterName(QPrinter* self, struct miqt_string* printerName); -struct miqt_string* QPrinter_PrinterName(const QPrinter* self); +void QPrinter_SetPrinterName(QPrinter* self, struct miqt_string printerName); +struct miqt_string QPrinter_PrinterName(const QPrinter* self); bool QPrinter_IsValid(const QPrinter* self); -void QPrinter_SetOutputFileName(QPrinter* self, struct miqt_string* outputFileName); -struct miqt_string* QPrinter_OutputFileName(const QPrinter* self); -void QPrinter_SetPrintProgram(QPrinter* self, struct miqt_string* printProgram); -struct miqt_string* QPrinter_PrintProgram(const QPrinter* self); -void QPrinter_SetDocName(QPrinter* self, struct miqt_string* docName); -struct miqt_string* QPrinter_DocName(const QPrinter* self); -void QPrinter_SetCreator(QPrinter* self, struct miqt_string* creator); -struct miqt_string* QPrinter_Creator(const QPrinter* self); +void QPrinter_SetOutputFileName(QPrinter* self, struct miqt_string outputFileName); +struct miqt_string QPrinter_OutputFileName(const QPrinter* self); +void QPrinter_SetPrintProgram(QPrinter* self, struct miqt_string printProgram); +struct miqt_string QPrinter_PrintProgram(const QPrinter* self); +void QPrinter_SetDocName(QPrinter* self, struct miqt_string docName); +struct miqt_string QPrinter_DocName(const QPrinter* self); +void QPrinter_SetCreator(QPrinter* self, struct miqt_string creator); +struct miqt_string QPrinter_Creator(const QPrinter* self); void QPrinter_SetOrientation(QPrinter* self, int orientation); int QPrinter_Orientation(const QPrinter* self); void QPrinter_SetPageSize(QPrinter* self, int pageSize); @@ -66,8 +66,8 @@ void QPrinter_SetPaperSize(QPrinter* self, int paperSize); int QPrinter_PaperSize(const QPrinter* self); void QPrinter_SetPaperSize2(QPrinter* self, QSizeF* paperSize, int unit); QSizeF* QPrinter_PaperSizeWithUnit(const QPrinter* self, int unit); -void QPrinter_SetPaperName(QPrinter* self, struct miqt_string* paperName); -struct miqt_string* QPrinter_PaperName(const QPrinter* self); +void QPrinter_SetPaperName(QPrinter* self, struct miqt_string paperName); +struct miqt_string QPrinter_PaperName(const QPrinter* self); void QPrinter_SetPageOrder(QPrinter* self, int pageOrder); int QPrinter_PageOrder(const QPrinter* self); void QPrinter_SetResolution(QPrinter* self, int resolution); @@ -99,8 +99,8 @@ QRect* QPrinter_PaperRect(const QPrinter* self); QRect* QPrinter_PageRect(const QPrinter* self); QRectF* QPrinter_PaperRectWithQPrinterUnit(const QPrinter* self, int param1); QRectF* QPrinter_PageRectWithQPrinterUnit(const QPrinter* self, int param1); -struct miqt_string* QPrinter_PrinterSelectionOption(const QPrinter* self); -void QPrinter_SetPrinterSelectionOption(QPrinter* self, struct miqt_string* printerSelectionOption); +struct miqt_string QPrinter_PrinterSelectionOption(const QPrinter* self); +void QPrinter_SetPrinterSelectionOption(QPrinter* self, struct miqt_string printerSelectionOption); bool QPrinter_NewPage(QPrinter* self); bool QPrinter_Abort(QPrinter* self); int QPrinter_PrinterState(const QPrinter* self); diff --git a/qt/qprintsupport/gen_qprinterinfo.cpp b/qt/qprintsupport/gen_qprinterinfo.cpp index 485710f0..52963c49 100644 --- a/qt/qprintsupport/gen_qprinterinfo.cpp +++ b/qt/qprintsupport/gen_qprinterinfo.cpp @@ -25,32 +25,48 @@ void QPrinterInfo_OperatorAssign(QPrinterInfo* self, QPrinterInfo* other) { self->operator=(*other); } -struct miqt_string* QPrinterInfo_PrinterName(const QPrinterInfo* self) { +struct miqt_string QPrinterInfo_PrinterName(const QPrinterInfo* self) { QString _ret = self->printerName(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPrinterInfo_Description(const QPrinterInfo* self) { +struct miqt_string QPrinterInfo_Description(const QPrinterInfo* self) { QString _ret = self->description(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPrinterInfo_Location(const QPrinterInfo* self) { +struct miqt_string QPrinterInfo_Location(const QPrinterInfo* self) { QString _ret = self->location(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPrinterInfo_MakeAndModel(const QPrinterInfo* self) { +struct miqt_string QPrinterInfo_MakeAndModel(const QPrinterInfo* self) { QString _ret = self->makeAndModel(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } bool QPrinterInfo_IsNull(const QPrinterInfo* self) { @@ -167,12 +183,16 @@ struct miqt_array* QPrinterInfo_SupportedColorModes(const QPrinterInfo* self) { struct miqt_array* QPrinterInfo_AvailablePrinterNames() { QStringList _ret = QPrinterInfo::availablePrinterNames(); // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QString _lv_ret = _ret[i]; // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + struct miqt_string _lv_ms; + _lv_ms.len = _lv_b.length(); + _lv_ms.data = static_cast(malloc(_lv_ms.len)); + memcpy(_lv_ms.data, _lv_b.data(), _lv_ms.len); + _arr[i] = _lv_ms; } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -193,19 +213,23 @@ struct miqt_array* QPrinterInfo_AvailablePrinters() { return _out; } -struct miqt_string* QPrinterInfo_DefaultPrinterName() { +struct miqt_string QPrinterInfo_DefaultPrinterName() { QString _ret = QPrinterInfo::defaultPrinterName(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QPrinterInfo* QPrinterInfo_DefaultPrinter() { return new QPrinterInfo(QPrinterInfo::defaultPrinter()); } -QPrinterInfo* QPrinterInfo_PrinterInfo(struct miqt_string* printerName) { - QString printerName_QString = QString::fromUtf8(&printerName->data, printerName->len); +QPrinterInfo* QPrinterInfo_PrinterInfo(struct miqt_string printerName) { + QString printerName_QString = QString::fromUtf8(printerName.data, printerName.len); return new QPrinterInfo(QPrinterInfo::printerInfo(printerName_QString)); } diff --git a/qt/qprintsupport/gen_qprinterinfo.go b/qt/qprintsupport/gen_qprinterinfo.go index dffa39d6..89bfb6cd 100644 --- a/qt/qprintsupport/gen_qprinterinfo.go +++ b/qt/qprintsupport/gen_qprinterinfo.go @@ -9,7 +9,6 @@ package qprintsupport import "C" import ( - "github.com/mappu/miqt/libmiqt" "github.com/mappu/miqt/qt" "runtime" "unsafe" @@ -67,30 +66,30 @@ func (this *QPrinterInfo) OperatorAssign(other *QPrinterInfo) { } func (this *QPrinterInfo) PrinterName() string { - var _ms *C.struct_miqt_string = C.QPrinterInfo_PrinterName(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPrinterInfo_PrinterName(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QPrinterInfo) Description() string { - var _ms *C.struct_miqt_string = C.QPrinterInfo_Description(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPrinterInfo_Description(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QPrinterInfo) Location() string { - var _ms *C.struct_miqt_string = C.QPrinterInfo_Location(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPrinterInfo_Location(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QPrinterInfo) MakeAndModel() string { - var _ms *C.struct_miqt_string = C.QPrinterInfo_MakeAndModel(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPrinterInfo_MakeAndModel(this.h) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -204,11 +203,11 @@ func (this *QPrinterInfo) SupportedColorModes() []QPrinter__ColorMode { func QPrinterInfo_AvailablePrinterNames() []string { var _ma *C.struct_miqt_array = C.QPrinterInfo_AvailablePrinterNames() _ret := make([]string, int(_ma.len)) - _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) + var _lv_ms C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms.data)) _ret[i] = _lv_ret } C.free(unsafe.Pointer(_ma)) @@ -230,9 +229,9 @@ func QPrinterInfo_AvailablePrinters() []QPrinterInfo { } func QPrinterInfo_DefaultPrinterName() string { - var _ms *C.struct_miqt_string = C.QPrinterInfo_DefaultPrinterName() - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPrinterInfo_DefaultPrinterName() + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -244,9 +243,11 @@ func QPrinterInfo_DefaultPrinter() *QPrinterInfo { } func QPrinterInfo_PrinterInfo(printerName string) *QPrinterInfo { - printerName_ms := libmiqt.Strdupg(printerName) - defer C.free(printerName_ms) - _ret := C.QPrinterInfo_PrinterInfo((*C.struct_miqt_string)(printerName_ms)) + printerName_ms := C.struct_miqt_string{} + printerName_ms.data = C.CString(printerName) + printerName_ms.len = C.size_t(len(printerName)) + defer C.free(unsafe.Pointer(printerName_ms.data)) + _ret := C.QPrinterInfo_PrinterInfo(printerName_ms) _goptr := newQPrinterInfo(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr diff --git a/qt/qprintsupport/gen_qprinterinfo.h b/qt/qprintsupport/gen_qprinterinfo.h index 6d1dbfc4..3603e653 100644 --- a/qt/qprintsupport/gen_qprinterinfo.h +++ b/qt/qprintsupport/gen_qprinterinfo.h @@ -27,10 +27,10 @@ QPrinterInfo* QPrinterInfo_new(); QPrinterInfo* QPrinterInfo_new2(QPrinterInfo* other); QPrinterInfo* QPrinterInfo_new3(QPrinter* printer); void QPrinterInfo_OperatorAssign(QPrinterInfo* self, QPrinterInfo* other); -struct miqt_string* QPrinterInfo_PrinterName(const QPrinterInfo* self); -struct miqt_string* QPrinterInfo_Description(const QPrinterInfo* self); -struct miqt_string* QPrinterInfo_Location(const QPrinterInfo* self); -struct miqt_string* QPrinterInfo_MakeAndModel(const QPrinterInfo* self); +struct miqt_string QPrinterInfo_PrinterName(const QPrinterInfo* self); +struct miqt_string QPrinterInfo_Description(const QPrinterInfo* self); +struct miqt_string QPrinterInfo_Location(const QPrinterInfo* self); +struct miqt_string QPrinterInfo_MakeAndModel(const QPrinterInfo* self); bool QPrinterInfo_IsNull(const QPrinterInfo* self); bool QPrinterInfo_IsDefault(const QPrinterInfo* self); bool QPrinterInfo_IsRemote(const QPrinterInfo* self); @@ -48,9 +48,9 @@ int QPrinterInfo_DefaultColorMode(const QPrinterInfo* self); struct miqt_array* QPrinterInfo_SupportedColorModes(const QPrinterInfo* self); struct miqt_array* QPrinterInfo_AvailablePrinterNames(); struct miqt_array* QPrinterInfo_AvailablePrinters(); -struct miqt_string* QPrinterInfo_DefaultPrinterName(); +struct miqt_string QPrinterInfo_DefaultPrinterName(); QPrinterInfo* QPrinterInfo_DefaultPrinter(); -QPrinterInfo* QPrinterInfo_PrinterInfo(struct miqt_string* printerName); +QPrinterInfo* QPrinterInfo_PrinterInfo(struct miqt_string printerName); void QPrinterInfo_Delete(QPrinterInfo* self); #ifdef __cplusplus diff --git a/qt/qprintsupport/gen_qprintpreviewdialog.cpp b/qt/qprintsupport/gen_qprintpreviewdialog.cpp index 7b150395..7b648068 100644 --- a/qt/qprintsupport/gen_qprintpreviewdialog.cpp +++ b/qt/qprintsupport/gen_qprintpreviewdialog.cpp @@ -41,18 +41,26 @@ void* QPrintPreviewDialog_Metacast(QPrintPreviewDialog* self, const char* param1 return self->qt_metacast(param1); } -struct miqt_string* QPrintPreviewDialog_Tr(const char* s) { +struct miqt_string QPrintPreviewDialog_Tr(const char* s) { QString _ret = QPrintPreviewDialog::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPrintPreviewDialog_TrUtf8(const char* s) { +struct miqt_string QPrintPreviewDialog_TrUtf8(const char* s) { QString _ret = QPrintPreviewDialog::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } QPrinter* QPrintPreviewDialog_Printer(QPrintPreviewDialog* self) { @@ -78,32 +86,48 @@ void QPrintPreviewDialog_connect_PaintRequested(QPrintPreviewDialog* self, intpt }); } -struct miqt_string* QPrintPreviewDialog_Tr2(const char* s, const char* c) { +struct miqt_string QPrintPreviewDialog_Tr2(const char* s, const char* c) { QString _ret = QPrintPreviewDialog::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPrintPreviewDialog_Tr3(const char* s, const char* c, int n) { +struct miqt_string QPrintPreviewDialog_Tr3(const char* s, const char* c, int n) { QString _ret = QPrintPreviewDialog::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPrintPreviewDialog_TrUtf82(const char* s, const char* c) { +struct miqt_string QPrintPreviewDialog_TrUtf82(const char* s, const char* c) { QString _ret = QPrintPreviewDialog::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPrintPreviewDialog_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QPrintPreviewDialog_TrUtf83(const char* s, const char* c, int n) { QString _ret = QPrintPreviewDialog::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QPrintPreviewDialog_Delete(QPrintPreviewDialog* self) { diff --git a/qt/qprintsupport/gen_qprintpreviewdialog.go b/qt/qprintsupport/gen_qprintpreviewdialog.go index 218797d4..b606bafd 100644 --- a/qt/qprintsupport/gen_qprintpreviewdialog.go +++ b/qt/qprintsupport/gen_qprintpreviewdialog.go @@ -88,24 +88,24 @@ func (this *QPrintPreviewDialog) MetaObject() *qt.QMetaObject { func (this *QPrintPreviewDialog) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QPrintPreviewDialog_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QPrintPreviewDialog_Metacast(this.h, param1_Cstring)) } func QPrintPreviewDialog_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QPrintPreviewDialog_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPrintPreviewDialog_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QPrintPreviewDialog_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QPrintPreviewDialog_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPrintPreviewDialog_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -146,9 +146,9 @@ func QPrintPreviewDialog_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPrintPreviewDialog_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPrintPreviewDialog_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -157,9 +157,9 @@ func QPrintPreviewDialog_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPrintPreviewDialog_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPrintPreviewDialog_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -168,9 +168,9 @@ func QPrintPreviewDialog_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPrintPreviewDialog_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPrintPreviewDialog_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -179,9 +179,9 @@ func QPrintPreviewDialog_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPrintPreviewDialog_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPrintPreviewDialog_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/qprintsupport/gen_qprintpreviewdialog.h b/qt/qprintsupport/gen_qprintpreviewdialog.h index 14fc4a03..3355d632 100644 --- a/qt/qprintsupport/gen_qprintpreviewdialog.h +++ b/qt/qprintsupport/gen_qprintpreviewdialog.h @@ -33,17 +33,17 @@ QPrintPreviewDialog* QPrintPreviewDialog_new5(QPrinter* printer, QWidget* parent QPrintPreviewDialog* QPrintPreviewDialog_new6(QPrinter* printer, QWidget* parent, int flags); QMetaObject* QPrintPreviewDialog_MetaObject(const QPrintPreviewDialog* self); void* QPrintPreviewDialog_Metacast(QPrintPreviewDialog* self, const char* param1); -struct miqt_string* QPrintPreviewDialog_Tr(const char* s); -struct miqt_string* QPrintPreviewDialog_TrUtf8(const char* s); +struct miqt_string QPrintPreviewDialog_Tr(const char* s); +struct miqt_string QPrintPreviewDialog_TrUtf8(const char* s); QPrinter* QPrintPreviewDialog_Printer(QPrintPreviewDialog* self); void QPrintPreviewDialog_SetVisible(QPrintPreviewDialog* self, bool visible); void QPrintPreviewDialog_Done(QPrintPreviewDialog* self, int result); void QPrintPreviewDialog_PaintRequested(QPrintPreviewDialog* self, QPrinter* printer); void QPrintPreviewDialog_connect_PaintRequested(QPrintPreviewDialog* self, intptr_t slot); -struct miqt_string* QPrintPreviewDialog_Tr2(const char* s, const char* c); -struct miqt_string* QPrintPreviewDialog_Tr3(const char* s, const char* c, int n); -struct miqt_string* QPrintPreviewDialog_TrUtf82(const char* s, const char* c); -struct miqt_string* QPrintPreviewDialog_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QPrintPreviewDialog_Tr2(const char* s, const char* c); +struct miqt_string QPrintPreviewDialog_Tr3(const char* s, const char* c, int n); +struct miqt_string QPrintPreviewDialog_TrUtf82(const char* s, const char* c); +struct miqt_string QPrintPreviewDialog_TrUtf83(const char* s, const char* c, int n); void QPrintPreviewDialog_Delete(QPrintPreviewDialog* self); #ifdef __cplusplus diff --git a/qt/qprintsupport/gen_qprintpreviewwidget.cpp b/qt/qprintsupport/gen_qprintpreviewwidget.cpp index 22cd37df..8e7eef15 100644 --- a/qt/qprintsupport/gen_qprintpreviewwidget.cpp +++ b/qt/qprintsupport/gen_qprintpreviewwidget.cpp @@ -41,18 +41,26 @@ void* QPrintPreviewWidget_Metacast(QPrintPreviewWidget* self, const char* param1 return self->qt_metacast(param1); } -struct miqt_string* QPrintPreviewWidget_Tr(const char* s) { +struct miqt_string QPrintPreviewWidget_Tr(const char* s) { QString _ret = QPrintPreviewWidget::tr(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPrintPreviewWidget_TrUtf8(const char* s) { +struct miqt_string QPrintPreviewWidget_TrUtf8(const char* s) { QString _ret = QPrintPreviewWidget::trUtf8(s); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } double QPrintPreviewWidget_ZoomFactor(const QPrintPreviewWidget* self) { @@ -172,32 +180,48 @@ void QPrintPreviewWidget_connect_PreviewChanged(QPrintPreviewWidget* self, intpt }); } -struct miqt_string* QPrintPreviewWidget_Tr2(const char* s, const char* c) { +struct miqt_string QPrintPreviewWidget_Tr2(const char* s, const char* c) { QString _ret = QPrintPreviewWidget::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPrintPreviewWidget_Tr3(const char* s, const char* c, int n) { +struct miqt_string QPrintPreviewWidget_Tr3(const char* s, const char* c, int n) { QString _ret = QPrintPreviewWidget::tr(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPrintPreviewWidget_TrUtf82(const char* s, const char* c) { +struct miqt_string QPrintPreviewWidget_TrUtf82(const char* s, const char* c) { QString _ret = QPrintPreviewWidget::trUtf8(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } -struct miqt_string* QPrintPreviewWidget_TrUtf83(const char* s, const char* c, int n) { +struct miqt_string QPrintPreviewWidget_TrUtf83(const char* s, const char* c, int n) { QString _ret = QPrintPreviewWidget::trUtf8(s, c, static_cast(n)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); + struct miqt_string _ms; + _ms.len = _b.length(); + _ms.data = static_cast(malloc(_ms.len)); + memcpy(_ms.data, _b.data(), _ms.len); + return _ms; } void QPrintPreviewWidget_ZoomIn1(QPrintPreviewWidget* self, double zoom) { diff --git a/qt/qprintsupport/gen_qprintpreviewwidget.go b/qt/qprintsupport/gen_qprintpreviewwidget.go index 7f02f444..14b5f6c7 100644 --- a/qt/qprintsupport/gen_qprintpreviewwidget.go +++ b/qt/qprintsupport/gen_qprintpreviewwidget.go @@ -104,24 +104,24 @@ func (this *QPrintPreviewWidget) MetaObject() *qt.QMetaObject { func (this *QPrintPreviewWidget) Metacast(param1 string) unsafe.Pointer { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QPrintPreviewWidget_Metacast(this.h, param1_Cstring) + return (unsafe.Pointer)(C.QPrintPreviewWidget_Metacast(this.h, param1_Cstring)) } func QPrintPreviewWidget_Tr(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QPrintPreviewWidget_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPrintPreviewWidget_Tr(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } func QPrintPreviewWidget_TrUtf8(s string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QPrintPreviewWidget_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPrintPreviewWidget_TrUtf8(s_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -259,9 +259,9 @@ func QPrintPreviewWidget_Tr2(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPrintPreviewWidget_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPrintPreviewWidget_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -270,9 +270,9 @@ func QPrintPreviewWidget_Tr3(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPrintPreviewWidget_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPrintPreviewWidget_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -281,9 +281,9 @@ func QPrintPreviewWidget_TrUtf82(s string, c string) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPrintPreviewWidget_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPrintPreviewWidget_TrUtf82(s_Cstring, c_Cstring) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } @@ -292,9 +292,9 @@ func QPrintPreviewWidget_TrUtf83(s string, c string, n int) string { defer C.free(unsafe.Pointer(s_Cstring)) c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPrintPreviewWidget_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) + var _ms C.struct_miqt_string = C.QPrintPreviewWidget_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms.data)) return _ret } diff --git a/qt/qprintsupport/gen_qprintpreviewwidget.h b/qt/qprintsupport/gen_qprintpreviewwidget.h index d69a32a1..7e54870d 100644 --- a/qt/qprintsupport/gen_qprintpreviewwidget.h +++ b/qt/qprintsupport/gen_qprintpreviewwidget.h @@ -33,8 +33,8 @@ QPrintPreviewWidget* QPrintPreviewWidget_new5(QWidget* parent); QPrintPreviewWidget* QPrintPreviewWidget_new6(QWidget* parent, int flags); QMetaObject* QPrintPreviewWidget_MetaObject(const QPrintPreviewWidget* self); void* QPrintPreviewWidget_Metacast(QPrintPreviewWidget* self, const char* param1); -struct miqt_string* QPrintPreviewWidget_Tr(const char* s); -struct miqt_string* QPrintPreviewWidget_TrUtf8(const char* s); +struct miqt_string QPrintPreviewWidget_Tr(const char* s); +struct miqt_string QPrintPreviewWidget_TrUtf8(const char* s); double QPrintPreviewWidget_ZoomFactor(const QPrintPreviewWidget* self); int QPrintPreviewWidget_Orientation(const QPrintPreviewWidget* self); int QPrintPreviewWidget_ViewMode(const QPrintPreviewWidget* self); @@ -62,10 +62,10 @@ void QPrintPreviewWidget_PaintRequested(QPrintPreviewWidget* self, QPrinter* pri void QPrintPreviewWidget_connect_PaintRequested(QPrintPreviewWidget* self, intptr_t slot); void QPrintPreviewWidget_PreviewChanged(QPrintPreviewWidget* self); void QPrintPreviewWidget_connect_PreviewChanged(QPrintPreviewWidget* self, intptr_t slot); -struct miqt_string* QPrintPreviewWidget_Tr2(const char* s, const char* c); -struct miqt_string* QPrintPreviewWidget_Tr3(const char* s, const char* c, int n); -struct miqt_string* QPrintPreviewWidget_TrUtf82(const char* s, const char* c); -struct miqt_string* QPrintPreviewWidget_TrUtf83(const char* s, const char* c, int n); +struct miqt_string QPrintPreviewWidget_Tr2(const char* s, const char* c); +struct miqt_string QPrintPreviewWidget_Tr3(const char* s, const char* c, int n); +struct miqt_string QPrintPreviewWidget_TrUtf82(const char* s, const char* c); +struct miqt_string QPrintPreviewWidget_TrUtf83(const char* s, const char* c, int n); void QPrintPreviewWidget_ZoomIn1(QPrintPreviewWidget* self, double zoom); void QPrintPreviewWidget_ZoomOut1(QPrintPreviewWidget* self, double zoom); void QPrintPreviewWidget_Delete(QPrintPreviewWidget* self);